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

Builds/Bcc55.win/HowToCompileGuide-BCC55.txt

@@ -0,0 +1,109 @@
+   How to compile guide with free Borland C++ Command Line 
+                     Tool version 5.5.1
+
+   In order to compile OdbcJdbc Firebird driver with free Borland C++ 
+Command Line Tool version 5.5.1, few steps are necessary to be followed. 
+This is complete guide, from compiler download, compiler installation, 
+few preparation to compile and compiling driver itself. Complete process 
+is organized in few sections.
+
+I hope this little guide will be useful.
+
+Installing Borland C++ free Commandline tool v 5.5.1 
+
+1. Download Borland C++ free Commandline tool v 5.5.1 from Borland's 
+   official site at www.borland.com. File is named as 
+   freecommandLinetools.exe
+
+2. Execute freecommandLinetools.exe and follow instructions. 
+   Assuming chosen folder is:
+
+	 c:\Borland\BCC55
+
+
+   Creating needed odbccp32.lib file. File odbccp32.lib need 
+to be created in order to compile driver
+
+1. Find odbccp32.dll library in Windows system folder (in W2000, 
+   it is usually in c:\winnt\system32) and copy it into temp folder.
+
+2. Create odbccp32.lib file from odbccp32.dll with following command:
+
+	c:\Borland\Bcc55\Bin\implib -c odbccp32.lib odbccp32.dll
+
+3. Copy created file odbccp32.lib to following folder:
+
+	c:\Borland\Bcc55\lib\PSDK 
+
+
+Compiling OdbcJdbc driver itself
+
+
+1. Create temp folder, for example:
+
+	md C:\FBODBC
+
+2. Create following sub folders:
+
+	md C:\FBODBC\Firebird
+        md C:\FBODBC\Firebird\Include
+	md C:\FBODBC\OdbcJdbc
+
+3. Extract OdbcJdbc sources to C:\FBODBC\OdbcJdbc
+
+4. Download Firebird sources from official site www.firebird.org.
+
+5. Extract Firebird sources to some other temp folder and copy to
+
+	C:\FBODBC\Firebird\Include only following files:
+
+	blr.h
+	fb_types.h
+	ibase.h
+	iberror.h
+
+6. Check and change paths to your correspondent paths from file:
+
+	c:\FBODBC\OdbcJdbc\Builds\makefile.environ
+
+	In this case, paths are follows: 
+
+	FBINCDIR	= c:\FBODBC\Firebird\include
+	FBLIBDIR	= c:\FBODBC\Firebird\lib
+
+
+7. Depending on chosen environment, execute one of the following 
+   batches in order to create OdbcJdbc DLLs:
+
+	From folder c:\FBODBC\OdbcJdbc\Builds\Bcc55.win
+
+	For NT (W2000/XP/w2003) - BuildNT.bat
+	For W98/Me              - Build98.bat
+
+
+	Resulting DLLs are in folder:
+
+	c:\FBODBC\OdbcJdbc\Builds\Bcc55.win\Release
+
+8. Install driver with following command (not recommended):
+
+	From folder c:\FBODBC\OdbcJdbc\Builds\Bcc55.win
+
+	RegSvr32 .\OdbcJdbcSetup.dll
+
+9. If last command fails, using full paths to regsvr32 and 
+   OdbcJdbcSetup.dll may be of help. For W2000, that is following 
+   command (recommended):
+
+	c:\winnt\system32\RegSvr32 /i c:\FBODBC\OdbcJdbc\Builds\Bcc55.win\Release\OdbcJdbcSetup.dll
+
+10. Enjoy using Firebird through ODBC!
+
+
+
+    Special thanks to Vladimir Tsvigun for wonderful job maintaining 
+and improving this driver, for all his help and support.
+
+Contributor	: Sasa Zeman
+Contact 	: [email protected]
+Web site	: www.szutils.net

Builds/Bcc55.win/build.bat

@@ -1 +1,15 @@
-D:\BC55\bin\make -f makefile.bcc55 %1
+@echo off
+
+rem
+rem  Examples Win98/Me
+rem          build C:\Borland\BCC55 WIN98
+rem
+rem
+rem  Examples Win XP/2000/2003/...
+rem          build C:\Borland\BCC55
+rem
+
+
+%1\bin\make -f makefile.bcc55 COMPDIR=%1 VER_NT=%2
+
+@echo on

