From 9ad4960abe142628dddc49712b748cade1386a82 Mon Sep 17 00:00:00 2001 From: Weqing Xu Date: Wed, 21 Jun 2017 21:12:40 +0800 Subject: [PATCH 1/3] [TRAFODION-2659]update win ODBC/ODB version number to 2.2.0 --- core/conn/odb/build.bat | 4 +- core/conn/odb/installer.iss | 4 +- core/conn/odb/odb/odb.rc | Bin 5120 -> 5120 bytes .../Install/win64_installer/installer.iss | 8 ++-- win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 8 ++-- .../TranslationDll/TranslationDll.rc | 8 ++-- win-odbc64/odbcclient/build_os.bat | 4 +- .../odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 8 ++-- .../odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 8 ++-- win-odbc64/odbcclient/drvr35/cdatasource.cpp | 38 ++++++++-------- win-odbc64/odbcclient/drvr35/drvr35.rc | 8 ++-- win-odbc64/odbcclient/drvr35adm/drvr35adm.h | 42 +++++++++--------- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 8 ++-- 13 files changed, 74 insertions(+), 74 deletions(-) diff --git a/core/conn/odb/build.bat b/core/conn/odb/build.bat index 409c40f1c5..e81a79c413 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.1.0.exe %PACKDIR% +copy /Y %BUILDDIR%\Output\TRAFODB-2.2.0.exe %PACKDIR% @echo on -if exist %PACKDIR%\TRAFODB-2.1.0.exe ( +if exist %PACKDIR%\TRAFODB-2.2.0.exe ( set ALL_SUCCESS=1 ) diff --git a/core/conn/odb/installer.iss b/core/conn/odb/installer.iss index 37f7f230a8..e2278bd53c 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.1" -#define MyAppVersion "2.1.0" +#define MyAppName "Trafodion ODB 2.2" +#define MyAppVersion "2.2.0" #define MyAppPublisher "Apache Trafodion" #define MyAppURL "http://trafodion.apache.org/" #define MyAppExeName "odb.exe" diff --git a/core/conn/odb/odb/odb.rc b/core/conn/odb/odb/odb.rc index 3af5cde488823cf83ebfd12804cae8571135102d..b20e0f0d4956608ffaa8ca5453810ffa04eb8dff 100644 GIT binary patch delta 42 wcmZqBXwca3f{W2;@=Gp#Mx)J=+-I49od5i?lMnEVZI Date: Thu, 22 Jun 2017 19:49:56 +0800 Subject: [PATCH 2/3] update win odbc/odc copyright to 2017 --- core/conn/odb/odb/odb.rc | Bin 5120 -> 5336 bytes .../odbcclient/DSNConverter/DSNConverter.def | 2 +- win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc | 2 +- .../TranslationDll/TranslationDll.def | 2 +- .../TranslationDll/TranslationDll.rc | 2 +- .../odbcclient/drvr35/TCPIPV4/TCPIPV4.RC | 2 +- .../odbcclient/drvr35/TCPIPV6/TCPIPV6.RC | 2 +- win-odbc64/odbcclient/drvr35/drvr35.rc | 2 +- win-odbc64/odbcclient/drvr35adm/drvr35adm.rc | 2 +- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/conn/odb/odb/odb.rc b/core/conn/odb/odb/odb.rc index b20e0f0d4956608ffaa8ca5453810ffa04eb8dff..85c0a4f01cfc594558a8b132572bc52df71cad08 100644 GIT binary patch delta 873 zcma)4J1+!L6h6c3*qxa>GYA_IcG-AL6buCt60ap5K|!$z5eX6@5|4t$tD*A9NhAuj zO85g3Dvd;=&`#nHP)j)X?%myyRmf!SeCM3+n|sf9?tbH&d$tr|phGh~41Fbfepnvj z33h&&R2UuL^f#4n)+kxNoEAb1SFL$N%btMxW;ZCpOJFas@6 zD-;1OG1~sz=T?g*{-H-->y~}_S`~H`4F-DSdf_PL?!%*5Z`Oq`(=z_;__`itTqouu z^rw0!@t^c2T0eB|U5&x^q+u5ScOemIfv&pyfakcEU&G>0xZK4RUeH+ zO}e{5@^y^-oq`lh(l<^nZG%TShKgC2=c{M7)2{PQ8Lb{G#S=3w(SxZAMgg#hG);FvXr5*1r-j~N*thPHO+O=D<$ijD<>u8sX+{7~Tlo|9K?nv%Dj&0$E z(<-}5vvcYkqPy?Rk&@gOev4TNzy0F2bUtwN_mm<0Dk;yqqnYXQ*}s-HhBJTp0dTFB A1ONa4 delta 670 zcmaJ<%}WAN5Fa;l@$LGxS|XL%+ChWzqmVoVWm#s_rHBrN5Gjb_N8PjTLg_#ki|WuZ z`WK>e(4|9%p#P#<(Cl+9^AO9vnfH4$@6GQw^A3#pG z#2=({1`%8^4LKPkAPFn53LAv^w6AgMvF$<_R05I&F9E|jla~4uiUrfckRDDcD)h#` z^u&Le-2cY693!|T`iP9?U5LwC*?m+dr>vUOoMsh^MlT91Mmv(i-yuU9QWe{fg+n+Z z;$Ca@%h@rLZPG)#7|DKjGEr<5Y4Wbs;ZV_0UEHdcZIuHTyM$BOL5 zb9wv^{SUhb-w9V7E>tX0`dy-~A~vi+tXt->X$|0~CBf~!b&Bi`_g%KMA%+=SobR4& zv)mrrtr)edx<5lVDg(Os?XJ+u_xNFt=iKO&C#Tc6mLsE2fF|ahGTk)~ THRm493YSS2y6##sYP0bTA@zx2 diff --git a/win-odbc64/odbcclient/DSNConverter/DSNConverter.def b/win-odbc64/odbcclient/DSNConverter/DSNConverter.def index 21fd751e6c..c96c6a56c4 100644 --- a/win-odbc64/odbcclient/DSNConverter/DSNConverter.def +++ b/win-odbc64/odbcclient/DSNConverter/DSNConverter.def @@ -23,7 +23,7 @@ ; DSNConverter.def : Declares the module parameters for the DLL. -DESCRIPTION "ODBC/MX DSN Converter DLL, (C) Copyright (c) 2015-2016 Apache Software Foundation" +DESCRIPTION "ODBC/MX DSN Converter DLL, (C) Copyright (c) 2015-2017 Apache Software Foundation" LIBRARY DSNConverter EXPORTS IsDriverInstalled @1 diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc index 23619824b3..d778f8c95e 100644 --- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc +++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc @@ -93,7 +93,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC Driver Resource DLL" VALUE "FileVersion", "2.2.0.0" VALUE "InternalName", "TRAF ODBC Driver Resource DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_ores0100.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "2.2.0.0" diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.def b/win-odbc64/odbcclient/TranslationDll/TranslationDll.def index 6d45ba8d37..3517aa4a2a 100644 --- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.def +++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.def @@ -21,7 +21,7 @@ ; TranslationDll.def : Declares the module parameters for the DLL. -;DESCRIPTION "ODBC Translation DLL, Copyright (c) 2015-2016 Apache Software Foundation" +;DESCRIPTION "ODBC Translation DLL, Copyright (c) 2015-2017 Apache Software Foundation" LIBRARY hp_translation03 EXPORTS SQLDriverToDataSource @1 diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc index bfdbe0bf0d..4ed1e2f988 100644 --- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc +++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc @@ -45,7 +45,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC Translation DLL" VALUE "FileVersion", "2.2.0.0" VALUE "InternalName", "TRAF ODBC Translation DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_translation01.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "2.2.0.0" diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC index 765cdeb090..4bb903c0d4 100644 --- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC +++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC @@ -45,7 +45,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC TCPIPV4 DLL" VALUE "FileVersion", "2.2.0.0" VALUE "InternalName", "TRAF ODBC TCPIPV4 DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_tcpipv40100.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "2.2.0.0" diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC index a502c87fec..c43710e6a4 100644 --- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC +++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC @@ -45,7 +45,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC TCPIPV6 DLL" VALUE "FileVersion", "2.2.0.0" VALUE "InternalName", "TRAF ODBC TCPIPV6 DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_tcpipv60100.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "2.2.0.0" diff --git a/win-odbc64/odbcclient/drvr35/drvr35.rc b/win-odbc64/odbcclient/drvr35/drvr35.rc index 465cfa4af6..27595f72ef 100644 --- a/win-odbc64/odbcclient/drvr35/drvr35.rc +++ b/win-odbc64/odbcclient/drvr35/drvr35.rc @@ -45,7 +45,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC Driver DLL" VALUE "FileVersion", "2.2.0.0" VALUE "InternalName", "TRAF ODBC Driver DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "trfodbc1.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "2.2.0.0" diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc index c2d31b1c03..88237c17f8 100644 --- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc +++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc @@ -82,7 +82,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC Client Adminstration DLL" VALUE "FileVersion", "2.2.0.0" VALUE "InternalName", "TRAF ODBC Client Adminstration DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "trfoadm1.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "2.2.0.0" diff --git a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc index 656bf1a31f..834266cefd 100644 --- a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc +++ b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc @@ -71,7 +71,7 @@ BEGIN VALUE "FileDescription", "TRAF ODBC Client Msg DLL" VALUE "FileVersion", "1.3.0.0" VALUE "InternalName", "TRAF ODBC Client Msg DLL" - VALUE "LegalCopyright", "?Copyright 2015-2016 Apache Software Foundation" + VALUE "LegalCopyright", "?Copyright 2015-2017 Apache Software Foundation" VALUE "OriginalFilename", "traf_odbcDrvMsg_intl0100.dll" VALUE "ProductName", "TRAF ODBC" VALUE "ProductVersion", "1.3.0.0" From 0cdec6431a230582b91c7d165df19dc855532613 Mon Sep 17 00:00:00 2001 From: Weqing Xu Date: Fri, 23 Jun 2017 11:15:03 +0800 Subject: [PATCH 3/3] update version of drvr35msg --- win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc | 8 ++++---- win-odbc64/odbcclient/update_version.pl | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc index 834266cefd..28026c31a0 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 1,3,0,0 - PRODUCTVERSION 1,3,0,0 + FILEVERSION 2,2,0,0 + PRODUCTVERSION 2,2,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", "1.3.0.0" + VALUE "FileVersion", "2.2.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", "1.3.0.0" + VALUE "ProductVersion", "2.2.0.0" END END BLOCK "VarFileInfo" diff --git a/win-odbc64/odbcclient/update_version.pl b/win-odbc64/odbcclient/update_version.pl index be892a93e6..e9b8ea605d 100644 --- a/win-odbc64/odbcclient/update_version.pl +++ b/win-odbc64/odbcclient/update_version.pl @@ -40,6 +40,7 @@ my @resource_files = ("TranslationDll/TranslationDll.rc", "drvr35adm/drvr35adm.rc", + "drvr35msg/DrvMsg35.rc", "drvr35/TCPIPV4/TCPIPV4.RC", "drvr35/TCPIPV6/TCPIPV6.RC", "drvr35/drvr35.rc",