[Firebird-checkins] CVS: OdbcJdbc/IscDbc IscDatabaseMetaData.cpp,1.7.2.1,1.7.2.2 IscDbc.rc,1.4.2.1,1.4.2.2

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

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

Modified Files:
      Tag: v1-2-beta
	IscDatabaseMetaData.cpp IscDbc.rc 
Log Message:
add counterBuild to version dll's
 branch v1-2-beta

Index: IscDatabaseMetaData.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/IscDatabaseMetaData.cpp,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -b -U3 -r1.7.2.1 -r1.7.2.2
--- IscDatabaseMetaData.cpp	1 Nov 2003 15:08:50 -0000	1.7.2.1
+++ IscDatabaseMetaData.cpp	5 Nov 2003 17:44:51 -0000	1.7.2.2
@@ -44,6 +44,7 @@
 
 #include <stdio.h>
 #include "IscDbc.h"
+#include "../SetupAttributes.h"
 #include "IscDatabaseMetaData.h"
 #include "IscConnection.h"
 #include "Attachment.h"
@@ -60,10 +61,6 @@
 #include "TypesResultSet.h"
 #include "IscSpecialColumnsResultSet.h"
 #include "IscTablePrivilegesResultSet.h" 
-
-#define DRIVER_VERSION	"T1.0A"
-#define MAJOR_VERSION	1
-#define MINOR_VERSION	0
 
 #define TRANSACTION_READ_UNCOMMITTED  1
 

Index: IscDbc.rc
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/IscDbc.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
--- IscDbc.rc	5 Nov 2003 06:53:00 -0000	1.4.2.1
+++ IscDbc.rc	5 Nov 2003 17:44:51 -0000	1.4.2.2
@@ -1,7 +1,18 @@
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
+#include "../SetupAttributes.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 // English (U.K.) resources
 
@@ -18,8 +29,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
@@ -37,14 +48,14 @@
             VALUE "Comments", "\0"
             VALUE "CompanyName", "IBPhoenix Inc.\0"
             VALUE "FileDescription", "IscDbc\0"
-            VALUE "FileVersion", "1, 2, 0, 4\0"
+            VALUE "FileVersion", FILE_VERSION_STR
             VALUE "InternalName", "IscDbc\0"
-            VALUE "LegalCopyright", "Copyright © 2000- 2003\0"
+            VALUE "LegalCopyright", "Copyright © 2000 - 2003\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "IscDbc.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "IscDbc Dynamic Link Library\0"
-            VALUE "ProductVersion", "1, 2, 0, 4\0"
+            VALUE "ProductVersion", PRODUCT_VERSION_STR
             VALUE "SpecialBuild", "Beta\0"
         END
     END