Builds/Bcc55.win/build98.bat

@@ -0,0 +1 @@
+@call build C:\Borland\BCC55 WIN98

Builds/Bcc55.win/buildNT.bat

@@ -0,0 +1 @@
+@call build C:\Borland\BCC55

Builds/Bcc55.win/makefile.bcc55

@@ -3,11 +3,13 @@
 #
 #DEBUG		= 1
 #
-COMPDIR		= D:\BC55
-# Windows 2000/NT
-#VER_WINNT	= "_WIN32_WINNT=0x0500"
+!if(VER_NT == "WIN98")
 # Win98/Me
 VER_WINNT	= "_WIN32_WINNT=0x0400"
+!else
+# Windows 2000/NT
+VER_WINNT	= "_WIN32_WINNT=0x0500"
+!endif
 #
 !include ../makefile.environ
 !include ../makefile.sources
@@ -22,19 +24,19 @@ BUILDDIR 	= $(TARGETDIR)\obj
 #
 COMPFLAGS	= -n$(BUILDDIR) \
 		  -w- -a8 -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
-		  -DWIN32 -D_WIN32 -D_WINDOWS -D$(VER_WINNT) \
+		  -DWIN32 -D_WIN32 -D_WINDOWS -D$(VER_WINNT) -DISOLATION_AWARE_ENABLED \
 		  -I.\ -I$(FBINCDIR) -I$(COMPDIR)\Include -I$(ISCDBCDIR) -I$(ODBCJDBCDIR)
 #		  -w- -a8 -VM -VF -jb -j1 -Hc -H=$(BUILDDIR)\bcc.csm \
 #
 RCINCLUDE       = -i$(COMPDIR)\Include
 BRCC 		= $(COMPDIR)\bin\brcc32 -dWIN32 -d_WIN32
 LD		= $(COMPDIR)\bin\ilink32
 BCC 		= $(COMPDIR)\bin\bcc32
-LINKFLAGS	= -q -Gn -Gi -Tpd -ad -L$(COMPDIR)\lib -x
+LINKFLAGS	= -q -Gn -Gi -Tpd -ad -L$(COMPDIR)\lib -L$(COMPDIR)\lib\PSDK -x
 STARTUP		= c0d32.obj
 LIBRARIES	= import32.lib cw32mt.lib wsock32.lib
 ISCDBCDLL       = $(TARGETDIR)\IscDbc.dll
-ODBCJDBCDLL     = $(TARGETDIR)\OdbcJdbc.dll
+ODBCJDBCDLL     = $(TARGETDIR)\OdbcFb32.dll
 ODBCJDBCSDLL    = $(TARGETDIR)\OdbcJdbcSetup.dll
 #
 !ifdef DEBUG
@@ -49,7 +51,7 @@ COMPFLAGS	= $(COMPFLAGS) -tWCR -lGn -tWM -q
   	@$(BRCC) $(RCINCLUDE) -fo$@ $*.rc
 #
 .cpp.obj :
-	@$(BCC) $(COMPFLAGS) -c $*.cpp
+	@$(BCC) $(COMPFLAGS) $(COMPEXTFLAGS) -c $*.cpp
 #
 ISCDBCLIB       	= $(ISCDBCDLL:.dll=.lib)
 ISCDBCDIRBCC 		= $(ISCDBCDIR:/=\)
@@ -88,13 +90,13 @@ OdbcJdbcSetup 	: $(BUILDDIR)\OdbcJdbcSetup.res $(ODBCJDBCSDLL)
 # Build the library from the object modules
 #
 $(ISCDBCDLL) 	: $(LIST_ISCDBCOBJ)
-	@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ISCDBCDIRBCC)=$(BUILDDIR)) ,$(ISCDBCDLL),,$(LIBRARIES),$(ISCDBCDEFFILE), $(BUILDDIR)\IscDbc.res
+#	@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ISCDBCDIRBCC)=$(BUILDDIR)) ,$(ISCDBCDLL),,$(LIBRARIES),$(ISCDBCDEFFILE), $(BUILDDIR)\IscDbc.res
 #
