Skip to content

Commit ccf6232

Browse files
reevespaulreevespaul
committed
Re-organize cvs tree for ODBC driver
Make branch naming conform more closely to standard used for Firebird tree Create B1_3_0 branch from HEAD Create B2_0_0 branch from v2-0-beta branch (try to) Remove v2-0-beta branch tag Merge B2_0_0 branch into HEAD
1 parent 69c7457 commit ccf6232

File tree

272 files changed

+26543
-4614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+26543
-4614
lines changed

‎Builds/Bcc55.win/HowToCompileGuide-BCC55.txt

+109
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
How to compile guide with free Borland C++ Command Line
2+
Tool version 5.5.1
3+
4+
In order to compile OdbcJdbc Firebird driver with free Borland C++
5+
Command Line Tool version 5.5.1, few steps are necessary to be followed.
6+
This is complete guide, from compiler download, compiler installation,
7+
few preparation to compile and compiling driver itself. Complete process
8+
is organized in few sections.
9+
10+
I hope this little guide will be useful.
11+
12+
Installing Borland C++ free Commandline tool v 5.5.1
13+
14+
1. Download Borland C++ free Commandline tool v 5.5.1 from Borland's
15+
official site at www.borland.com. File is named as
16+
freecommandLinetools.exe
17+
18+
2. Execute freecommandLinetools.exe and follow instructions.
19+
Assuming chosen folder is:
20+
21+
c:\Borland\BCC55
22+
23+
24+
Creating needed odbccp32.lib file. File odbccp32.lib need
25+
to be created in order to compile driver
26+
27+
1. Find odbccp32.dll library in Windows system folder (in W2000,
28+
it is usually in c:\winnt\system32) and copy it into temp folder.
29+
30+
2. Create odbccp32.lib file from odbccp32.dll with following command:
31+
32+
c:\Borland\Bcc55\Bin\implib -c odbccp32.lib odbccp32.dll
33+
34+
3. Copy created file odbccp32.lib to following folder:
35+
36+
c:\Borland\Bcc55\lib\PSDK
37+
38+
39+
Compiling OdbcJdbc driver itself
40+
41+
42+
1. Create temp folder, for example:
43+
44+
md C:\FBODBC
45+
46+
2. Create following sub folders:
47+
48+
md C:\FBODBC\Firebird
49+
md C:\FBODBC\Firebird\Include
50+
md C:\FBODBC\OdbcJdbc
51+
52+
3. Extract OdbcJdbc sources to C:\FBODBC\OdbcJdbc
53+
54+
4. Download Firebird sources from official site www.firebird.org.
55+
56+
5. Extract Firebird sources to some other temp folder and copy to
57+
58+
C:\FBODBC\Firebird\Include only following files:
59+
60+
blr.h
61+
fb_types.h
62+
ibase.h
63+
iberror.h
64+
65+
6. Check and change paths to your correspondent paths from file:
66+
67+
c:\FBODBC\OdbcJdbc\Builds\makefile.environ
68+
69+
In this case, paths are follows:
70+
71+
FBINCDIR = c:\FBODBC\Firebird\include
72+
FBLIBDIR = c:\FBODBC\Firebird\lib
73+
74+
75+
7. Depending on chosen environment, execute one of the following
76+
batches in order to create OdbcJdbc DLLs:
77+
78+
From folder c:\FBODBC\OdbcJdbc\Builds\Bcc55.win
79+
80+
For NT (W2000/XP/w2003) - BuildNT.bat
81+
For W98/Me - Build98.bat
82+
83+
84+
Resulting DLLs are in folder:
85+
86+
c:\FBODBC\OdbcJdbc\Builds\Bcc55.win\Release
87+
88+
8. Install driver with following command (not recommended):
89+
90+
From folder c:\FBODBC\OdbcJdbc\Builds\Bcc55.win
91+
92+
RegSvr32 .\OdbcJdbcSetup.dll
93+
94+
9. If last command fails, using full paths to regsvr32 and
95+
OdbcJdbcSetup.dll may be of help. For W2000, that is following
96+
command (recommended):
97+
98+
c:\winnt\system32\RegSvr32 /i c:\FBODBC\OdbcJdbc\Builds\Bcc55.win\Release\OdbcJdbcSetup.dll
99+
100+
10. Enjoy using Firebird through ODBC!
101+
102+
103+
104+
Special thanks to Vladimir Tsvigun for wonderful job maintaining
105+
and improving this driver, for all his help and support.
106+
107+
Contributor : Sasa Zeman
108+
Contact : [email protected]
109+
Web site : www.szutils.net

