update windows odbc and odb version to 2.3
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/380f3167 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/380f3167 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/380f3167 Branch: refs/heads/master Commit: 380f31677c9e207856f529d64c64e2260b709572 Parents: 3d132b8 Author: Weixin-Xu <1013438...@qq.com> Authored: Wed Oct 17 10:25:42 2018 +0800 Committer: Weixin-Xu <1013438...@qq.com> Committed: Wed Oct 17 10:25:42 2018 +0800 ---------------------------------------------------------------------- core/conn/odb/build.bat | 4 ++-- core/conn/odb/installer.iss | 6 +++--- win-odbc64/Install/win64_installer/installer.iss | 8 ++++---- 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 ++++---- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 8 ++++---- 13 files changed, 41 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/core/conn/odb/build.bat ---------------------------------------------------------------------- diff --git a/core/conn/odb/build.bat b/core/conn/odb/build.bat index e81a79c..60a058b 100644 --- a/core/conn/odb/build.bat +++ b/core/conn/odb/build.bat @@ -57,10 +57,10 @@ if %BUILD_STATUS% == 0 ( ISCC.exe /Q %BUILDDIR%\installer.iss -copy /Y %BUILDDIR%\Output\TRAFODB-2.2.0.exe %PACKDIR% +copy /Y %BUILDDIR%\Output\TRAFODB-2.3.0.exe %PACKDIR% @echo on -if exist %PACKDIR%\TRAFODB-2.2.0.exe ( +if exist %PACKDIR%\TRAFODB-2.3.0.exe ( set ALL_SUCCESS=1 ) http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/core/conn/odb/installer.iss ---------------------------------------------------------------------- diff --git a/core/conn/odb/installer.iss b/core/conn/odb/installer.iss index e2278bd..020c8cc 100644 --- a/core/conn/odb/installer.iss +++ b/core/conn/odb/installer.iss @@ -18,8 +18,8 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppName "Trafodion ODB 2.2" -#define MyAppVersion "2.2.0" +#define MyAppName "Trafodion ODB 2.3" +#define MyAppVersion "2.3.0" #define MyAppPublisher "Apache Trafodion" #define MyAppURL "http://trafodion.apache.org/"; #define MyAppExeName "odb.exe" @@ -131,4 +131,4 @@ begin Result := False; //when older version present and not uninstalled end; -end; \ No newline at end of file +end; http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/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 45fae07..673e126 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 2.2" -#define MyAppVersion "2.2.0" +#define MyAppName "Trafodion ODBC64 2.3" +#define MyAppVersion "2.3.0" #define MyAppPublisher "Apache Trafodion" #define MyAppURL "" -#define MyDriverName "TRAF ODBC 2.2" +#define MyDriverName "TRAF ODBC 2.3" #define BUILDDIR GetEnv('BUILDDIR') [Setup] @@ -38,7 +38,7 @@ AppPublisherURL={#MyAppURL} AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultGroupName={#MyAppName} -DefaultDirName={pf}\Trafodion\TRAF ODBC 2.2 +DefaultDirName={pf}\Trafodion\TRAF ODBC 2.3 OutputBaseFilename=TFODBC64-{#MyAppVersion} Compression=lzma SolidCompression=yes http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc index d778f8c..8ea3898 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 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC Driver Resource DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_ores0100.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo" http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc index 4ed1e2f..defceb2 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 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC Translation DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_translation01.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo" http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/build_os.bat ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat index f81567c..d2a0b30 100644 --- a/win-odbc64/odbcclient/build_os.bat +++ b/win-odbc64/odbcclient/build_os.bat @@ -155,10 +155,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-2.2.0.exe %PACKDIR% +copy /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-2.3.0.exe %PACKDIR% @echo on -if exist %PACKDIR%\TFODBC64-2.2.0.exe ( +if exist %PACKDIR%\TFODBC64-2.3.0.exe ( set ALL_SUCCESS=1 ) cd %BUILDDIR%\win-odbc64\odbcclient http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/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 4bb903c..82140f1 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 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC TCPIPV4 DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_tcpipv40100.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo" http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/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 c43710e..a170706 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 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC TCPIPV6 DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_tcpipv60100.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo" http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/drvr35/cdatasource.cpp ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/cdatasource.cpp b/win-odbc64/odbcclient/drvr35/cdatasource.cpp index 054621a..d20bbc2 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 2.2" +#define ODBC_CERTIFICATE_KEY "SOFTWARE\\ODBC\\ODBCINST.INI\\TRAF ODBC 2.3" #define SYSTEM_DEFAULT "SYSTEM_DEFAULT" #define NO_TIMEOUT "NO_TIMEOUT" #define CONNECTION_TIMEOUT_DEFAULT 60 http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/drvr35/drvr35.rc ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35/drvr35.rc b/win-odbc64/odbcclient/drvr35/drvr35.rc index 27595f7..4a8fee5 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 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC Driver DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "trfodbc1.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo" http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/drvr35adm/drvr35adm.h ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.h b/win-odbc64/odbcclient/drvr35adm/drvr35adm.h index a69517e..5a9327d 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 2.2"; +const char DRIVER_NAME[] = "TRAF ODBC 2.3"; 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/trafodion/blob/380f3167/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc index 88237c1..d61450f 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 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,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", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC Client Adminstration DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "trfoadm1.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo" http://git-wip-us.apache.org/repos/asf/trafodion/blob/380f3167/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc ---------------------------------------------------------------------- diff --git a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc index 28026c3..659613c 100644 --- a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc +++ b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,0,0 - PRODUCTVERSION 2,2,0,0 + FILEVERSION 2,3,0,0 + PRODUCTVERSION 2,3,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Apache Trafodion" VALUE "FileDescription", "TRAF ODBC Client Msg DLL" - VALUE "FileVersion", "2.2.0.0" + VALUE "FileVersion", "2.3.0.0" VALUE "InternalName", "TRAF ODBC Client Msg DLL" VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_odbcDrvMsg_intl0100.dll" VALUE "ProductName", "TRAF ODBC" - VALUE "ProductVersion", "2.2.0.0" + VALUE "ProductVersion", "2.3.0.0" END END BLOCK "VarFileInfo"