-$(ODBCJDBCDLL) 	: $(LIST_ODBCJDBCOBJ)
-	@$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(BUILDDIR)\Mutex.obj $(**:$(ODBCJDBCDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCDLL),,$(LIBRARIES) $(ISCDBCLIB) odbccp32.lib ,$(ODBCJDBCDEFFILE), $(BUILDDIR)\OdbcJdbc.res
+$(ODBCJDBCDLL) 	: $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSOBJ)
+	@$(LD) $(LINKFLAGS) $(STARTUP) $(**:$(ODBCJDBCDIRBCC)=$(BUILDDIR)),$(ODBCJDBCDLL),,$(LIBRARIES) odbccp32.lib ,$(ODBCJDBCDEFFILE), $(BUILDDIR)\OdbcJdbc.res
 #
 $(ODBCJDBCSDLL)	: $(LIST_ODBCJDBCSOBJ)
-	@$(LD) $(LINKFLAGS) $(STARTUP) $(BUILDDIR)\JString.obj $(**:$(ODBCJDBCSDIRBCC)=$(BUILDDIR)) ,$(ODBCJDBCSDLL),,$(LIBRARIES) user32.lib comdlg32.lib odbccp32.lib,$(ODBCJDBCSDEFFILE),$(BUILDDIR)\OdbcJdbcSetup.res
+#	@$(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
 #
 # End
 #

Builds/CC.solaris/makefile.solaris

@@ -35,7 +35,7 @@ LINKFLAGS	= -G
 EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl -lgds
 #
 ISCDBCDLL       = $(TARGETDIR)/IscDbc.so
-ODBCJDBCDLL     = $(TARGETDIR)/OdbcJdbc.so
+ODBCJDBCDLL     = $(TARGETDIR)/OdbcFb32.so
 ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
 ISCDBCDEFFILE	= $(ISCDBCDIR)/IscDbc.def
 ODBCJDBCDEFFILE	= $(ODBCJDBCDIR)/OdbcJdbc.def