‎Builds/Bcc55.win/build.bat

+15-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
D:\BC55\bin\make -f makefile.bcc55 %1
1+
@echo off
2+
3+
rem
4+
rem Examples Win98/Me
5+
rem build C:\Borland\BCC55 WIN98
6+
rem
7+
rem
8+
rem Examples Win XP/2000/2003/...
9+
rem build C:\Borland\BCC55
10+
rem
11+
12+
13+
%1\bin\make -f makefile.bcc55 COMPDIR=%1 VER_NT=%2
14+
15+
@echo on

‎Builds/Bcc55.win/build98.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@call build C:\Borland\BCC55 WIN98

‎Builds/Bcc55.win/buildNT.bat

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@call build C:\Borland\BCC55

‎Builds/Bcc55.win/makefile.bcc55

+13-11
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
#
44
#DEBUG = 1
55
#
6-
COMPDIR = D:\BC55
7-
# Windows 2000/NT
8-
#VER_WINNT = "_WIN32_WINNT=0x0500"
6+
!if(VER_NT == "WIN98")
97
# Win98/Me
108
VER_WINNT = "_WIN32_WINNT=0x0400"
9+
!else
10+
# Windows 2000/NT
11+
VER_WINNT = "_WIN32_WINNT=0x0500"
12+
!endif
1113
#
1214
!include ../makefile.environ
1315
!include ../makefile.sources
@@ -22,19 +24,19 @@ BUILDDIR = $(TARGETDIR)\obj
2224
#
2325
COMPFLAGS = -n$(BUILDDIR) \
2426
-w- -a8 -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
25-
-DWIN32 -D_WIN32 -D_WINDOWS -D$(VER_WINNT) \
27+
-DWIN32 -D_WIN32 -D_WINDOWS -D$(VER_WINNT) -DISOLATION_AWARE_ENABLED \
2628
-I.\ -I$(FBINCDIR) -I$(COMPDIR)\Include -I$(ISCDBCDIR) -I$(ODBCJDBCDIR)
2729
# -w- -a8 -VM -VF -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
2830
#
2931
RCINCLUDE = -i$(COMPDIR)\Include
3032
BRCC = $(COMPDIR)\bin\brcc32 -dWIN32 -d_WIN32
3133
LD = $(COMPDIR)\bin\ilink32
3234
BCC = $(COMPDIR)\bin\bcc32
33-
LINKFLAGS = -q -Gn -Gi -Tpd -ad -L$(COMPDIR)\lib -x
35+
LINKFLAGS = -q -Gn -Gi -Tpd -ad -L$(COMPDIR)\lib -L$(COMPDIR)\lib\PSDK -x
3436
STARTUP = c0d32.obj
3537
LIBRARIES = import32.lib cw32mt.lib wsock32.lib
3638
ISCDBCDLL = $(TARGETDIR)\IscDbc.dll
37-
ODBCJDBCDLL = $(TARGETDIR)\OdbcJdbc.dll
39+
ODBCJDBCDLL = $(TARGETDIR)\OdbcFb32.dll
3840
ODBCJDBCSDLL = $(TARGETDIR)\OdbcJdbcSetup.dll
3941
#
4042
!ifdef DEBUG
@@ -49,7 +51,7 @@ COMPFLAGS = $(COMPFLAGS) -tWCR -lGn -tWM -q
4951
@$(BRCC) $(RCINCLUDE) -fo$@ $*.rc
5052
#
5153
.cpp.obj :
52-
@$(BCC) $(COMPFLAGS) -c $*.cpp
54+
@$(BCC) $(COMPFLAGS) $(COMPEXTFLAGS) -c $*.cpp
5355
#
5456
ISCDBCLIB = $(ISCDBCDLL:.dll=.lib)
5557
ISCDBCDIRBCC = $(ISCDBCDIR:/=\)
@@ -88,13 +90,13 @@ OdbcJdbcSetup : $(BUILDDIR)\OdbcJdbcSetup.res $(ODBCJDBCSDLL)
8890
# Build the library from the object modules
8991
#
9092
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
91-
@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ISCDBCDIRBCC)=$(BUILDDIR)) ,$(ISCDBCDLL),,$(LIBRARIES),$(ISCDBCDEFFILE), $(BUILDDIR)\IscDbc.res
93+
# @$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ISCDBCDIRBCC)=$(BUILDDIR)) ,$(ISCDBCDLL),,$(LIBRARIES),$(ISCDBCDEFFILE), $(BUILDDIR)\IscDbc.res
9294
#
93-
$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
94-
@$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(BUILDDIR)\Mutex.obj $(**:$(ODBCJDBCDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCDLL),,$(LIBRARIES) $(ISCDBCLIB) odbccp32.lib ,$(ODBCJDBCDEFFILE), $(BUILDDIR)\OdbcJdbc.res
95+
$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSOBJ)
96+
@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ODBCJDBCDIRBCC)=$(BUILDDIR)),$(ODBCJDBCDLL),,$(LIBRARIES) odbccp32.lib ,$(ODBCJDBCDEFFILE), $(BUILDDIR)\OdbcJdbc.res
9597
#
9698
$(ODBCJDBCSDLL) : $(LIST_ODBCJDBCSOBJ)
97-
@$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(**:$(ODBCJDBCSDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCSDLL),,$(LIBRARIES) user32.lib comdlg32.lib odbccp32.lib,$(ODBCJDBCSDEFFILE),$(BUILDDIR)\OdbcJdbcSetup.res
99+
# @$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(**:$(ODBCJDBCSDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCSDLL),,$(LIBRARIES) gdi32.lib shell32.lib advapi32.lib user32.lib comdlg32.lib comctl32.lib odbccp32.lib,$(ODBCJDBCSDEFFILE),$(BUILDDIR)\OdbcJdbcSetup.res
98100
#
99101
# End
100102
#

‎Builds/CC.solaris/makefile.solaris

+14-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ LINKFLAGS = -G
3535
EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl -lgds
3636
#
3737
ISCDBCDLL = $(TARGETDIR)/IscDbc.so
38-
ODBCJDBCDLL = $(TARGETDIR)/OdbcJdbc.so
38+
ODBCJDBCDLL = $(TARGETDIR)/OdbcFb32.so
3939
ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
4040
ISCDBCDEFFILE = $(ISCDBCDIR)/IscDbc.def
4141
ODBCJDBCDEFFILE = $(ODBCJDBCDIR)/OdbcJdbc.def
@@ -75,16 +75,22 @@ OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
7575
# Build the library from the object modules
7676
#
7777
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
78-
ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
79-
$(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
78+
# ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
79+
# $(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
8080
#
81-
$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
82-
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
83-
$(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
81+
#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
82+
# ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
83+
# $(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
8484
#
8585
$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
86-
ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
87-
$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
86+
# ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
87+
# $(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
88+
#
89+
$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
90+
ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
91+
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
92+
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
93+
$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
8894
#
8995
postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
9096
@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)

‎Builds/Gcc.freeBSD/makefile.freeBSD

+14-9
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
2626
LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
2727
#
2828
COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -pthread
29-
3029
#
3130
LINKFLAGS = -rdynamic -export-dynamic -shared
3231
EXTLIBS = -lcrypt -lgds -lcompat
3332
#
3433
ISCDBCDLL = $(TARGETDIR)/IscDbc.so
35-
ODBCJDBCDLL = $(TARGETDIR)/OdbcJdbc.so
34+
ODBCJDBCDLL = $(TARGETDIR)/OdbcFb32.so
3635
ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
3736
#
3837
ifdef DEBUG
@@ -69,16 +68,22 @@ OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
6968
# Build the library from the object modules
7069
#
7170
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
72-
ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
73-
$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
71+
# ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
72+
# $(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
7473
#
75-
$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
76-
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
77-
$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
74+
#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
75+
# ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
76+
# $(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
7877
#
7978
$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
80-
ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
81-
$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
79+
# ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
80+
# $(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
81+
#
82+
$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
83+
ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
84+
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
85+
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
86+
$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
8287
#
8388
# End
8489
#

‎Builds/Gcc.lin/makefile.linux

+22-16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#
1919
#
2020
#
21-
PACKAGE_NAME=OdbcJdbc_1.2.0.69.tar
21+
PACKAGE_NAME=OdbcJdbc_1.2.0.100.tar
2222
#
2323
#
2424
DEBUG = No
@@ -68,22 +68,22 @@ endif
6868
#
6969
BUILDDIR = $(TARGETDIR)/obj
7070
#
71-
LIST_ISCDBCSRC = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
72-
LIST_ISCDBCOBJ = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
73-
LIST_ODBCJDBCSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
74-
LIST_ODBCJDBCOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
71+
LIST_ISCDBCSRC = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
72+
LIST_ISCDBCOBJ = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
73+
LIST_ODBCJDBCSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
74+
LIST_ODBCJDBCOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
7575
LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
7676
LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
7777
#
78-
COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR)
78+
COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
7979
#
8080
#LINKFLAGS = -rdynamic -export-dynamic -shared
8181
LINKFLAGS = -shared
8282
EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl
8383
#
84-
ISCDBC = libIscDbc.so
84+
ISCDBC = libIscDbc.so
8585
ISCDBCDLL = $(TARGETDIR)/$(ISCDBC)
86-
ODBCJDBC = libOdbcJdbc.so
86+
ODBCJDBC = libOdbcFb32.so
8787
ODBCJDBCDLL = $(TARGETDIR)/$(ODBCJDBC)
8888
ODBCJDBCSETUP = libOdbcJdbcS.so
8989
ODBCJDBCSETUPDLL= $(TARGETDIR)/$(ODBCJDBCSETUP)
@@ -126,16 +126,22 @@ OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
126126
# Build the library from the object modules
127127
#
128128
$(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
129-
ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
130-
$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
129+
# ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
130+
# $(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
131131
#
132-
$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
133-
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
134-
$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
132+
#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
133+
# ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
134+
# $(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
135135
#
136136
$(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
137-
ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
138-
$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
137+
# ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
138+
# $(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
139+
#
140+
$(ODBCJDBCDLL) : $(ISCDBCDLL) $(ODBCJDBCSETUPDLL) $(LIST_ODBCJDBCOBJ)
141+
ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
142+
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
143+
ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
144+
$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
139145
#
140146
postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
141147
@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
@@ -155,7 +161,7 @@ package :
155161
chmod 740 ../../Install/Linux/install.sh
156162
tar -C $(TARGETDIR) -cvf OdbcJdbcLibs.tar $(ISCDBC) $(ODBCJDBC) $(ODBCJDBCSETUP)
157163
tar -C ../../Install/HtmlHelp --exclude=CVS -cvf OdbcJdbcDocs.tar html/
158-
tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v1.2.html
164+
tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v2.0.html
159165
tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini FirebirdDSNTemplate.ini InterBaseDSNTemplate.ini
160166
tar -uf $(PACKAGE_NAME) OdbcJdbcLibs.tar OdbcJdbcDocs.tar
161167
rm OdbcJdbcLibs.tar OdbcJdbcDocs.tar

0 commit comments

Comments
 (0)