[TRAFODION-1893]-Remove vcredist from win-odbc build & Version update

Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cd04a84b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cd04a84b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cd04a84b

Branch: refs/heads/master
Commit: cd04a84bca24004d89b29b7330431fb4c2727012
Parents: 78139dd
Author: zx <zx@vm01.novalocal>
Authored: Tue Oct 18 04:57:16 2016 +0000
Committer: zx <zx@vm01.novalocal>
Committed: Tue Oct 18 04:57:16 2016 +0000

----------------------------------------------------------------------
 win-odbc64/Install/win64_installer/installer.iss       | 11 +++++------
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc           |  8 ++++----
 win-odbc64/odbcclient/TranslationDll/TranslationDll.rc |  8 ++++----
 win-odbc64/odbcclient/build_os.bat                     |  4 ++--
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC        |  8 ++++----
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC        |  8 ++++----
 win-odbc64/odbcclient/drvr35/cdatasource.cpp           |  2 +-
 win-odbc64/odbcclient/drvr35/drvr35.rc                 |  8 ++++----
 win-odbc64/odbcclient/drvr35adm/drvr35adm.h            |  2 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.rc           |  8 ++++----
 10 files changed, 33 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/Install/win64_installer/installer.iss
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/win64_installer/installer.iss 
b/win-odbc64/Install/win64_installer/installer.iss
index 90a1610..64fbec2 100644
--- a/win-odbc64/Install/win64_installer/installer.iss
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -18,11 +18,11 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "Trafodion ODBC64 1.3"
-#define MyAppVersion "1.3.0"
+#define MyAppName "Trafodion ODBC64 2.1"
+#define MyAppVersion "2.1.0"
 #define MyAppPublisher "Apache Trafodion"
 #define MyAppURL ""
-#define MyDriverName "TRAF ODBC 1.0"
+#define MyDriverName "TRAF ODBC 2.1"
 #define BUILDDIR  GetEnv('BUILDDIR')
 
 [Setup]