@@ -75,16 +75,22 @@ OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
 # Build the library from the object modules
 #
 $(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-	$(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
+#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
+#	$(CC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
 #
-$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	$(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
+#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
+#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
+#	$(CC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
 #
 $(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
+#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
+#	$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
+#
+$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
+	$(CC) $(LINKFLAGS) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -lodbcinst -o $(ODBCJDBCDLL)
 #
 postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
 	@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)

Builds/Gcc.freeBSD/makefile.freeBSD

@@ -26,13 +26,12 @@ LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
 LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
 #
 COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -pthread
-
 #
 LINKFLAGS = -rdynamic -export-dynamic -shared
 EXTLIBS = -lcrypt -lgds -lcompat
 #
 ISCDBCDLL       = $(TARGETDIR)/IscDbc.so
-ODBCJDBCDLL     = $(TARGETDIR)/OdbcJdbc.so
+ODBCJDBCDLL     = $(TARGETDIR)/OdbcFb32.so
 ODBCJDBCSETUPDLL= $(TARGETDIR)/OdbcJdbcS.so
 #
 ifdef DEBUG
@@ -69,16 +68,22 @@ OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
 # Build the library from the object modules
 #
 $(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
+#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
+#	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) -o $(ISCDBCDLL)
 #
-$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
+#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
+#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
+#	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
 #
 $(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
+#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
+#	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
+#
+$(ODBCJDBCDLL) : $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
+	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCDLL)
 #
 # End
 #

Builds/Gcc.lin/makefile.linux

@@ -18,7 +18,7 @@
 #
 #
 #
-PACKAGE_NAME=OdbcJdbc_1.2.0.69.tar
+PACKAGE_NAME=OdbcJdbc_1.2.0.100.tar
 #
 #
 DEBUG = No
@@ -68,22 +68,22 @@ endif
 #
 BUILDDIR 	    = $(TARGETDIR)/obj
 #
-LIST_ISCDBCSRC 		    = $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
-LIST_ISCDBCOBJ 		    = $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
-LIST_ODBCJDBCSRC	    = $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
-LIST_ODBCJDBCOBJ	    = $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
+LIST_ISCDBCSRC 		= $(addprefix $(ISCDBCDIR)/, $(ISCDBCSRC))
+LIST_ISCDBCOBJ 		= $(addprefix $(BUILDDIR)/, $(ISCDBCSRC:.cpp=.o))
+LIST_ODBCJDBCSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSRC))
+LIST_ODBCJDBCOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSRC:.cpp=.o))
 LIST_ODBCJDBCSETUPSRC	= $(addprefix $(ODBCJDBCDIR)/, $(ODBCJDBCSETUPSRC_LINUX))
 LIST_ODBCJDBCSETUPOBJ	= $(addprefix $(BUILDDIR)/, $(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
 #
-COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR)
+COMPFLAGS	= -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL -D$(ODBCMANAGER) $(INCLUDEDIR) -I$(FBINCDIR)
 #
 #LINKFLAGS	= -rdynamic -export-dynamic -shared 
 LINKFLAGS	= -shared
 EXTLIBS		= $(EXTLIBDIR) -lcrypt -ldl
 #
-ISCDBC			= libIscDbc.so
+ISCDBC		= libIscDbc.so
 ISCDBCDLL       = $(TARGETDIR)/$(ISCDBC)
-ODBCJDBC		= libOdbcJdbc.so
+ODBCJDBC	= libOdbcFb32.so
 ODBCJDBCDLL     = $(TARGETDIR)/$(ODBCJDBC)
 ODBCJDBCSETUP	= libOdbcJdbcS.so
 ODBCJDBCSETUPDLL= $(TARGETDIR)/$(ODBCJDBCSETUP)
@@ -126,16 +126,22 @@ OdbcJdbcSetup : $(ODBCJDBCSETUPDLL)
 # Build the library from the object modules
 #
 $(ISCDBCDLL) : $(LIST_ISCDBCOBJ)
-	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
+#	ar crs $(ISCDBCLIB) $(LIST_ISCDBCOBJ)
+#	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(EXTLIBS) --def $(ISCDBCDEFFILE) -o $(ISCDBCDLL)
 #
-$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
-	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
-	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
+#$(ODBCJDBCDLL) : $(LIST_ODBCJDBCOBJ)
+#	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
+#	$(GCC) $(LINKFLAGS) $(BUILDDIR)/JString.o $(BUILDDIR)/Mutex.o $(LIST_ODBCJDBCOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
 #
 $(ODBCJDBCSETUPDLL) : $(LIST_ODBCJDBCSETUPOBJ)
-	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
-	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
+#	ar crs $(ODBCJDBCSETUPLIB) $(LIST_ODBCJDBCSETUPOBJ)
+#	$(GCC) $(LINKFLAGS) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) -o $(ODBCJDBCSETUPDLL)
+#
+$(ODBCJDBCDLL) : $(ISCDBCDLL) $(ODBCJDBCSETUPDLL) $(LIST_ODBCJDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ISCDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCOBJ)
+	ar crs $(ODBCJDBCLIB) $(LIST_ODBCJDBCSETUPOBJ)
+	$(GCC) $(LINKFLAGS) $(LIST_ISCDBCOBJ) $(LIST_ODBCJDBCOBJ) $(LIST_ODBCJDBCSETUPOBJ) $(EXTLIBS) $(LIBODBCINST) --def $(ODBCJDBCDEFFILE) -o $(ODBCJDBCDLL)
 #
 postbuild : $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
 	@-strip -s $(ISCDBCDLL) $(ODBCJDBCDLL) $(ODBCJDBCSETUPDLL)
@@ -155,7 +161,7 @@ package :
 	chmod 740 ../../Install/Linux/install.sh
 	tar -C $(TARGETDIR) -cvf OdbcJdbcLibs.tar $(ISCDBC) $(ODBCJDBC) $(ODBCJDBCSETUP)
 	tar -C ../../Install/HtmlHelp --exclude=CVS -cvf OdbcJdbcDocs.tar html/ 
-	tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v1.2.html
+	tar -C ../../Install -uf OdbcJdbcDocs.tar ReleaseNotes_v2.0.html
 	tar -C ../../Install/Linux -cf $(PACKAGE_NAME) install.sh readme.txt DriverTemplate.ini FirebirdDSNTemplate.ini InterBaseDSNTemplate.ini
 	tar -uf $(PACKAGE_NAME) OdbcJdbcLibs.tar OdbcJdbcDocs.tar
 	rm OdbcJdbcLibs.tar  OdbcJdbcDocs.tar