[Firebird-checkins] CVS: OdbcJdbc OdbcJdbc.rc,1.4.2.1,1.4.2.2 SetupAttributes.h,1.3.2.1,1.3.2.2

[Vladimir T. <pr...@us...>]

Update of /cvsroot/firebird/OdbcJdbc
In directory sc8-pr-cvs1:/tmp/cvs-serv26004

Modified Files:
      Tag: v1-2-beta
	OdbcJdbc.rc SetupAttributes.h 
Log Message:
add counterBuild to version dll's, and test connection
 to OdbcJdbcSetup(only Win32)
 branch v1-2-beta

Index: OdbcJdbc.rc
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcJdbc.rc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -b -U3 -r1.4.2.1 -r1.4.2.2
--- OdbcJdbc.rc	5 Nov 2003 06:52:39 -0000	1.4.2.1
+++ OdbcJdbc.rc	5 Nov 2003 17:43:43 -0000	1.4.2.2
@@ -1,6 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
+#include "SetupAttributes.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -29,8 +30,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,4
- PRODUCTVERSION 1,2,0,4
+ FILEVERSION FILE_VERSION
+ PRODUCTVERSION PRODUCT_VERSION
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -48,14 +49,14 @@
             VALUE "Comments", "\0"
             VALUE "CompanyName", "IBPhoenix Inc\0"
             VALUE "FileDescription", "OdbcJdbc\0"
-            VALUE "FileVersion", "1, 2, 0, 4\0"
+            VALUE "FileVersion", FILE_VERSION_STR
             VALUE "InternalName", "OdbcJdbc\0"
             VALUE "LegalCopyright", "Copyright © 2000 - 2003\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "OdbcJdbc.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OdbcJdbc Dynamic Link Library\0"
-            VALUE "ProductVersion", "1, 2, 0, 4\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_STR
             VALUE "SpecialBuild", "Beta\0"
         END
     END

Index: SetupAttributes.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/SetupAttributes.h,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -b -U3 -r1.3.2.1 -r1.3.2.2
--- SetupAttributes.h	1 Nov 2003 15:03:30 -0000	1.3.2.1
+++ SetupAttributes.h	5 Nov 2003 17:43:43 -0000	1.3.2.2
@@ -21,17 +21,18 @@
 #ifndef __SETUP_ATTRIBUTES_H
 #define __SETUP_ATTRIBUTES_H
 
-/* 
- * I'm reasonably sure this string should match the one in Setup.cpp 
- * for the declaration of driverInfo. It is only used in one place - 
- *   OdbcConnection::sqlDriverConnect()
- * however, if an attempt is made to create a FileDSN the system 
- * doesn't use 'OdbcJdbc' as the driver string.		PR 2002-06-04
- */
+
+#define BUILDNUM_VERSION 	0005
+
+
+#define BUILDTYPE_VERSION 	"WI_T"
+#define MAJOR_VERSION 		1
+#define MINOR_VERSION 		2
+#define REVNO_VERSION 		0
+
 #define DRIVER_FULL_NAME	"Firebird/InterBase(r) driver"
 #define DRIVER_NAME			"OdbcJdbc"
 
-#define DRIVER_VERSION		"01.00.0000"
 #define SETUP_DSN			"DSN"
 #define SETUP_DBNAME		"Dbname"
 #define SETUP_CLIENT		"Client"
@@ -45,4 +46,19 @@
 #define SETUP_NOWAIT_TPB	"NoWait"
 #define SETUP_DIALECT		"Dialect"
 #define SETUP_QUOTED		"QuotedIdentifier"
+
+#define BUILD_STR(x)	#x
+#define BUILD_STR1(x)	x
+#define BUILD_STR2(x)   BUILD_STR(x)
+
+#define BUILD_DRIVER_VERSION(major,minor,buildnum)	major"."minor"."buildnum
+#define BUILD_VERSION(major,minor,revno,buildnum)	major,minor,revno,buildnum
+#define BUILD_VERSION_STR(major,minor,revno,buildnum) major "," minor "," revno "," buildnum
+
+#define DRIVER_VERSION		BUILD_DRIVER_VERSION( BUILD_STR2( MAJOR_VERSION ), BUILD_STR2( MINOR_VERSION ), BUILD_STR2( BUILDNUM_VERSION ) )
+#define FILE_VERSION		BUILD_VERSION( MAJOR_VERSION, MINOR_VERSION, REVNO_VERSION, BUILDNUM_VERSION )
+#define FILE_VERSION_STR	BUILDTYPE_VERSION BUILD_VERSION_STR( BUILD_STR2( MAJOR_VERSION ), BUILD_STR2( MINOR_VERSION ), BUILD_STR2(REVNO_VERSION), BUILD_STR2(BUILDNUM_VERSION) )
+#define PRODUCT_VERSION		BUILD_VERSION ( MAJOR_VERSION, MINOR_VERSION, REVNO_VERSION, BUILDNUM_VERSION )
+#define PRODUCT_VERSION_STR	BUILD_VERSION_STR ( BUILD_STR2( MAJOR_VERSION ), BUILD_STR2( MINOR_VERSION ), BUILD_STR2( REVNO_VERSION ), BUILD_STR2( BUILDNUM_VERSION ) )
+
 #endif