@@ -38,7 +38,7 @@ AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultGroupName={#MyAppName}
-DefaultDirName={pf}\Trafodion\TRAF ODBC 1.0
+DefaultDirName={pf}\Trafodion\TRAF ODBC 2.1
 OutputBaseFilename=TFODBC64-{#MyAppVersion}
 Compression=lzma
 SolidCompression=yes
@@ -149,14 +149,13 @@ var
   sDefaultBrowserValue: String;
   iQuotePos: Integer;
   lLength: Longint;
-  iRetCode: Integer;
 begin
   if CurStep=ssPostInstall then
   begin
     bRedistNeedsInstall := VCRedistNeedsInstall();
     if bRedistNeedsInstall=True then
     begin
-      MsgBox('Install of Visual C++ Redistributable Packages for Visual Studio 
2013 is not dectected.'+ #13#10#13#10 + 'Please download vcredist_x64.exe from 
Microsoft Download Centre and install it.', mbInformation, MB_OK);
+      MsgBox('Run-time dependency required by the driver is not found.'+ 
#13#10#13#10 + 'Proceeding to download and install run-time dependency from 
Microsoft.', mbInformation, MB_OK);
       if 
RegQueryStringValue(HKCU,'Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice','Progid',sDefaultBrowserName)
 then
       begin
         sDefaultBrowserReg := sDefaultBrowserName + '\shell\open\command';

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc 
b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
index ab536cf..6f9dbc8 100644
--- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
+++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
@@ -73,8 +73,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -91,12 +91,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Driver Resource DLL"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "TRAF ODBC Driver Resource DLL"
             VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software 
Foundation"
             VALUE "OriginalFilename", "traf_ores0100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc 
b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
index b77185f..6656eaa 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Translation DLL"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "TRAF ODBC Translation DLL"
             VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software 
Foundation"
             VALUE "OriginalFilename", "traf_translation01.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat 
b/win-odbc64/odbcclient/build_os.bat
index eccb5c7..284563a 100644
--- a/win-odbc64/odbcclient/build_os.bat
+++ b/win-odbc64/odbcclient/build_os.bat
@@ -159,10 +159,10 @@ if %BUILD_STATUS%==0 (
 )
 
 ISCC.exe /Q %BUILDDIR%\win-odbc64\Install\win64_installer\installer.iss
-copy /Y 
%BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.3.0.exe 
%PACKDIR%
+copy /Y 
%BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-2.1.0.exe 
%PACKDIR%
 @echo on
 
-if exist %PACKDIR%\TFODBC64-1.3.0.exe (
+if exist %PACKDIR%\TFODBC64-2.1.0.exe (
        set ALL_SUCCESS=1
 )
 cd %BUILDDIR%\win-odbc64\odbcclient

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC 
b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC
index 7e82565..09678ec 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC TCPIPV4 DLL"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "TRAF ODBC TCPIPV4 DLL"
             VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software 
Foundation"
             VALUE "OriginalFilename", "traf_tcpipv40100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC 
b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC
index b01628b..b6669d7 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC TCPIPV6 DLL"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "TRAF ODBC TCPIPV6 DLL"
             VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software 
Foundation"
             VALUE "OriginalFilename", "traf_tcpipv60100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/drvr35/cdatasource.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/cdatasource.cpp 
b/win-odbc64/odbcclient/drvr35/cdatasource.cpp
index d5590bb..abf2929 100644
--- a/win-odbc64/odbcclient/drvr35/cdatasource.cpp
+++ b/win-odbc64/odbcclient/drvr35/cdatasource.cpp
@@ -28,7 +28,7 @@
 
 #define MAX_REGKEY_PATH_LEN                    512
 #define        ODBC_DS_KEY                                     
"SOFTWARE\\ODBC\\ODBC.INI\\"
-#define ODBC_CERTIFICATE_KEY           "SOFTWARE\\ODBC\\ODBCINST.INI\\TRAF 
ODBC 1.0"
+#define ODBC_CERTIFICATE_KEY           "SOFTWARE\\ODBC\\ODBCINST.INI\\TRAF 
ODBC 2.1"
 #define SYSTEM_DEFAULT                         "SYSTEM_DEFAULT"
 #define NO_TIMEOUT                                     "NO_TIMEOUT"
 #define CONNECTION_TIMEOUT_DEFAULT     60

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/drvr35/drvr35.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvr35.rc 
b/win-odbc64/odbcclient/drvr35/drvr35.rc
index 62148ca..1f85113 100644
--- a/win-odbc64/odbcclient/drvr35/drvr35.rc
+++ b/win-odbc64/odbcclient/drvr35/drvr35.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Driver DLL"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "TRAF ODBC Driver DLL"
             VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software 
Foundation"
             VALUE "OriginalFilename", "trfodbc1.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.h 
b/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
index 7b9480b..f2ba30d 100644
--- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
+++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.h
@@ -93,7 +93,7 @@ const char INI_REPLACEMENT_CHAR[]     = 
"ReplacementCharacter";
 const char INI_COMPRESSION[]           = "Compression";
 
 const char TRACE_PATH[] = "Software\\ODBC\\ODBC.INI\\ODBC";
-const char DRIVER_NAME[] = "TRAF ODBC 1.0";
+const char DRIVER_NAME[] = "TRAF ODBC 2.1";
 const char CREATE_NEW_DSN[] = "Create a New Trafodion ODBC Data Source to 
Trafodion Database";
 const char CONFIGURE_DSN1[] = "Trafodion ODBC Data Source '";
 const char DRVR_MSG_DLL[] = "traf_odbcDrvMsg_intl0100.dll";

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd04a84b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc 
b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
index abe6775..d1b37ae 100644
--- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
+++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
@@ -62,8 +62,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Client Adminstration DLL"
-            VALUE "FileVersion", "1.3.0.0"
+            VALUE "FileVersion", "2.1.0.0"
             VALUE "InternalName", "TRAF ODBC Client Adminstration DLL"
             VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software 
Foundation"
             VALUE "OriginalFilename", "trfoadm1.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.3.0.0"
+            VALUE "ProductVersion", "2.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

Reply via email to