You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/10/29 00:37:58 UTC

[1/8] incubator-trafodion git commit: [TRAFODION-1519]Use free tool to build windows ODBC

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master c5e3d7878 -> a74c226e8


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
index a7a1140..0c6a13e 100644
--- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
+++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Driver Resource DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC Driver Resource DLL"
-            VALUE "LegalCopyright", "?Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_ores0100.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj
index 22ef9bb..8f9ad14 100644
--- a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj
+++ b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -19,11 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/Drvr35Res/res/Drvr35Res.rc2
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/res/Drvr35Res.rc2 b/win-odbc64/odbcclient/Drvr35Res/res/Drvr35Res.rc2
index b785b80..b3bcf96 100644
--- a/win-odbc64/odbcclient/Drvr35Res/res/Drvr35Res.rc2
+++ b/win-odbc64/odbcclient/Drvr35Res/res/Drvr35Res.rc2
@@ -1,13 +1,13 @@
-//
-// DRVR35RES.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-	#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-/////////////////////////////////////////////////////////////////////////////
+//
+// DRVR35RES.RC2 - resources Microsoft Visual C++ does not edit directly
+//
+
+#ifdef APSTUDIO_INVOKED
+	#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Add manually edited resources here...
+
+/////////////////////////////////////////////////////////////////////////////

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/README.txt
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/README.txt b/win-odbc64/odbcclient/README.txt
index 57820d8..3146b9b 100644
--- a/win-odbc64/odbcclient/README.txt
+++ b/win-odbc64/odbcclient/README.txt
@@ -1,4 +1,4 @@
-# @@@ START COPYRIGHT @@@
+# @@@ START COPYRIGHT @@@
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -17,68 +17,44 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# @@@ END COPYRIGHT @@@
-
-Prerequisite:
-
-openssl >= 0.9.8
-Microsoft Visual Studio >= 2010
-64bit odbccp32.lib from Microsoft Visual Studio 2008 or previous.
-InstallShield >= 2012
-git > 1.9
-
-Build steps
-
-1. In order to make the build script able to find these prerequisites,
-   some variables on the top of build_os.bat and pkg.bat need to be set accordingly.
-
-   Set variable OPENSSL_PATH to point to openssl binary folder, for example:
-	set OPENSSL_PATH=E:\OpenSSL101e_bin
-   The folder should have structure like this:
-	2013/10/31  18:13    <DIR>          .
-	2013/10/31  18:13    <DIR>          ..
-	2013/10/31  18:13    <DIR>          bin
-	2013/02/11  08:26           435,662 changes.txt
-	2013/10/31  18:13    <DIR>          exp
-	2013/02/11  08:26            46,614 faq.txt
-	2013/10/31  18:13    <DIR>          include
-	2013/10/31  18:13    <DIR>          lib
-	2013/02/11  09:59         1,647,616 libeay32.dll
-	2013/02/11  09:59           351,744 libssl32.dll
-	2013/02/11  08:02             6,279 license.txt
-	2013/02/11  08:26            27,423 news.txt
-	2004/05/10  16:23            30,423 OpenSSLhelp.chm
-	2013/02/11  08:26             9,130 readme.txt
-	2013/02/11  09:59           351,744 ssleay32.dll
-	2013/10/31  18:13            20,790 unins000.dat
-	2013/10/31  18:11           715,038 unins000.exe
-
-
-   Set variable ODBCCP32_64_PATH point to Visual Studio 8 PlatformSDK library amd64 folder, for example:
-	set ODBCCP32_64_PATH="E:\Program Files (x86)\Microsoft Visual Studio 8\VC\PlatformSDK\Lib\amd64"
-
-   Set variable MSBUILD_PATH to point to msbuild system, for example:
-	set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
-
-   Set variable BUILDDIR to point to parent directory of win-odbc64 folder (Trafodion windows driver source directory).
-   For example:
-	set BUILDDIR=E:
-
-   Set variable GIT_BASH point to where git bash was installed.(from git install), for example:
-	set GIT_BASH="C:\Program Files (x86)\Git\bin\sh.exe"
-
-   The path for InstallShield needs to be set in pkg.bat
-
-   Set variable PACKDRIVER to conn folder of Trafodion source tree, for example:
-	set PACKDRIVER=E:
-
-   Set variable ISCMDBLD_PATH to InstallShield install folder, for example:
-	set ISCMDBLD_PATH="E:\Program Files (x86)\Installshield\2012\System"
-
-2. To build, open a cmd window, and type
-
-	cd E:\win-odbc64\odbcclient
-	build_os.bat
-	pkg.bat
-
-The final Win ODBC driver installer package can be found at %PACKDRIVER%\lib\x64\Release
+# @@@ END COPYRIGHT @@@
+
+Prerequisite:
+
+openssl >= 0.9.8
+zlib >= 1.2.8
+Microsoft Visual Studio >= 2013
+Inno Setup >= 5
+
+Build steps
+
+1. In order to make the build script able to find these prerequisites,
+   some variables on the top of build_os.bat and pkg.bat need to be set accordingly.
+
+   Set variable OPENSSL_LIB_PATH to point to openssl library files folder, for example:
+	set OPENSSL_PATH=C:\openssl-1.0.1e\lib
+
+   Set variable OPENSSL_INCLUDE_PATH to point to openssl header files folder, for example:
+    set OPENSSL_INCLUDE_PATH=C:\openssl-1.0.1e\include
+
+   Set variable ZLIB_INCLUDE_PATH to point to zlib header files folder, for example:
+    set ZLIB_INCLUDE_PATH=C:\zlib\include
+
+   Set variable ZLIB_LIB_PATH to point to zlib library files folder, for example:
+    set ZLIB_LIB_PATH=C:\zlib\lib
+
+   Set variable MSBUILD_PATH to point to msbuild system, for example:
+	  set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
+
+   Set variable PACKDIR to conn folder of Trafodion source tree, for example:
+	  set PACKDIR=C:\Build\winodbc64
+
+   Set variable INNO_SETUP_PATH to inno setup install folder, for example:
+	  set INNO_SETUP_PATH="C:\Program Files (x86)\Inno Setup 5"
+
+   Download vcredist_x64.exe from http://www.microsoft.com/en-us/download/details.aspx?id=40784 and copy it to C:\Build\winodbc64\redist
+
+2. To build, open a cmd window, change to win-odbc64\odbcclient and type
+	build_os.bat
+
+The final Win ODBC driver installer package can be found at %PACKDIR%
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
index 9bcc37d..07d8c4f 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
@@ -41,11 +41,11 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Translation DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC Translation DLL"
-            VALUE "LegalCopyright", "?Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_translation01.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj b/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj
index 9dd8251..d900501 100644
--- a/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj
+++ b/win-odbc64/odbcclient/TranslationDll/TranslationDll_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -18,10 +18,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat
index a5f9be7..2671c7d 100644
--- a/win-odbc64/odbcclient/build_os.bat
+++ b/win-odbc64/odbcclient/build_os.bat
@@ -1,5 +1,5 @@
-@echo off
-REM @@@ START COPYRIGHT @@@
+@echo off
+REM @@@ START COPYRIGHT @@@
 REM
 REM Licensed to the Apache Software Foundation (ASF) under one
 REM or more contributor license agreements.  See the NOTICE file
@@ -18,175 +18,152 @@ REM KIND, either express or implied.  See the License for the
 REM specific language governing permissions and limitations
 REM under the License.
 REM
-REM @@@ END COPYRIGHT @@@
-
-REM set this to openssl binary directory.
-set OPENSSL_PATH=E:\OpenSSL101e_bin
-REM set ODBCCP32_32_PATH="E:\Program Files (x86)\Microsoft Visual Studio 8\VC\PlatformSDK\Lib"
-REM set this to vs2008 64bit odbccp32.lib directory.
-set ODBCCP32_64_PATH="E:\Program Files (x86)\Microsoft Visual Studio 8\VC\PlatformSDK\Lib\amd64"
-set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
-REM set this to top directory include everything for build
-set BUILDDIR=E:
-REM set this to where git bash was installed.(from git install)
-set GIT_BASH="C:\Program Files (x86)\Git\bin\sh.exe"
-
-set ZLIB_SRC=%BUILDDIR%\zlib_official
-set ZLIB_SRC_GIT=%ZLIB_SRC:\=/%
-
-set SRCDIR=%BUILDDIR%\win-odbc64
-set LIBDIR=%BUILDDIR%\lib 
-set PATH=%MSBUILD_PATH%\;%PATH%
-set DATE=
-set ALL_SUCCESS=0
-
-echo=
-echo ===============================
-echo     BUILD WIN64 RELEASE
-echo ===============================
-echo=
-
-echo Building zlib - Win64 Release...
-if not exist %ZLIB_SRC% (
-echo %GIT_BASH%
-%GIT_BASH% --login -c "git clone https://github.com/madler/zlib/ %ZLIB_SRC_GIT%"
-)
-
-cd %ZLIB_SRC%\contrib\vstudio\vc10
-msbuild.exe /t:rebuild zlibstat.vcxproj /p:Platform=x64 /p:Configuration=Release
-cd %ZLIB_SRC%
-
-if not exist %SRCDIR%\dependencies\zlib\lib\x64\Release (
-mkdir %SRCDIR%\dependencies\zlib\lib\x64\Release
-)
-if not exist %SRCDIR%\dependencies\zlib\include (
-mkdir %SRCDIR%\dependencies\zlib\include
-)
-copy /Y %ZLIB_SRC%\contrib\vstudio\vc10\x64\ZlibStatRelease\zlibstat.lib %SRCDIR%\dependencies\zlib\lib\x64\Release
-copy /Y %ZLIB_SRC%\zlib.h %SRCDIR%\dependencies\zlib\include
-copy /Y %ZLIB_SRC%\zconf.h %SRCDIR%\dependencies\zlib\include
-cd %SRCDIR%
-rmdir /S /Q %ZLIB_SRC%
-
-echo Building Drvr35Msg - Win64 Release...
-cd %SRCDIR%\odbcclient\Drvr35Msg
-msbuild.exe /t:rebuild Drvr35Msg_os.vcxproj /p:Platform=x64 /p:Configuration=Release
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build Drvr35Msg success
-) else (
-	echo Build Drvr35Msg failed
-	goto Exit
-)
-
-
-echo Building Drvr35 - Win64 Release...
-cd %SRCDIR%\odbcclient\Drvr35
-msbuild.exe /t:rebuild Drvr35_os.vcxproj /p:Platform=x64 /p:Configuration=Release /p:OpenSSLIncludeDir=%OPENSSL_PATH%\include /p:OpenSSLLibraryDir=%OPENSSL_PATH%\lib\VC\static 
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build Drvr35 success
-) else ( 
-	echo Build Drvr35 failed
-	goto Exit
-)
-  
-echo Building Drvr35Adm - Win64 Release...
-cd %SRCDIR%\odbcclient\Drvr35Adm
-msbuild.exe /t:rebuild Drvr35Adm_os.vcxproj /p:Platform=x64 /p:Configuration=Release
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build Drvr35Adm success
-) else ( 
-	echo Build Drvr35Adm failed
-	goto Exit
-)
-
-REM echo Building Drvr35Trace - Win64 Release...
-REM cd %SRCDIR%\odbcclient\Drvr35Trace
-REM msbuild.exe /t:rebuild Drvr35Trace_os.vcxproj /p:Platform=x64 /p:Configuration=Release
-REM set BUILD_STATUS=%ERRORLEVEL%
-REM if %BUILD_STATUS%==0 (
-REM	echo Build Drvr35Trace success
-REM ) else ( 
-REM	echo Build Drvr35Trace failed
-REM	goto Exit
-REM )
-
-echo Building TCPIPV4 - Win64 Release...
-cd %SRCDIR%\odbcclient\Drvr35\TCPIPV4
-msbuild.exe /t:rebuild TCPIPV4_os.vcxproj /p:Platform=x64 /p:Configuration=Release
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build TCPIPV4 success
-) else ( 
-	echo Build TCPIPV4 failed
-	goto Exit
-)
-
-echo Building TCPIPV6 - Win64 Release...
-cd %SRCDIR%\odbcclient\Drvr35\TCPIPV6
-msbuild.exe /t:rebuild TCPIPV6_os.vcxproj /p:Platform=x64 /p:Configuration=Release
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build TCPIPV6 success
-) else ( 
-	echo Build TCPIPV6 failed
-	goto Exit
-)
-
-echo Building TranslationDll - Win64 Release...
-cd %SRCDIR%\odbcclient\TranslationDll
-msbuild.exe /t:rebuild TranslationDll_os.vcxproj /p:Platform=x64 /p:Configuration=Release	
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build TranslationDll success
-) else ( 
-	echo Build TranslationDll failed
-	goto Exit
-)
-
-echo Building Drvr35Res - Win64 Release...
-cd %SRCDIR%\odbcclient\Drvr35Res 
-msbuild.exe /t:rebuild Drvr35Res_os.vcxproj /p:Platform=x64 /p:Configuration=Release	
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build Drvr35Res success
-) else ( 
-	echo Build Drvr35Res failed
-	goto Exit
-)
-   
-echo Building SetCertificateDirReg InstallHelper - Win64 Release...
-cd %SRCDIR%\Install\SetCertificateDirReg\SetCertificateDirReg
-msbuild.exe /t:rebuild SetCertificateDirReg_os.vcxproj /p:Platform=x64 /p:Configuration=Release /p:Odbccp32lib64Dir=%ODBCCP32_64_PATH% 
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build SetCertificateDirReg success
-) else ( 
-	echo Build SetCertificateDirReg failed
-	goto Exit
-)
- 
-echo Building UpdateDSN InstallHelper - Win64 Release...
-cd %SRCDIR%\Install\UpdateDSN\UpdateDSN
-msbuild.exe /t:rebuild UpdateDSN_os.vcxproj /p:Platform=x64 /p:Configuration=Release
-set BUILD_STATUS=%ERRORLEVEL%
-if %BUILD_STATUS%==0 (
-	echo Build UpdateDSN success
-) else ( 
-	echo Build UpdateDSN failed
-	goto Exit
-)
-set ALL_SUCCESS=1
-
-:Exit
-if %ALL_SUCCESS%==1 (
-	echo=
-	echo ========================================
-	echo     BUILD WIN64 RELEASE SUCCESSFULLY
-	echo ========================================
-	echo=
-)
-cd %SRCDIR%\odbcclient
-@echo on
+REM @@@ END COPYRIGHT @@@
+
+@set INNO_SETUP_PATH="C:\Program Files (x86)\Inno Setup 5"
+@set PATH=%INNO_SETUP_PATH%;%PATH%
+
+set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
+REM get the build directory automatically, if failed please set this to top directory include everything for build
+CD ..\..
+SET BUILDDIR=%CD%
+CD win-odbc64\odbcclient
+
+REM set this to zlib header files directory
+set ZLIB_INCLUDE_PATH=C:\zlib\include
+REM set this to zlib library files directory
+set ZLIB_LIB_PATH=C:\zlib\lib
+
+REM set this to openssl header files directory
+set OPENSSL_INCLUDE_PATH=C:\openssl-1.0.1e\include
+REM set this to openssl library files directory
+set OPENSSL_LIB_PATH=C:\openssl-1.0.1e\lib
+
+set PACKDIR=C:\Build\winodbc64
+
+set SRCDIR=%BUILDDIR%\win-odbc64
+set LIBDIR=%BUILDDIR%\lib
+set PATH=%MSBUILD_PATH%\;%PATH%
+
+set ALL_SUCCESS=0
+
+echo=
+echo ===============================
+echo     BUILD WIN64 RELEASE
+echo ===============================
+echo=
+
+echo Building Drvr35Msg - Win64 Release...
+cd %SRCDIR%\odbcclient\Drvr35Msg
+msbuild.exe /t:rebuild Drvr35Msg_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build Drvr35Msg success
+) else (
+	echo Build Drvr35Msg failed
+	goto Exit
+)
+
+
+echo Building Drvr35 - Win64 Release...
+cd %SRCDIR%\odbcclient\Drvr35
+msbuild.exe /t:rebuild Drvr35_os.vcxproj /p:Platform=x64 /p:Configuration=Release /p:OpenSSLIncludeDir=%OPENSSL_INCLUDE_PATH% /p:OpenSSLLibraryDir=%OPENSSL_LIB_PATH% /p:ZlibIncludeDir=%ZLIB_INCLUDE_PATH% /p:ZlibLibDir=%ZLIB_LIB_PATH%
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build Drvr35 success
+) else (
+	echo Build Drvr35 failed
+	goto Exit
+)
+
+echo Building Drvr35Adm - Win64 Release...
+cd %SRCDIR%\odbcclient\Drvr35Adm
+msbuild.exe /t:rebuild Drvr35Adm_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build Drvr35Adm success
+) else (
+	echo Build Drvr35Adm failed
+	goto Exit
+)
+
+REM echo Building Drvr35Trace - Win64 Release...
+REM cd %SRCDIR%\odbcclient\Drvr35Trace
+REM msbuild.exe /t:rebuild Drvr35Trace_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+REM set BUILD_STATUS=%ERRORLEVEL%
+REM if %BUILD_STATUS%==0 (
+REM	echo Build Drvr35Trace success
+REM ) else (
+REM	echo Build Drvr35Trace failed
+REM	goto Exit
+REM )
+
+echo Building TCPIPV4 - Win64 Release...
+cd %SRCDIR%\odbcclient\Drvr35\TCPIPV4
+msbuild.exe /t:rebuild TCPIPV4_os.vcxproj /p:Platform=x64 /p:Configuration=Release /p:ZlibIncludeDir=%ZLIB_INCLUDE_PATH% /p:ZlibLibDir=%ZLIB_LIB_PATH%
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build TCPIPV4 success
+) else (
+	echo Build TCPIPV4 failed
+	goto Exit
+)
+
+echo Building TCPIPV6 - Win64 Release...
+cd %SRCDIR%\odbcclient\Drvr35\TCPIPV6
+msbuild.exe /t:rebuild TCPIPV6_os.vcxproj /p:Platform=x64 /p:Configuration=Release /p:ZlibIncludeDir=%ZLIB_INCLUDE_PATH% /p:ZlibLibDir=%ZLIB_LIB_PATH%
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build TCPIPV6 success
+) else (
+	echo Build TCPIPV6 failed
+	goto Exit
+)
+
+echo Building TranslationDll - Win64 Release...
+cd %SRCDIR%\odbcclient\TranslationDll
+msbuild.exe /t:rebuild TranslationDll_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build TranslationDll success
+) else (
+	echo Build TranslationDll failed
+	goto Exit
+)
+
+echo Building Drvr35Res - Win64 Release...
+cd %SRCDIR%\odbcclient\Drvr35Res
+msbuild.exe /t:rebuild Drvr35Res_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build Drvr35Res success
+) else (
+	echo Build Drvr35Res failed
+	goto Exit
+)
+
+set ALL_SUCCESS=1
+
+cd %SRCDIR%\odbcclient
+
+if not exist C:\Build\winodbc64\inc (
+	mkdir C:\Build\winodbc64\inc
+)
+copy /Y %BUILDDIR%\win-odbc64\odbcclient\inc\trafsqlext.h C:\Build\winodbc64\inc
+if not exist C:\Build\winodbc64\lib\x64\Release (
+	mkdir C:\Build\winodbc64\lib\x64\Release
+)
+copy /Y %BUILDDIR%\lib\x64\Release C:\Build\winodbc64\lib\x64\Release
+
+ISCC.exe /Q %BUILDDIR%\win-odbc64\Install\win64_installer\installer.iss
+move /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.2.0.exe %PACKDIR%
+@echo on
+
+:Exit
+if %ALL_SUCCESS%==1 (
+	echo=
+	echo ========================================
+	echo     BUILD WIN64 RELEASE SUCCESSFULLY
+	echo ========================================
+	echo=
+)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 b3218b2..3794ef6 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC
@@ -41,11 +41,11 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC TCPIPV4 DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC TCPIPV4 DLL"
-            VALUE "LegalCopyright", "?Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_tcpipv40100.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj
index 45e2163..e95cc83 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -18,10 +18,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -42,8 +44,8 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\..\..\dependencies\zlib\include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\..\..\dependencies\zlib\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ZlibIncludeDir);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ZlibIncludeDir);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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 2ee17f0..6799f18 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC
@@ -41,11 +41,11 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC TCPIPV6 DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC TCPIPV6 DLL"
-            VALUE "LegalCopyright", "?Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_tcpipv60100.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj
index 301eec1..a613baf 100644
--- a/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj
+++ b/win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -18,10 +18,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -43,8 +45,8 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)..\..\..\dependencies\zlib\include;$(IncludePath)</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)..\..\..\dependencies\zlib\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ZlibIncludeDir);$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ZlibIncludeDir);$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35/drvr35.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvr35.rc b/win-odbc64/odbcclient/drvr35/drvr35.rc
index dae12a7..130b7ac 100644
--- a/win-odbc64/odbcclient/drvr35/drvr35.rc
+++ b/win-odbc64/odbcclient/drvr35/drvr35.rc
@@ -41,11 +41,11 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Driver DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC Driver DLL"
-            VALUE "LegalCopyright", "?Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "trfodbc1.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj b/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj
index e4b406f..f6005b5 100644
--- a/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj
+++ b/win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -17,9 +17,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -49,7 +51,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\sql\cli;..\..\sql\common;.\;..\inc;.\interface;..\..\Common;..\Drvr35Msg;..\..\Krypton\generated_incs;..\TranslationDll;..\..\security_dll\native\header;..\..\security_dll\native\common;$(OpenSSLIncludeDir);..\..\dependencies\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sql\cli;..\..\sql\common;.\;..\inc;.\interface;..\..\Common;..\Drvr35Msg;..\..\Krypton\generated_incs;..\TranslationDll;..\..\security_dll\native\header;..\..\security_dll\native\common;$(OpenSSLIncludeDir);$(ZlibIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;NDEBUG;_WINDOWS;NA_WINNT;TRACE_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
@@ -58,9 +60,9 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>version.lib;ws2_32.lib;odbccp32.lib;Psapi.Lib;libeay32MD.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;ws2_32.lib;odbccp32.lib;Psapi.Lib;libeay32.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\..\lib\x64\Release/trfodbc1.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\common;$(OpenSSLLibraryDir);..\..\dependencies\zlib\lib\x64\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\common;$(OpenSSLLibraryDir);$(ZlibLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\drvr35.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>..\..\..\..\lib\x64\Release/trfodbc1.pdb</ProgramDatabaseFile>
@@ -94,7 +96,7 @@ pause</Command>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sql\cli;..\..\sql\common;.\;..\inc;.\interface;..\..\Common;..\Drvr35Msg;..\..\Krypton\generated_incs;..\TranslationDll;..\..\security_dll\native\header;..\..\security_dll\native\common;$(OpenSSLIncludeDir);..\..\dependencies\zlib\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\sql\cli;..\..\sql\common;.\;..\inc;.\interface;..\..\Common;..\Drvr35Msg;..\..\Krypton\generated_incs;..\TranslationDll;..\..\security_dll\native\header;..\..\security_dll\native\common;$(OpenSSLIncludeDir);$(ZlibIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;_DEBUG;_WINDOWS;hp;NA_WINNT;TRACE_COMPRESSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -111,9 +113,9 @@ pause</Command>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>version.lib;ws2_32.lib;odbccp32.lib;Psapi.Lib;libeay32MDd.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>version.lib;ws2_32.lib;odbccp32.lib;Psapi.Lib;libeay32.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\..\..\lib\x64\Debug/trfodbc1.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\common;$(OpenSSLLibraryDir);..\..\dependencies\zlib\lib\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\common;$(OpenSSLLibraryDir);$(ZlibLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>.\drvr35.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj
index a7361bd..3e6459a 100644
--- a/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj
+++ b/win-odbc64/odbcclient/drvr35adm/Drvr35Adm_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -23,16 +23,19 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
index d6b1f9e..8348ec0 100644
--- a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
+++ b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
@@ -78,11 +78,11 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Client Adminstration DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC Client Adminstration DLL"
-            VALUE "LegalCopyright", "? Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "trfoadm1.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp b/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
index b42a029..97d251d 100644
--- a/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp
@@ -111,7 +111,7 @@ BOOL PageNetwork::OnInitDialog()
 
 	char szStaticText[]="Enter the DCS Master IP address specified during the Trafodion installation.\n\
 Enter the starting port number for the range of ports numbers specified for\n\
-DCS Master during the Trafodion installation; default is 37800.\n\n\
+DCS Master during the Trafodion installation; default is 23400.\n\n\
 Login Timeout default is 0 (no timeout). Connection Timeout default is 60 seconds.\n\
 Query Timeout default is NO_TIMEOUT. Fetch Buffer Size default is 8 kbytes."; 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp b/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
index afbcd74..dd49f3b 100644
--- a/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
+++ b/win-odbc64/odbcclient/drvr35adm/tabpagenetwork.cpp
@@ -122,7 +122,7 @@ BOOL TabPageNetwork::OnInitDialog()
 	char szStaticText[]="The current configuration is displayed.\n\
 DCS Master IP address is specified during the Trafodion installation.\n\
 Port is the starting port number for the DCS Master specified during\n\
-the Trafodion installation; default is 37800.\n\
+the Trafodion installation; default is 23400.\n\
 Login Timeout default is 0 (no timeout). Connection Timeout default is 60 seconds.\n\
 Query Timeout is NO_TIMEOUT. Fetch Buffer Size default is 8 kbytes.";
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc
index 8e08c55..02f38a9 100644
--- a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc
+++ b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc
@@ -67,11 +67,11 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "Hewlett-Packard Company"
+            VALUE "CompanyName", "Apache Trafodion"
             VALUE "FileDescription", "TRAF ODBC Client Msg DLL"
-            VALUE "FileVersion", "1, 2, 0, 0"
+            VALUE "FileVersion", "1.2.0.0"
             VALUE "InternalName", "TRAF ODBC Client Msg DLL"
-            VALUE "LegalCopyright", "?Copyright 2011 Hewlett-Packard Development Company, LP"
+            VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_odbcDrvMsg_intl0100.dll"
             VALUE "ProductName", "TRAF ODBC"
             VALUE "ProductVersion", "1.2.0.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj b/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj
index 297c8ac..1ac0493 100644
--- a/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj
+++ b/win-odbc64/odbcclient/drvr35msg/Drvr35Msg_os.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -17,9 +17,11 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/odbcclient_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/odbcclient_os.sln b/win-odbc64/odbcclient/odbcclient_os.sln
index ccca47b..60e5741 100644
--- a/win-odbc64/odbcclient/odbcclient_os.sln
+++ b/win-odbc64/odbcclient/odbcclient_os.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drvr35_os", "drvr35\drvr35_os.vcxproj", "{4B7C62D7-1C63-4319-9818-98BFBB322CED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B83DDF3C-8D5C-45AB-868B-4B70BB258647} = {B83DDF3C-8D5C-45AB-868B-4B70BB258647}
@@ -21,10 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslationDll_os", "Transl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TCPIPV6_os", "drvr35\TCPIPV6\TCPIPV6_os.vcxproj", "{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCertificateDirReg_os", "..\Install\SetCertificateDirReg\SetCertificateDirReg\SetCertificateDirReg_os.vcxproj", "{11B34636-6E3D-40ED-BA02-FD50B258D18D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateDSN_os", "..\Install\UpdateDSN\UpdateDSN\UpdateDSN_os.vcxproj", "{49D6B472-F361-4E6A-B060-D368855FB359}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -98,27 +96,6 @@ Global
 		{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|Win32.ActiveCfg = Release|x64
 		{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|x64.ActiveCfg = Release|x64
 		{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|x64.Build.0 = Release|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.Build.0 = Debug|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.ActiveCfg = Debug|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.Build.0 = Debug|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.ActiveCfg = Release|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.Build.0 = Release|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.ActiveCfg = Release|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.Build.0 = Release|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|Win32.ActiveCfg = Template|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|Win32.Build.0 = Template|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|x64.ActiveCfg = Template|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|x64.Build.0 = Template|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|Win32.ActiveCfg = Debug|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|x64.ActiveCfg = Debug|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|x64.Build.0 = Debug|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|Win32.ActiveCfg = Release|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|x64.ActiveCfg = Release|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|x64.Build.0 = Release|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Template|Win32.ActiveCfg = Release|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Template|x64.ActiveCfg = Release|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Template|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/odbcclient/pkg.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/pkg.bat b/win-odbc64/odbcclient/pkg.bat
deleted file mode 100644
index c6151ef..0000000
--- a/win-odbc64/odbcclient/pkg.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-REM @@@ START COPYRIGHT @@@
-REM
-REM Licensed to the Apache Software Foundation (ASF) under one
-REM or more contributor license agreements.  See the NOTICE file
-REM distributed with this work for additional information
-REM regarding copyright ownership.  The ASF licenses this file
-REM to you under the Apache License, Version 2.0 (the
-REM "License"); you may not use this file except in compliance
-REM with the License.  You may obtain a copy of the License at
-REM
-REM   http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing,
-REM software distributed under the License is distributed on an
-REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-REM KIND, either express or implied.  See the License for the
-REM specific language governing permissions and limitations
-REM under the License.
-REM
-REM @@@ END COPYRIGHT @@@
-
-set PACKDRIVER=E:
-set SRCDIR=%PACKDRIVER%\win-odbc64
-set LIBDIR=%PACKDRIVER%\lib
-set ISCMDBLD_PATH="E:\Program Files (x86)\Installshield\2012\System"
-set INSTALLDIR=%SRCDIR%\Install
-set INSTALLFILENAME=TFODBC64.msi
-set SAVEPATH=%PATH%
-set PATH=%ISCMDBLD_PATH%;%PATH%
-
-echo "Building Media for %INSTALLFILENAME% ..."
-set FILENAME=%INSTALLDIR%\win64_installer\win64_installer_os.ism
-
-ISCmdBld.exe -p "%FILENAME%"
-
-echo "Moving %INSTALLFILENAME% ..."
-
-move /Y "%INSTALLDIR%\win64_installer\win64_installer_os\PROJECT_ASSISTANT\SINGLE_MSI_IMAGE\DiskImages\DISK1\Trafodion ODBC64 1.0.msi" %LIBDIR%\x64\Release\%INSTALLFILENAME%


[7/8] incubator-trafodion git commit: add copyright for installer.iss

Posted by rm...@apache.org.
add copyright for installer.iss


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

Branch: refs/heads/master
Commit: d72f2074403800ff0e710bf4c6e3e34fa0eb17cc
Parents: f1446cd
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Mon Oct 26 13:23:09 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Mon Oct 26 13:23:35 2015 +0800

----------------------------------------------------------------------
 win-odbc64/Install/win64_installer/installer.iss | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d72f2074/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 b9766d1..2f7c952 100644
--- a/win-odbc64/Install/win64_installer/installer.iss
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -1,3 +1,20 @@
+; @@@ START COPYRIGHT @@@
+; Licensed to the Apache Software Foundation (ASF) under one
+; or more contributor license agreements.  See the NOTICE file
+; distributed with this work for additional information
+; regarding copyright ownership.  The ASF licenses this file
+; to you under the Apache License, Version 2.0 (the
+; "License"); you may not use this file except in compliance
+; with the License.  You may obtain a copy of the License at
+;   http://www.apache.org/licenses/LICENSE-2.0
+; Unless required by applicable law or agreed to in writing,
+; software distributed under the License is distributed on an
+; "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+; KIND, either express or implied.  See the License for the
+; specific language governing permissions and limitations
+; under the License.
+; @@@ END COPYRIGHT @@@
+;
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 


[4/8] incubator-trafodion git commit: use environment vairable in the inno setup script

Posted by rm...@apache.org.
use environment vairable in the inno setup script

1. use environment vairable in the inno setup script instead of hardcode
path
2. keep SetCertificate in the old place


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

Branch: refs/heads/master
Commit: 521c35c6201115a447cf67b47835a9de00812a11
Parents: f9bc12d
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Tue Oct 20 16:10:18 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Tue Oct 20 16:10:18 2015 +0800

----------------------------------------------------------------------
 .../SetCertificateDirReg/SetCertDirDlg.cpp      | 165 +++++++++++++++
 .../SetCertificateDirReg/SetCertDirDlg.h        |  47 +++++
 .../SetCertificateDirReg.cpp                    |  58 ++++++
 .../SetCertificateDirReg/SetCertificateDirReg.h |  23 +++
 .../SetCertificateDirReg.rc                     | 111 ++++++++++
 .../SetCertificateDirReg_os.vcxproj             | 200 +++++++++++++++++++
 .../SetCertificateDirReg_os.vcxproj.filters     |  53 +++++
 .../SetCertificateDirReg_os.vcxproj.user        |   3 +
 .../SetCertificateDirReg/dialog.bmp             | Bin 0 -> 99008 bytes
 .../SetCertificateDirReg/odbccp32.props         |  18 ++
 .../SetCertificateDirReg/resource.h             |  40 ++++
 .../SetCertificateDirReg/stdafx.cpp             |  28 +++
 .../SetCertificateDirReg/stdafx.h               |  68 +++++++
 .../SetCertificateDirReg_os.sln                 |  26 +++
 .../Install/win64_installer/installer.iss       |  20 +-
 win-odbc64/odbcclient/README.txt                |  11 +-
 win-odbc64/odbcclient/build_os.bat              |  36 ++--
 win-odbc64/odbcclient/odbcclient_os.sln         |  14 ++
 18 files changed, 894 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
new file mode 100644
index 0000000..6891b86
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
@@ -0,0 +1,165 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// SetCertDirDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "SetCertificateDirReg.h"
+#include "SetCertDirDlg.h"
+#include <odbcinst.h>
+#include <ShlObj.h>
+
+
+#define ODBC_SET_CERTIFICATE_DIR ODBC_CONFIG_DRIVER_MAX+1
+
+CString ErrorString(DWORD err)
+{
+     CString Error;
+     LPTSTR s;
+     if(::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+            FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL,
+            err,
+            0,
+            (LPTSTR)&s,
+            0,
+            NULL) == 0)
+    {
+		Error = "Unknown error code";
+    }
+    else
+    {
+		LPTSTR p = _tcschr(s, _T('\r'));
+		if(p != NULL)
+		{ /* lose CRLF */
+			*p = _T('\0');
+		} /* lose CRLF */
+		Error = s;
+		::LocalFree(s);
+    }
+    return Error;
+
+} // ErrorString()
+
+// SetCertDirDlg dialog
+
+IMPLEMENT_DYNAMIC(SetCertDirDlg, CDialog)
+
+SetCertDirDlg::SetCertDirDlg(CWnd* pParent /*=NULL*/)
+	: CDialog(SetCertDirDlg::IDD, pParent)
+{
+
+}
+
+SetCertDirDlg::~SetCertDirDlg()
+{
+}
+
+void SetCertDirDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_EDIT1, m_CertificatePath);
+	m_CertificatePath.SetWindowText("SYSTEM_DEFAULT");
+}
+
+
+BEGIN_MESSAGE_MAP(SetCertDirDlg, CDialog)
+	ON_BN_CLICKED(IDC_BUTTON1, &SetCertDirDlg::OnBnClickedButton1)
+	ON_BN_CLICKED(IDOK, &SetCertDirDlg::OnBnClickedOk)
+	ON_EN_CHANGE(IDC_EDIT1, &SetCertDirDlg::OnEnChangeEdit1)
+END_MESSAGE_MAP()
+
+
+// SetCertDirDlg message handlers
+
+void SetCertDirDlg::OnBnClickedButton1()
+{
+	LPMALLOC pMalloc;
+    
+    if( SUCCEEDED( SHGetMalloc( &pMalloc ) ) ) 
+    {
+        TCHAR szTitle[] = _T("Choose Directory for storing certificates.");
+        BROWSEINFO bi;
+        ZeroMemory( &bi, sizeof( bi ) );
+        bi.hwndOwner = NULL;
+        bi.pszDisplayName = NULL;
+        bi.lpszTitle = szTitle;
+        bi.pidlRoot = NULL;
+		bi.ulFlags = BIF_RETURNONLYFSDIRS;
+        
+        LPITEMIDLIST pidl = SHBrowseForFolder( &bi );
+        if( pidl ) 
+        {
+            TCHAR szDir[MAX_PATH];
+            if( SHGetPathFromIDList( pidl, szDir ) ) 
+            {
+				m_CertificatePath.SetWindowText(szDir);
+				m_CertificatePath.SetFocus();
+            }
+            pMalloc->Free(pidl); 
+            pMalloc->Release();
+        }
+    }
+}
+
+void SetCertDirDlg::OnBnClickedOk()
+{
+	const char DriverName[]= "TRAF ODBC 1.0";
+	CString szCertificateDir;
+	TCHAR szCertificateDirRegEntry[_MAX_PATH];
+	CHAR  szConfigMsg[_MAX_PATH] = "";
+	WORD  cbPathOut;
+
+	m_CertificatePath.GetWindowText(szCertificateDir);
+
+	sprintf_s(szCertificateDirRegEntry,"CertificateDir=%s\0",szCertificateDir);
+	SQLConfigDriver( NULL, ODBC_CONFIG_DRIVER, DriverName,
+						 szCertificateDirRegEntry,szConfigMsg,
+						 sizeof(szConfigMsg), &cbPathOut );
+	/*
+	if(!SQLConfigDriver( NULL, ODBC_CONFIG_DRIVER, DriverName,
+						 szCertificateDirRegEntry,szConfigMsg,
+						 sizeof(szConfigMsg), &cbPathOut ))
+	{
+		CString szErrorMessage;
+		DWORD dwErrorCode;
+		WORD wRetSize;
+		LPSTR pszMessage=szErrorMessage.GetBuffer(SQL_MAX_MESSAGE_LENGTH-4);
+		SQLInstallerError(1,&dwErrorCode,pszMessage,SQL_MAX_MESSAGE_LENGTH-8,&wRetSize);
+		szErrorMessage.ReleaseBuffer();
+		szErrorMessage+="\nDriver Diags:";
+		szErrorMessage+=szConfigMsg;
+		MessageBox(szErrorMessage,"SQLConfigDriver Failed",MB_ICONERROR|MB_OK);
+	}
+	*/
+	OnOK();
+}
+
+
+void SetCertDirDlg::OnEnChangeEdit1()
+{
+	// TODO:  If this is a RICHEDIT control, the control will not
+	// send this notification unless you override the CDialog::OnInitDialog()
+	// function and call CRichEditCtrl().SetEventMask()
+	// with the ENM_CHANGE flag ORed into the mask.
+
+	// TODO:  Add your control notification handler code here
+}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
new file mode 100644
index 0000000..1142152
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
@@ -0,0 +1,47 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+#pragma once
+#include "afxwin.h"
+
+
+// SetCertDirDlg dialog
+
+class SetCertDirDlg : public CDialog
+{
+	DECLARE_DYNAMIC(SetCertDirDlg)
+
+public:
+	SetCertDirDlg(CWnd* pParent = NULL);   // standard constructor
+	virtual ~SetCertDirDlg();
+
+// Dialog Data
+	enum { IDD = IDD_SET_CERT_DIALOG };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+	DECLARE_MESSAGE_MAP()
+public:
+	CEdit m_CertificatePath;
+	afx_msg void OnBnClickedButton1();
+	afx_msg void OnBnClickedOk();
+	afx_msg void OnEnChangeEdit1();
+};

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
new file mode 100644
index 0000000..3d82c0b
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
@@ -0,0 +1,58 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// SetCertificateDirReg.cpp : Defines the entry point for the console application.
+//
+
+#include "stdafx.h"
+#include "SetCertificateDirReg.h"
+#include "SetCertDirDlg.h" // Dialog box to choose the certificate directory location
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+
+// The one and only application object
+
+CWinApp theApp;
+
+using namespace std;
+
+int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
+{
+	int nRetCode = 0;
+
+	// initialize MFC and print and error on failure
+	if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
+	{
+		// TODO: change error code to suit your needs
+		_tprintf(_T("Fatal Error: MFC initialization failed\n"));
+		nRetCode = 1;
+	}
+	else
+	{
+		// TODO: code your application's behavior here.
+		SetCertDirDlg dlg;
+		dlg.DoModal();
+	}
+
+	return nRetCode;
+}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
new file mode 100644
index 0000000..5db1c52
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
@@ -0,0 +1,23 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+#pragma once
+
+#include "resource.h"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
new file mode 100644
index 0000000..6d809f7
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
@@ -0,0 +1,111 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_SET_CERT_DIALOG DIALOGEX 0, 0, 276, 135
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "TRAF ODBC Setup - Certificate Directory"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,206,109,50,14
+    LTEXT           "Select a folder for storing certificates and press OK",IDC_STATIC,92,34,164,8
+    EDITTEXT        IDC_EDIT1,48,66,208,14,ES_AUTOHSCROLL | ES_READONLY
+    PUSHBUTTON      "Browse",IDC_BUTTON1,206,86,50,14
+    LTEXT           "or just press OK to use the system default",IDC_STATIC,120,48,136,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_SET_CERT_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 16
+        RIGHTMARGIN, 256
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 123
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE 
+BEGIN
+    IDS_APP_TITLE           "SetCertificateDirReg"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
new file mode 100644
index 0000000..57471ef
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Template|Win32">
+      <Configuration>Template</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Template|x64">
+      <Configuration>Template</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{11B34636-6E3D-40ED-BA02-FD50B258D18D}</ProjectGuid>
+    <RootNamespace>SetCertificateDirReg</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="odbccp32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="odbccp32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="odbccp32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="odbccp32.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="odbccp32.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <Import Project="odbccp32.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\..\..\lib\x64\Debug/SetCertificateDirReg.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\..\lib\release/$(ProjectName).exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\..\..\..\lib\x64\Release/SetCertificateDirReg.exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Link>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="SetCertDirDlg.cpp" />
+    <ClCompile Include="SetCertificateDirReg.cpp" />
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="SetCertDirDlg.h" />
+    <ClInclude Include="SetCertificateDirReg.h" />
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dialog.bmp" />
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SetCertificateDirReg.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RESOURCE_FILE="SetCertificateDirReg.rc" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
new file mode 100644
index 0000000..cca8221
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="SetCertDirDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SetCertificateDirReg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SetCertDirDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SetCertificateDirReg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="dialog.bmp">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="ReadMe.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SetCertificateDirReg.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
new file mode 100644
index 0000000..ace9a86
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp
new file mode 100644
index 0000000..6087e3d
Binary files /dev/null and b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
new file mode 100644
index 0000000..bc4cb52
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <Odbccp32libDir>.\</Odbccp32libDir>
+    <Odbccp32lib64Dir>.\amd64</Odbccp32lib64Dir>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="Odbccp32libDir">
+      <Value>$(Odbccp32libDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="Odbccp32lib64Dir">
+      <Value>$(Odbccp32lib64Dir)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
new file mode 100644
index 0000000..45169ba
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
@@ -0,0 +1,40 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by SetCertificateDirReg.rc
+//
+#define IDD_SET_CERT_DIALOG             101
+#define IDS_APP_TITLE                   103
+#define IDC_EDIT1                       1000
+#define IDC_BUTTON1                     1001
+#define IDC_SCROLLBAR1                  1002
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1003
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
new file mode 100644
index 0000000..350f87e
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
@@ -0,0 +1,28 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// stdafx.cpp : source file that includes just the standard includes
+// SetCertificateDirReg.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
new file mode 100644
index 0000000..df9fc5f
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
@@ -0,0 +1,68 @@
+// @@@ START COPYRIGHT @@@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// @@@ END COPYRIGHT @@@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER				// Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
+#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
+#endif						
+
+#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
+#endif
+
+#include <stdio.h>
+#include <tchar.h>
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+
+#ifndef VC_EXTRALEAN
+#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
+#endif
+
+#include <afx.h>
+#include <afxwin.h>         // MFC core and standard components
+#include <afxext.h>         // MFC extensions
+#ifndef _AFX_NO_OLE_SUPPORT
+#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
+#endif
+#ifndef _AFX_NO_AFXCMN_SUPPORT
+#include <afxcmn.h>			// MFC support for Windows Common Controls
+#endif // _AFX_NO_AFXCMN_SUPPORT
+
+#include <iostream>
+
+
+
+// TODO: reference additional headers your program requires here

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
new file mode 100644
index 0000000..b78b285
--- /dev/null
+++ b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCertificateDirReg", "SetCertificateDirReg\SetCertificateDirReg.vcxproj", "{11B34636-6E3D-40ED-BA02-FD50B258D18D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.Build.0 = Debug|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.ActiveCfg = Debug|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.Build.0 = Debug|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.ActiveCfg = Release|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.Build.0 = Release|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.ActiveCfg = Release|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/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 17c2a2f..76d2e32 100644
--- a/win-odbc64/Install/win64_installer/installer.iss
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -6,6 +6,8 @@
 #define MyAppPublisher "Apache Trafodion"
 #define MyAppURL ""
 #define MyDriverName "TRAF ODBC 1.0"
+#define BUILDDIR  GetEnv('BUILDDIR')
+#define VCREDISTDIR GetEnv('VC_REDIST_DIR')
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -35,14 +37,14 @@ SetupLogging=yes
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "C:\Build\winodbc64\inc\trafsqlext.h"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_odbcDrvMsg_intl0100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_ores0100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_tcpipv40100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_tcpipv60100.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\traf_translation01.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\trfoadm1.dll"; DestDir: "{sys}"
-Source: "C:\Build\winodbc64\lib\x64\Release\trfodbc1.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\win-odbc64\odbcclient\inc\trafsqlext.h"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BUILDDIR}\lib\x64\Release\traf_odbcDrvMsg_intl0100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_ores0100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_tcpipv40100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_tcpipv60100.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\traf_translation01.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\trfoadm1.dll"; DestDir: "{sys}"
+Source: "{#BUILDDIR}\lib\x64\Release\trfodbc1.dll"; DestDir: "{sys}"
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
@@ -59,7 +61,7 @@ Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: strin
 
 [Code]
 [Files]
-Source: "C:\Build\winodbc64\redist\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+Source: "{#VCREDISTDIR}\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
 
 [Run]
 ; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/odbcclient/README.txt
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/README.txt b/win-odbc64/odbcclient/README.txt
index 3146b9b..c140e4d 100644
--- a/win-odbc64/odbcclient/README.txt
+++ b/win-odbc64/odbcclient/README.txt
@@ -24,15 +24,16 @@ Prerequisite:
 openssl >= 0.9.8
 zlib >= 1.2.8
 Microsoft Visual Studio >= 2013
+Visual C++ MFC MBCS Library for Visual Studio 2013
 Inno Setup >= 5
 
 Build steps
 
 1. In order to make the build script able to find these prerequisites,
-   some variables on the top of build_os.bat and pkg.bat need to be set accordingly.
+   some variables on the top of build_os.bat need to be set accordingly.
 
    Set variable OPENSSL_LIB_PATH to point to openssl library files folder, for example:
-	set OPENSSL_PATH=C:\openssl-1.0.1e\lib
+	  set OPENSSL_PATH=C:\openssl-1.0.1e\lib
 
    Set variable OPENSSL_INCLUDE_PATH to point to openssl header files folder, for example:
     set OPENSSL_INCLUDE_PATH=C:\openssl-1.0.1e\include
@@ -46,13 +47,15 @@ Build steps
    Set variable MSBUILD_PATH to point to msbuild system, for example:
 	  set MSBUILD_PATH=C:\Windows\Microsoft.NET\Framework64\v4.0.30319
 
-   Set variable PACKDIR to conn folder of Trafodion source tree, for example:
+   Set variable PACKDIR to the folder where to store the package driver, for example:
 	  set PACKDIR=C:\Build\winodbc64
 
    Set variable INNO_SETUP_PATH to inno setup install folder, for example:
 	  set INNO_SETUP_PATH="C:\Program Files (x86)\Inno Setup 5"
 
-   Download vcredist_x64.exe from http://www.microsoft.com/en-us/download/details.aspx?id=40784 and copy it to C:\Build\winodbc64\redist
+   Download vcredist_x64.exe from http://www.microsoft.com/en-us/download/details.aspx?id=40784 and
+    set the variable VC_REDIST_DIR to the folader where store the vcredist_x64.exe
+    set VC_REDIST_DIR=C:\Build\winodbc64\redist
 
 2. To build, open a cmd window, change to win-odbc64\odbcclient and type
 	build_os.bat

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat
index 2671c7d..cb3b62d 100644
--- a/win-odbc64/odbcclient/build_os.bat
+++ b/win-odbc64/odbcclient/build_os.bat
@@ -20,6 +20,13 @@ REM under the License.
 REM
 REM @@@ END COPYRIGHT @@@
 
+
+REM download vcredist_x64.exe form http://www.microsoft.com/en-us/download/details.aspx?id=40784 and copy it to VC_REDIST_DIR.
+set VC_REDIST_DIR=C:\Build\winodbc64\redist
+
+REM set this to the directory where you want to put the driver package file
+set PACKDIR=C:\Build\winodbc64
+
 @set INNO_SETUP_PATH="C:\Program Files (x86)\Inno Setup 5"
 @set PATH=%INNO_SETUP_PATH%;%PATH%
 
@@ -39,8 +46,6 @@ set OPENSSL_INCLUDE_PATH=C:\openssl-1.0.1e\include
 REM set this to openssl library files directory
 set OPENSSL_LIB_PATH=C:\openssl-1.0.1e\lib
 
-set PACKDIR=C:\Build\winodbc64
-
 set SRCDIR=%BUILDDIR%\win-odbc64
 set LIBDIR=%BUILDDIR%\lib
 set PATH=%MSBUILD_PATH%\;%PATH%
@@ -142,23 +147,26 @@ if %BUILD_STATUS%==0 (
 	goto Exit
 )
 
-set ALL_SUCCESS=1
-
-cd %SRCDIR%\odbcclient
-
-if not exist C:\Build\winodbc64\inc (
-	mkdir C:\Build\winodbc64\inc
-)
-copy /Y %BUILDDIR%\win-odbc64\odbcclient\inc\trafsqlext.h C:\Build\winodbc64\inc
-if not exist C:\Build\winodbc64\lib\x64\Release (
-	mkdir C:\Build\winodbc64\lib\x64\Release
+echo Building SetCertificateDirReg InstallHelper - Win64 Release...
+cd %SRCDIR%\Install\SetCertificateDirReg\SetCertificateDirReg
+msbuild.exe /t:rebuild SetCertificateDirReg_os.vcxproj /p:Platform=x64 /p:Configuration=Release
+set BUILD_STATUS=%ERRORLEVEL%
+if %BUILD_STATUS%==0 (
+	echo Build SetCertificateDirReg success
+) else (
+	echo Build SetCertificateDirReg failed
+	goto Exit
 )
-copy /Y %BUILDDIR%\lib\x64\Release C:\Build\winodbc64\lib\x64\Release
 
 ISCC.exe /Q %BUILDDIR%\win-odbc64\Install\win64_installer\installer.iss
-move /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.2.0.exe %PACKDIR%
+copy /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.2.0.exe %PACKDIR%
 @echo on
 
+if exist %PACKDIR%\TFODBC64-1.2.0.exe (
+	set ALL_SUCCESS=1
+)
+cd %BUILDDIR%\win-odbc64\odbcclient
+
 :Exit
 if %ALL_SUCCESS%==1 (
 	echo=

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/521c35c6/win-odbc64/odbcclient/odbcclient_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/odbcclient_os.sln b/win-odbc64/odbcclient/odbcclient_os.sln
index 60e5741..38990db 100644
--- a/win-odbc64/odbcclient/odbcclient_os.sln
+++ b/win-odbc64/odbcclient/odbcclient_os.sln
@@ -23,6 +23,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslationDll_os", "Transl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TCPIPV6_os", "drvr35\TCPIPV6\TCPIPV6_os.vcxproj", "{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCertificateDirReg_os", "..\Install\SetCertificateDirReg\SetCertificateDirReg\SetCertificateDirReg_os.vcxproj", "{11B34636-6E3D-40ED-BA02-FD50B258D18D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -96,6 +98,18 @@ Global
 		{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|Win32.ActiveCfg = Release|x64
 		{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|x64.ActiveCfg = Release|x64
 		{1B37AEE5-7E3E-46C8-AA71-85CDED07183B}.Template|x64.Build.0 = Release|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.Build.0 = Debug|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.ActiveCfg = Debug|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.Build.0 = Debug|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.ActiveCfg = Release|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.Build.0 = Release|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.ActiveCfg = Release|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.Build.0 = Release|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|Win32.ActiveCfg = Template|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|Win32.Build.0 = Template|Win32
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|x64.ActiveCfg = Template|x64
+		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Template|x64.Build.0 = Template|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE


[8/8] incubator-trafodion git commit: Merge [TRAFODION-1519] PR-126 Use free tool to build windows ODBC

Posted by rm...@apache.org.
Merge [TRAFODION-1519] PR-126 Use free tool to build windows ODBC


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

Branch: refs/heads/master
Commit: a74c226e80cd95723f2c130660e90654c34c525c
Parents: c5e3d78 d72f207
Author: Roberta Marton <ro...@esgyn.com>
Authored: Wed Oct 28 23:36:57 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Wed Oct 28 23:36:57 2015 +0000

----------------------------------------------------------------------
 .../SetCertificateDirReg.rc                     |  222 +-
 .../SetCertificateDirReg_os.vcxproj             |  390 +-
 .../SetCertificateDirReg_os.vcxproj.filters     |  104 +-
 .../SetCertificateDirReg_os.vcxproj.user        |    4 +-
 .../SetCertificateDirReg/odbccp32.props         |   34 +-
 .../SetCertificateDirReg/resource.h             |   40 +-
 .../SetCertificateDirReg_os.sln                 |   52 +-
 .../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp   |  200 -
 .../UpdateDSN/UpdateDSN/UpdateDSN.vcxproj       |  170 -
 .../UpdateDSN/UpdateDSN.vcxproj.filters         |   33 -
 .../UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj    |  104 -
 .../UpdateDSN/UpdateDSN_os.vcxproj.filters      |   33 -
 .../UpdateDSN/UpdateDSN_os.vcxproj.user         |    3 -
 .../Install/UpdateDSN/UpdateDSN/stdafx.cpp      |   28 -
 win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h |   37 -
 win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln   |   26 -
 .../Install/win64_installer/installer.iss       |  200 +
 .../win64_installer/win64_installer_os.ism      | 6029 ------------------
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc    |   12 +-
 .../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj   |    4 +-
 .../odbcclient/Drvr35Res/res/Drvr35Res.rc2      |   26 +-
 win-odbc64/odbcclient/README.txt                |  111 +-
 .../odbcclient/TranslationDll/TranslationDll.rc |   12 +-
 .../TranslationDll/TranslationDll_os.vcxproj    |    4 +-
 win-odbc64/odbcclient/build_os.bat              |  333 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC |   12 +-
 .../drvr35/TCPIPV4/TCPIPV4_os.vcxproj           |    8 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC |   12 +-
 .../drvr35/TCPIPV6/TCPIPV6_os.vcxproj           |    8 +-
 win-odbc64/odbcclient/drvr35/drvr35.rc          |   12 +-
 win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj  |   16 +-
 .../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj   |    5 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.rc    |   12 +-
 win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp |    2 +-
 .../odbcclient/drvr35adm/tabpagenetwork.cpp     |    2 +-
 win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc     |   12 +-
 .../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj   |    4 +-
 win-odbc64/odbcclient/odbcclient_os.sln         |   17 +-
 win-odbc64/odbcclient/pkg.bat                   |   38 -
 39 files changed, 924 insertions(+), 7447 deletions(-)
----------------------------------------------------------------------



[2/8] incubator-trafodion git commit: [TRAFODION-1519]Use free tool to build windows ODBC

Posted by rm...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/win64_installer/win64_installer_os.ism
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/win64_installer/win64_installer_os.ism b/win-odbc64/Install/win64_installer/win64_installer_os.ism
deleted file mode 100644
index 3b12db4..0000000
--- a/win-odbc64/Install/win64_installer/win64_installer_os.ism
+++ /dev/null
@@ -1,6029 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?xml-stylesheet type="text/xsl" href="is.xsl" ?>
-<!DOCTYPE msi [
-   <!ELEMENT msi   (summary,table*)>
-   <!ATTLIST msi version    CDATA #REQUIRED>
-   <!ATTLIST msi xmlns:dt   CDATA #IMPLIED
-                 codepage   CDATA #IMPLIED
-                 compression (MSZIP|LZX|none) "LZX">
-   
-   <!ELEMENT summary       (codepage?,title?,subject?,author?,keywords?,comments?,
-                            template,lastauthor?,revnumber,lastprinted?,
-                            createdtm?,lastsavedtm?,pagecount,wordcount,
-                            charcount?,appname?,security?)>
-                            
-   <!ELEMENT codepage      (#PCDATA)>
-   <!ELEMENT title         (#PCDATA)>
-   <!ELEMENT subject       (#PCDATA)>
-   <!ELEMENT author        (#PCDATA)>
-   <!ELEMENT keywords      (#PCDATA)>
-   <!ELEMENT comments      (#PCDATA)>
-   <!ELEMENT template      (#PCDATA)>
-   <!ELEMENT lastauthor    (#PCDATA)>
-   <!ELEMENT revnumber     (#PCDATA)>
-   <!ELEMENT lastprinted   (#PCDATA)>
-   <!ELEMENT createdtm     (#PCDATA)>
-   <!ELEMENT lastsavedtm   (#PCDATA)>
-   <!ELEMENT pagecount     (#PCDATA)>
-   <!ELEMENT wordcount     (#PCDATA)>
-   <!ELEMENT charcount     (#PCDATA)>
-   <!ELEMENT appname       (#PCDATA)>
-   <!ELEMENT security      (#PCDATA)>                            
-                                
-   <!ELEMENT table         (col+,row*)>
-   <!ATTLIST table
-                name        CDATA #REQUIRED>
-
-   <!ELEMENT col           (#PCDATA)>
-   <!ATTLIST col
-                 key       (yes|no) #IMPLIED
-                 def       CDATA #IMPLIED>
-                 
-   <!ELEMENT row            (td+)>
-   
-   <!ELEMENT td             (#PCDATA)>
-   <!ATTLIST td
-                 href       CDATA #IMPLIED
-                 dt:dt     (string|bin.base64) #IMPLIED
-                 md5        CDATA #IMPLIED>
-]>
-<msi version="2.0" xmlns:dt="urn:schemas-microsoft-com:datatypes" codepage="65001">
-	
-	<summary>
-		<codepage>1252</codepage>
-		<title>Installation Database</title>
-		<subject>##ID_STRING10##</subject>
-		<author>##COMPANY_NAME##</author>
-		<keywords>Installer,MSI,Database</keywords>
-		<comments>Contact:  Your local administrator</comments>
-		<template>x64;1033</template>
-		<lastauthor>Administrator</lastauthor>
-		<revnumber>{4AF789C2-7A46-49CE-8C0D-2AD9B58F2699}</revnumber>
-		<lastprinted/>
-		<createdtm>06/21/1999 21:00</createdtm>
-		<lastsavedtm>07/15/2000 00:50</lastsavedtm>
-		<pagecount>200</pagecount>
-		<wordcount>0</wordcount>
-		<charcount/>
-		<appname>InstallShield</appname>
-		<security>1</security>
-	</summary>
-	
-	<table name="ActionText">
-		<col key="yes" def="s72">Action</col>
-		<col def="L64">Description</col>
-		<col def="L128">Template</col>
-		<row><td>Advertise</td><td>##IDS_ACTIONTEXT_Advertising##</td><td/></row>
-		<row><td>AllocateRegistrySpace</td><td>##IDS_ACTIONTEXT_AllocatingRegistry##</td><td>##IDS_ACTIONTEXT_FreeSpace##</td></row>
-		<row><td>AppSearch</td><td>##IDS_ACTIONTEXT_SearchInstalled##</td><td>##IDS_ACTIONTEXT_PropertySignature##</td></row>
-		<row><td>BindImage</td><td>##IDS_ACTIONTEXT_BindingExes##</td><td>##IDS_ACTIONTEXT_File##</td></row>
-		<row><td>CCPSearch</td><td>##IDS_ACTIONTEXT_UnregisterModules##</td><td/></row>
-		<row><td>CostFinalize</td><td>##IDS_ACTIONTEXT_ComputingSpace3##</td><td/></row>
-		<row><td>CostInitialize</td><td>##IDS_ACTIONTEXT_ComputingSpace##</td><td/></row>
-		<row><td>CreateFolders</td><td>##IDS_ACTIONTEXT_CreatingFolders##</td><td>##IDS_ACTIONTEXT_Folder##</td></row>
-		<row><td>CreateShortcuts</td><td>##IDS_ACTIONTEXT_CreatingShortcuts##</td><td>##IDS_ACTIONTEXT_Shortcut##</td></row>
-		<row><td>DeleteServices</td><td>##IDS_ACTIONTEXT_DeletingServices##</td><td>##IDS_ACTIONTEXT_Service##</td></row>
-		<row><td>DuplicateFiles</td><td>##IDS_ACTIONTEXT_CreatingDuplicate##</td><td>##IDS_ACTIONTEXT_FileDirectorySize##</td></row>
-		<row><td>FileCost</td><td>##IDS_ACTIONTEXT_ComputingSpace2##</td><td/></row>
-		<row><td>FindRelatedProducts</td><td>##IDS_ACTIONTEXT_SearchForRelated##</td><td>##IDS_ACTIONTEXT_FoundApp##</td></row>
-		<row><td>GenerateScript</td><td>##IDS_ACTIONTEXT_GeneratingScript##</td><td>##IDS_ACTIONTEXT_1##</td></row>
-		<row><td>InstallAdminPackage</td><td>##IDS_ACTIONTEXT_CopyingNetworkFiles##</td><td>##IDS_ACTIONTEXT_FileDirSize##</td></row>
-		<row><td>InstallFiles</td><td>##IDS_ACTIONTEXT_CopyingNewFiles##</td><td>##IDS_ACTIONTEXT_FileDirSize2##</td></row>
-		<row><td>InstallODBC</td><td>##IDS_ACTIONTEXT_InstallODBC##</td><td/></row>
-		<row><td>InstallSFPCatalogFile</td><td>##IDS_ACTIONTEXT_InstallingSystemCatalog##</td><td>##IDS_ACTIONTEXT_FileDependencies##</td></row>
-		<row><td>InstallServices</td><td>##IDS_ACTIONTEXT_InstallServices##</td><td>##IDS_ACTIONTEXT_Service2##</td></row>
-		<row><td>InstallValidate</td><td>##IDS_ACTIONTEXT_Validating##</td><td/></row>
-		<row><td>LaunchConditions</td><td>##IDS_ACTIONTEXT_EvaluateLaunchConditions##</td><td/></row>
-		<row><td>MigrateFeatureStates</td><td>##IDS_ACTIONTEXT_MigratingFeatureStates##</td><td>##IDS_ACTIONTEXT_Application##</td></row>
-		<row><td>MoveFiles</td><td>##IDS_ACTIONTEXT_MovingFiles##</td><td>##IDS_ACTIONTEXT_FileDirSize3##</td></row>
-		<row><td>PatchFiles</td><td>##IDS_ACTIONTEXT_PatchingFiles##</td><td>##IDS_ACTIONTEXT_FileDirSize4##</td></row>
-		<row><td>ProcessComponents</td><td>##IDS_ACTIONTEXT_UpdateComponentRegistration##</td><td/></row>
-		<row><td>PublishComponents</td><td>##IDS_ACTIONTEXT_PublishingQualifiedComponents##</td><td>##IDS_ACTIONTEXT_ComponentIDQualifier##</td></row>
-		<row><td>PublishFeatures</td><td>##IDS_ACTIONTEXT_PublishProductFeatures##</td><td>##IDS_ACTIONTEXT_FeatureColon##</td></row>
-		<row><td>PublishProduct</td><td>##IDS_ACTIONTEXT_PublishProductInfo##</td><td/></row>
-		<row><td>RMCCPSearch</td><td>##IDS_ACTIONTEXT_SearchingQualifyingProducts##</td><td/></row>
-		<row><td>RegisterClassInfo</td><td>##IDS_ACTIONTEXT_RegisterClassServer##</td><td>##IDS_ACTIONTEXT_ClassId##</td></row>
-		<row><td>RegisterComPlus</td><td>##IDS_ACTIONTEXT_RegisteringComPlus##</td><td>##IDS_ACTIONTEXT_AppIdAppTypeRSN##</td></row>
-		<row><td>RegisterExtensionInfo</td><td>##IDS_ACTIONTEXT_RegisterExtensionServers##</td><td>##IDS_ACTIONTEXT_Extension2##</td></row>
-		<row><td>RegisterFonts</td><td>##IDS_ACTIONTEXT_RegisterFonts##</td><td>##IDS_ACTIONTEXT_Font##</td></row>
-		<row><td>RegisterMIMEInfo</td><td>##IDS_ACTIONTEXT_RegisterMimeInfo##</td><td>##IDS_ACTIONTEXT_ContentTypeExtension##</td></row>
-		<row><td>RegisterProduct</td><td>##IDS_ACTIONTEXT_RegisteringProduct##</td><td>##IDS_ACTIONTEXT_1b##</td></row>
-		<row><td>RegisterProgIdInfo</td><td>##IDS_ACTIONTEXT_RegisteringProgIdentifiers##</td><td>##IDS_ACTIONTEXT_ProgID2##</td></row>
-		<row><td>RegisterTypeLibraries</td><td>##IDS_ACTIONTEXT_RegisterTypeLibs##</td><td>##IDS_ACTIONTEXT_LibId##</td></row>
-		<row><td>RegisterUser</td><td>##IDS_ACTIONTEXT_RegUser##</td><td>##IDS_ACTIONTEXT_1c##</td></row>
-		<row><td>RemoveDuplicateFiles</td><td>##IDS_ACTIONTEXT_RemovingDuplicates##</td><td>##IDS_ACTIONTEXT_FileDir##</td></row>
-		<row><td>RemoveEnvironmentStrings</td><td>##IDS_ACTIONTEXT_UpdateEnvironmentStrings##</td><td>##IDS_ACTIONTEXT_NameValueAction2##</td></row>
-		<row><td>RemoveExistingProducts</td><td>##IDS_ACTIONTEXT_RemoveApps##</td><td>##IDS_ACTIONTEXT_AppCommandLine##</td></row>
-		<row><td>RemoveFiles</td><td>##IDS_ACTIONTEXT_RemovingFiles##</td><td>##IDS_ACTIONTEXT_FileDir2##</td></row>
-		<row><td>RemoveFolders</td><td>##IDS_ACTIONTEXT_RemovingFolders##</td><td>##IDS_ACTIONTEXT_Folder1##</td></row>
-		<row><td>RemoveIniValues</td><td>##IDS_ACTIONTEXT_RemovingIni##</td><td>##IDS_ACTIONTEXT_FileSectionKeyValue##</td></row>
-		<row><td>RemoveODBC</td><td>##IDS_ACTIONTEXT_RemovingODBC##</td><td/></row>
-		<row><td>RemoveRegistryValues</td><td>##IDS_ACTIONTEXT_RemovingRegistry##</td><td>##IDS_ACTIONTEXT_KeyName##</td></row>
-		<row><td>RemoveShortcuts</td><td>##IDS_ACTIONTEXT_RemovingShortcuts##</td><td>##IDS_ACTIONTEXT_Shortcut1##</td></row>
-		<row><td>Rollback</td><td>##IDS_ACTIONTEXT_RollingBack##</td><td>##IDS_ACTIONTEXT_1d##</td></row>
-		<row><td>RollbackCleanup</td><td>##IDS_ACTIONTEXT_RemovingBackup##</td><td>##IDS_ACTIONTEXT_File2##</td></row>
-		<row><td>SelfRegModules</td><td>##IDS_ACTIONTEXT_RegisteringModules##</td><td>##IDS_ACTIONTEXT_FileFolder##</td></row>
-		<row><td>SelfUnregModules</td><td>##IDS_ACTIONTEXT_UnregisterModules##</td><td>##IDS_ACTIONTEXT_FileFolder2##</td></row>
-		<row><td>SetODBCFolders</td><td>##IDS_ACTIONTEXT_InitializeODBCDirs##</td><td/></row>
-		<row><td>StartServices</td><td>##IDS_ACTIONTEXT_StartingServices##</td><td>##IDS_ACTIONTEXT_Service3##</td></row>
-		<row><td>StopServices</td><td>##IDS_ACTIONTEXT_StoppingServices##</td><td>##IDS_ACTIONTEXT_Service4##</td></row>
-		<row><td>UnmoveFiles</td><td>##IDS_ACTIONTEXT_RemovingMoved##</td><td>##IDS_ACTIONTEXT_FileDir3##</td></row>
-		<row><td>UnpublishComponents</td><td>##IDS_ACTIONTEXT_UnpublishQualified##</td><td>##IDS_ACTIONTEXT_ComponentIdQualifier2##</td></row>
-		<row><td>UnpublishFeatures</td><td>##IDS_ACTIONTEXT_UnpublishProductFeatures##</td><td>##IDS_ACTIONTEXT_Feature##</td></row>
-		<row><td>UnpublishProduct</td><td>##IDS_ACTIONTEXT_UnpublishingProductInfo##</td><td/></row>
-		<row><td>UnregisterClassInfo</td><td>##IDS_ACTIONTEXT_UnregisterClassServers##</td><td>##IDS_ACTIONTEXT_ClsID##</td></row>
-		<row><td>UnregisterComPlus</td><td>##IDS_ACTIONTEXT_UnregisteringComPlus##</td><td>##IDS_ACTIONTEXT_AppId##</td></row>
-		<row><td>UnregisterExtensionInfo</td><td>##IDS_ACTIONTEXT_UnregisterExtensionServers##</td><td>##IDS_ACTIONTEXT_Extension##</td></row>
-		<row><td>UnregisterFonts</td><td>##IDS_ACTIONTEXT_UnregisteringFonts##</td><td>##IDS_ACTIONTEXT_Font2##</td></row>
-		<row><td>UnregisterMIMEInfo</td><td>##IDS_ACTIONTEXT_UnregisteringMimeInfo##</td><td>##IDS_ACTIONTEXT_ContentTypeExtension2##</td></row>
-		<row><td>UnregisterProgIdInfo</td><td>##IDS_ACTIONTEXT_UnregisteringProgramIds##</td><td>##IDS_ACTIONTEXT_ProgID##</td></row>
-		<row><td>UnregisterTypeLibraries</td><td>##IDS_ACTIONTEXT_UnregTypeLibs##</td><td>##IDS_ACTIONTEXT_Libid2##</td></row>
-		<row><td>WriteEnvironmentStrings</td><td>##IDS_ACTIONTEXT_EnvironmentStrings##</td><td>##IDS_ACTIONTEXT_NameValueAction##</td></row>
-		<row><td>WriteIniValues</td><td>##IDS_ACTIONTEXT_WritingINI##</td><td>##IDS_ACTIONTEXT_FileSectionKeyValue2##</td></row>
-		<row><td>WriteRegistryValues</td><td>##IDS_ACTIONTEXT_WritingRegistry##</td><td>##IDS_ACTIONTEXT_KeyNameValue##</td></row>
-		<row><td>caCreateVRoots</td><td>##IDS_ACTIONTEXT_CreatingIISRoots##</td><td/></row>
-		<row><td>caRemoveVRoots</td><td>##IDS_ACTIONTEXT_RemovingIISRoots##</td><td/></row>
-	</table>
-
-	<table name="AdminExecuteSequence">
-		<col key="yes" def="s72">Action</col>
-		<col def="S255">Condition</col>
-		<col def="I2">Sequence</col>
-		<col def="S255">ISComments</col>
-		<col def="I4">ISAttributes</col>
-		<row><td>CostFinalize</td><td/><td>1000</td><td>CostFinalize</td><td/></row>
-		<row><td>CostInitialize</td><td/><td>800</td><td>CostInitialize</td><td/></row>
-		<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
-		<row><td>InstallAdminPackage</td><td/><td>3900</td><td>InstallAdminPackage</td><td/></row>
-		<row><td>InstallFiles</td><td/><td>4000</td><td>InstallFiles</td><td/></row>
-		<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
-		<row><td>InstallInitialize</td><td/><td>1500</td><td>InstallInitialize</td><td/></row>
-		<row><td>InstallValidate</td><td/><td>1400</td><td>InstallValidate</td><td/></row>
-		<row><td>ScheduleReboot</td><td>ISSCHEDULEREBOOT</td><td>4010</td><td>ScheduleReboot</td><td/></row>
-	</table>
-
-	<table name="AdminUISequence">
-		<col key="yes" def="s72">Action</col>
-		<col def="S255">Condition</col>
-		<col def="I2">Sequence</col>
-		<col def="S255">ISComments</col>
-		<col def="I4">ISAttributes</col>
-		<row><td>AdminWelcome</td><td/><td>1010</td><td>AdminWelcome</td><td/></row>
-		<row><td>CostFinalize</td><td/><td>1000</td><td>CostFinalize</td><td/></row>
-		<row><td>CostInitialize</td><td/><td>800</td><td>CostInitialize</td><td/></row>
-		<row><td>ExecuteAction</td><td/><td>1300</td><td>ExecuteAction</td><td/></row>
-		<row><td>FileCost</td><td/><td>900</td><td>FileCost</td><td/></row>
-		<row><td>SetupCompleteError</td><td/><td>-3</td><td>SetupCompleteError</td><td/></row>
-		<row><td>SetupCompleteSuccess</td><td/><td>-1</td><td>SetupCompleteSuccess</td><td/></row>
-		<row><td>SetupInitialization</td><td/><td>50</td><td>SetupInitialization</td><td/></row>
-		<row><td>SetupInterrupted</td><td/><td>-2</td><td>SetupInterrupted</td><td/></row>
-		<row><td>SetupProgress</td><td/><td>1020</td><td>SetupProgress</td><td/></row>
-	</table>
-
-	<table name="AdvtExecuteSequence">
-		<col key="yes" def="s72">Action</col>
-		<col def="S255">Condition</col>
-		<col def="I2">Sequence</col>
-		<col def="S255">ISComments</col>
-		<col def="I4">ISAttributes</col>
-		<row><td>CostFinalize</td><td/><td>1000</td><td>CostFinalize</td><td/></row>
-		<row><td>CostInitialize</td><td/><td>800</td><td>CostInitialize</td><td/></row>
-		<row><td>CreateShortcuts</td><td/><td>4500</td><td>CreateShortcuts</td><td/></row>
-		<row><td>InstallFinalize</td><td/><td>6600</td><td>InstallFinalize</td><td/></row>
-		<row><td>InstallInitialize</td><td/><td>1500</td><td>InstallInitialize</td><td/></row>
-		<row><td>InstallValidate</td><td/><td>1400</td><td>InstallValidate</td><td/></row>
-		<row><td>MsiPublishAssemblies</td><td/><td>6250</td><td>MsiPublishAssemblies</td><td/></row>
-		<row><td>PublishComponents</td><td/><td>6200</td><td>PublishComponents</td><td/></row>
-		<row><td>PublishFeatures</td><td/><td>6300</td><td>PublishFeatures</td><td/></row>
-		<row><td>PublishProduct</td><td/><td>6400</td><td>PublishProduct</td><td/></row>
-		<row><td>RegisterClassInfo</td><td/><td>4600</td><td>RegisterClassInfo</td><td/></row>
-		<row><td>RegisterExtensionInfo</td><td/><td>4700</td><td>RegisterExtensionInfo</td><td/></row>
-		<row><td>RegisterMIMEInfo</td><td/><td>4900</td><td>RegisterMIMEInfo</td><td/></row>
-		<row><td>RegisterProgIdInfo</td><td/><td>4800</td><td>RegisterProgIdInfo</td><td/></row>
-		<row><td>RegisterTypeLibraries</td><td/><td>4910</td><td>RegisterTypeLibraries</td><td/></row>
-		<row><td>ScheduleReboot</td><td>ISSCHEDULEREBOOT</td><td>6410</td><td>ScheduleReboot</td><td/></row>
-	</table>
-
-	<table name="AdvtUISequence">
-		<col key="yes" def="s72">Action</col>
-		<col def="S255">Condition</col>
-		<col def="I2">Sequence</col>
-		<col def="S255">ISComments</col>
-		<col def="I4">ISAttributes</col>
-	</table>
-
-	<table name="AppId">
-		<col key="yes" def="s38">AppId</col>
-		<col def="S255">RemoteServerName</col>
-		<col def="S255">LocalService</col>
-		<col def="S255">ServiceParameters</col>
-		<col def="S255">DllSurrogate</col>
-		<col def="I2">ActivateAtStorage</col>
-		<col def="I2">RunAsInteractiveUser</col>
-	</table>
-
-	<table name="AppSearch">
-		<col key="yes" def="s72">Property</col>
-		<col key="yes" def="s72">Signature_</col>
-		<row><td>IIS_VERSION</td><td>_IIS_VERSION</td></row>
-	</table>
-
-	<table name="BBControl">
-		<col key="yes" def="s50">Billboard_</col>
-		<col key="yes" def="s50">BBControl</col>
-		<col def="s50">Type</col>
-		<col def="i2">X</col>
-		<col def="i2">Y</col>
-		<col def="i2">Width</col>
-		<col def="i2">Height</col>
-		<col def="I4">Attributes</col>
-		<col def="L50">Text</col>
-	</table>
-
-	<table name="Billboard">
-		<col key="yes" def="s50">Billboard</col>
-		<col def="s38">Feature_</col>
-		<col def="S50">Action</col>
-		<col def="I2">Ordering</col>
-	</table>
-
-	<table name="Binary">
-		<col key="yes" def="s72">Name</col>
-		<col def="V0">Data</col>
-		<col def="S255">ISBuildSourcePath</col>
-		<row><td>ISSELFREG.DLL</td><td/><td>&lt;ISProductFolder&gt;\redist\language independent\i386\isregsvr.dll</td></row>
-		<row><td>NewBinary10</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CompleteSetupIco.ibd</td></row>
-		<row><td>NewBinary11</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
-		<row><td>NewBinary12</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\DestIcon.ibd</td></row>
-		<row><td>NewBinary13</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\NetworkInstall.ico</td></row>
-		<row><td>NewBinary14</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\DontInstall.ico</td></row>
-		<row><td>NewBinary15</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\Install.ico</td></row>
-		<row><td>NewBinary16</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallFirstUse.ico</td></row>
-		<row><td>NewBinary17</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallPartial.ico</td></row>
-		<row><td>NewBinary18</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\InstallStateMenu.ico</td></row>
-		<row><td>NewBinary19</td><td/><td>&lt;ISProductFolder&gt;\Support\Themes\Pastel Wheat Theme\welcome.jpg</td></row>
-		<row><td>NewBinary2</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\New.ibd</td></row>
-		<row><td>NewBinary20</td><td/><td>&lt;RELATIVE_PATH_TO_RELEASE_FILES&gt;\UpdateDSN.exe</td></row>
-		<row><td>NewBinary21</td><td/><td>&lt;ISProductFolder&gt;\Support\Themes\Pastel Wheat Theme\banner.jpg</td></row>
-		<row><td>NewBinary3</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\Up.ibd</td></row>
-		<row><td>NewBinary4</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\WarningIcon.ibd</td></row>
-		<row><td>NewBinary5</td><td/><td>&lt;ISProductFolder&gt;\Support\Themes\InstallShield Blue Theme\welcome.jpg</td></row>
-		<row><td>NewBinary6</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\CustomSetupIco.ibd</td></row>
-		<row><td>NewBinary7</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\ReinstIco.ibd</td></row>
-		<row><td>NewBinary8</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\RemoveIco.ibd</td></row>
-		<row><td>NewBinary9</td><td/><td>&lt;ISProductFolder&gt;\Redist\Language Independent\OS Independent\SetupIcon.ibd</td></row>
-		<row><td>SetAllUsers.dll</td><td/><td>&lt;ISProductFolder&gt;\redist\language independent\i386\SetAllUsers.dll</td></row>
-		<row><td>binIISHelper</td><td/><td>&lt;ISProductFolder&gt;\Support\IISHelper.dll</td></row>
-	</table>
-
-	<table name="BindImage">
-		<col key="yes" def="s72">File_</col>
-		<col def="S255">Path</col>
-	</table>
-
-	<table name="CCPSearch">
-		<col key="yes" def="s72">Signature_</col>
-	</table>
-
-	<table name="CheckBox">
-		<col key="yes" def="s72">Property</col>
-		<col def="S64">Value</col>
-		<row><td>ISCHECKFORPRODUCTUPDATES</td><td>1</td></row>
-		<row><td>LAUNCHPROGRAM</td><td>1</td></row>
-	</table>
-
-	<table name="Class">
-		<col key="yes" def="s38">CLSID</col>
-		<col key="yes" def="s32">Context</col>
-		<col key="yes" def="s72">Component_</col>
-		<col def="S255">ProgId_Default</col>
-		<col def="L255">Description</col>
-		<col def="S38">AppId_</col>
-		<col def="S255">FileTypeMask</col>
-		<col def="S72">Icon_</col>
-		<col def="I2">IconIndex</col>
-		<col def="S32">DefInprocHandler</col>
-		<col def="S255">Argument</col>
-		<col def="s38">Feature_</col>
-		<col def="I2">Attributes</col>
-	</table>
-
-	<table name="ComboBox">
-		<col key="yes" def="s72">Property</col>
-		<col key="yes" def="i2">Order</col>
-		<col def="s64">Value</col>
-		<col def="L64">Text</col>
-	</table>
-
-	<table name="CompLocator">
-		<col key="yes" def="s72">Signature_</col>
-		<col def="s38">ComponentId</col>
-		<col def="I2">Type</col>
-	</table>
-
-	<table name="Complus">
-		<col key="yes" def="s72">Component_</col>
-		<col key="yes" def="I2">ExpType</col>
-	</table>
-
-	<table name="Component">
-		<col key="yes" def="s72">Component</col>
-		<col def="S38">ComponentId</col>
-		<col def="s72">Directory_</col>
-		<col def="i2">Attributes</col>
-		<col def="S255">Condition</col>
-		<col def="S72">KeyPath</col>
-		<col def="I4">ISAttributes</col>
-		<col def="S255">ISComments</col>
-		<col def="S255">ISScanAtBuildFile</col>
-		<col def="S255">ISRegFileToMergeAtBuild</col>
-		<col def="S0">ISDotNetInstallerArgsInstall</col>
-		<col def="S0">ISDotNetInstallerArgsCommit</col>
-		<col def="S0">ISDotNetInstallerArgsUninstall</col>
-		<col def="S0">ISDotNetInstallerArgsRollback</col>
-		<row><td>DriverFiles</td><td>{A1D55BD0-A748-4510-ABB8-42843E18EA25}</td><td>System64Folder</td><td>768</td><td/><td/><td>1</td><td/><td>odbcte32.exe1</td><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>DriverMisc</td><td>{143DAD76-FAD0-458C-92BE-3A1419CC4158}</td><td>INSTALLDIR</td><td>512</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>HPODBCChangeCertDir</td><td>{6E86E9DB-0070-4589-A7C4-5DBA4FF638C5}</td><td>HPCERTDIR</td><td>264</td><td>CERT_DIR_RADIOS=2</td><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>HPODBCDefaultCertDir</td><td>{E8E72110-8E36-4EBA-9825-1A047C3D1F67}</td><td>INSTALLDIR</td><td>264</td><td>CERT_DIR_RADIOS=1</td><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>HPODBCHelpShortCut</td><td>{81446677-7EEE-40EE-8540-125744DB7D9D}</td><td>STARTMENUODBC</td><td>768</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>MSODBCAdministratorShortCut</td><td>{AEDE1FC4-5AF7-4FAB-BAB0-E323D5C4B020}</td><td>STARTMENUODBC</td><td>768</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>RemoveHPODBCShortCut</td><td>{448025FF-CA7D-42E2-A344-6C11EAC03E04}</td><td>STARTMENUODBC</td><td>768</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>TRAFODBC1</td><td>{04B0AFCB-FB83-4F80-902F-2B6C33522736}</td><td>System64Folder</td><td>256</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>TRAFODBC1Setup</td><td>{0EC152AB-D915-4730-AB69-6925AE735760}</td><td>System64Folder</td><td>256</td><td/><td>trfoadm1.dll</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-	</table>
-
-	<table name="Condition">
-		<col key="yes" def="s38">Feature_</col>
-		<col key="yes" def="i2">Level</col>
-		<col def="S255">Condition</col>
-	</table>
-
-	<table name="Control">
-		<col key="yes" def="s72">Dialog_</col>
-		<col key="yes" def="s50">Control</col>
-		<col def="s20">Type</col>
-		<col def="i2">X</col>
-		<col def="i2">Y</col>
-		<col def="i2">Width</col>
-		<col def="i2">Height</col>
-		<col def="I4">Attributes</col>
-		<col def="S72">Property</col>
-		<col def="L0">Text</col>
-		<col def="S50">Control_Next</col>
-		<col def="L50">Help</col>
-		<col def="I4">ISWindowStyle</col>
-		<col def="I4">ISControlId</col>
-		<col def="S255">ISBuildSourcePath</col>
-		<col def="S72">Binary_</col>
-		<row><td>AdminChangeFolder</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>AdminChangeFolder</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>ComboText</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>Combo</td><td>DirectoryCombo</td><td>21</td><td>64</td><td>277</td><td>80</td><td>458755</td><td>TARGETDIR</td><td>##IDS__IsAdminInstallBrowse_4##</td><td>Up</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>ComboText</td><td>Text</td><td>21</td><td>50</td><td>99</td><td>14</td><td>3</td><td/><td>##IDS__IsAdminInstallBrowse_LookIn##</td><td>Combo</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsAdminInstallBrowse_BrowseDestination##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsAdminInstallBrowse_ChangeDestination##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>List</td><td>DirectoryList</td><td>21</td><td>90</td><td>332</td><td>97</td><td>7</td><td>TARGETDIR</td><td>##IDS__IsAdminInstallBrowse_8##</td><td>TailText</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>NewFolder</td><td>PushButton</td><td>335</td><td>66</td><td>19</td><td>19</td><td>3670019</td><td/><td/><td>List</td><td>##IDS__IsAdminInstallBrowse_CreateFolder##</td><td>0</td><td/><td/><td>NewBinary2</td></row>
-		<row><td>AdminChangeFolder</td><td>OK</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_OK##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>Tail</td><td>PathEdit</td><td>21</td><td>207</td><td>332</td><td>17</td><td>3</td><td>TARGETDIR</td><td>##IDS__IsAdminInstallBrowse_11##</td><td>OK</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>TailText</td><td>Text</td><td>21</td><td>193</td><td>99</td><td>13</td><td>3</td><td/><td>##IDS__IsAdminInstallBrowse_FolderName##</td><td>Tail</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminChangeFolder</td><td>Up</td><td>PushButton</td><td>310</td><td>66</td><td>19</td><td>19</td><td>3670019</td><td/><td/><td>NewFolder</td><td>##IDS__IsAdminInstallBrowse_UpOneLevel##</td><td>0</td><td/><td/><td>NewBinary3</td></row>
-		<row><td>AdminNetworkLocation</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>InstallNow</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>AdminNetworkLocation</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>Browse</td><td>PushButton</td><td>286</td><td>124</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsAdminInstallPoint_Change##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>SetupPathEdit</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsAdminInstallPoint_SpecifyNetworkLocation##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>DlgText</td><td>Text</td><td>21</td><td>51</td><td>326</td><td>40</td><td>131075</td><td/><td>##IDS__IsAdminInstallPoint_EnterNetworkLocation##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsAdminInstallPoint_NetworkLocationFormatted##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>InstallNow</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsAdminInstallPoint_Install##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>LBBrowse</td><td>Text</td><td>21</td><td>90</td><td>100</td><td>10</td><td>3</td><td/><td>##IDS__IsAdminInstallPoint_NetworkLocation##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminNetworkLocation</td><td>SetupPathEdit</td><td>PathEdit</td><td>21</td><td>102</td><td>330</td><td>17</td><td>3</td><td>TARGETDIR</td><td/><td>Browse</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminWelcome</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminWelcome</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminWelcome</td><td>DlgLine</td><td>Line</td><td>0</td><td>234</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>AdminWelcome</td><td>Image</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>234</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary19</td></row>
-		<row><td>AdminWelcome</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminWelcome</td><td>TextLine1</td><td>Text</td><td>135</td><td>8</td><td>225</td><td>45</td><td>196611</td><td/><td>##IDS__IsAdminInstallPointWelcome_Wizard##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>AdminWelcome</td><td>TextLine2</td><td>Text</td><td>135</td><td>55</td><td>228</td><td>45</td><td>196611</td><td/><td>##IDS__IsAdminInstallPointWelcome_ServerImage##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CancelSetup</td><td>Icon</td><td>Icon</td><td>15</td><td>15</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary4</td></row>
-		<row><td>CancelSetup</td><td>No</td><td>PushButton</td><td>135</td><td>57</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_No##</td><td>Yes</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CancelSetup</td><td>Text</td><td>Text</td><td>48</td><td>15</td><td>194</td><td>30</td><td>131075</td><td/><td>##IDS__IsCancelDlg_ConfirmCancel##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CancelSetup</td><td>Yes</td><td>PushButton</td><td>62</td><td>57</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCancelDlg_Yes##</td><td>No</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>CertificationChangeDir</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>ComboText</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Combo</td><td>DirectoryCombo</td><td>21</td><td>64</td><td>277</td><td>80</td><td>4128779</td><td>CERTDIRNAME</td><td>##IDS__IsBrowseFolderDlg_4##</td><td>Up</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>ComboText</td><td>Text</td><td>21</td><td>50</td><td>99</td><td>14</td><td>3</td><td/><td>##IDS__IsBrowseFolderDlg_LookIn##</td><td>Combo</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsBrowseFolderDlg_BrowseDestFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsBrowseFolderDlg_ChangeCurrentFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>List</td><td>DirectoryList</td><td>20</td><td>89</td><td>332</td><td>97</td><td>15</td><td>CERTDIRNAME</td><td>##IDS__IsBrowseFolderDlg_8##</td><td>TailText</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>NewFolder</td><td>PushButton</td><td>335</td><td>66</td><td>19</td><td>19</td><td>3670019</td><td/><td/><td>List</td><td>##IDS__IsBrowseFolderDlg_CreateFolder##</td><td>0</td><td/><td/><td>NewBinary2</td></row>
-		<row><td>CertificationChangeDir</td><td>OK</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsBrowseFolderDlg_OK##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Tail</td><td>PathEdit</td><td>21</td><td>207</td><td>332</td><td>17</td><td>15</td><td>CERTDIRNAME</td><td>##IDS__IsBrowseFolderDlg_11##</td><td>OK</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>TailText</td><td>Text</td><td>21</td><td>193</td><td>99</td><td>13</td><td>3</td><td/><td>##IDS__IsBrowseFolderDlg_FolderName##</td><td>Tail</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CertificationChangeDir</td><td>Up</td><td>PushButton</td><td>310</td><td>66</td><td>19</td><td>19</td><td>3670019</td><td/><td/><td>NewFolder</td><td>##IDS__IsBrowseFolderDlg_UpOneLevel##</td><td>0</td><td/><td/><td>NewBinary3</td></row>
-		<row><td>CustomSetup</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>CustomSetup</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Tree</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>ChangeFolder</td><td>PushButton</td><td>301</td><td>203</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_Change##</td><td>Help</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Details</td><td>PushButton</td><td>93</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_Space##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>DlgDesc</td><td>Text</td><td>17</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsCustomSelectionDlg_SelectFeatures##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>DlgText</td><td>Text</td><td>9</td><td>51</td><td>360</td><td>10</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_ClickFeatureIcon##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>DlgTitle</td><td>Text</td><td>9</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsCustomSelectionDlg_CustomSetup##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>FeatureGroup</td><td>GroupBox</td><td>235</td><td>67</td><td>131</td><td>120</td><td>1</td><td/><td>##IDS__IsCustomSelectionDlg_FeatureDescription##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Help</td><td>PushButton</td><td>22</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_Help##</td><td>Details</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>InstallLabel</td><td>Text</td><td>8</td><td>190</td><td>360</td><td>10</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_InstallTo##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>ItemDescription</td><td>Text</td><td>241</td><td>80</td><td>120</td><td>50</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_MultilineDescription##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Location</td><td>Text</td><td>8</td><td>203</td><td>291</td><td>20</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_FeaturePath##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Size</td><td>Text</td><td>241</td><td>133</td><td>120</td><td>50</td><td>3</td><td/><td>##IDS__IsCustomSelectionDlg_FeatureSize##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetup</td><td>Tree</td><td>SelectionTree</td><td>8</td><td>70</td><td>220</td><td>118</td><td>7</td><td>_BrowseProperty</td><td/><td>ChangeFolder</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>CustomSetupTips</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS_SetupTips_CustomSetupDescription##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS_SetupTips_CustomSetup##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>DontInstall</td><td>Icon</td><td>21</td><td>155</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary14</td></row>
-		<row><td>CustomSetupTips</td><td>DontInstallText</td><td>Text</td><td>60</td><td>155</td><td>300</td><td>20</td><td>3</td><td/><td>##IDS_SetupTips_WillNotBeInstalled##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>FirstInstallText</td><td>Text</td><td>60</td><td>180</td><td>300</td><td>20</td><td>3</td><td/><td>##IDS_SetupTips_Advertise##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>Install</td><td>Icon</td><td>21</td><td>105</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary15</td></row>
-		<row><td>CustomSetupTips</td><td>InstallFirstUse</td><td>Icon</td><td>21</td><td>180</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary16</td></row>
-		<row><td>CustomSetupTips</td><td>InstallPartial</td><td>Icon</td><td>21</td><td>130</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary17</td></row>
-		<row><td>CustomSetupTips</td><td>InstallStateMenu</td><td>Icon</td><td>21</td><td>52</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary18</td></row>
-		<row><td>CustomSetupTips</td><td>InstallStateText</td><td>Text</td><td>21</td><td>91</td><td>300</td><td>10</td><td>3</td><td/><td>##IDS_SetupTips_InstallState##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>InstallText</td><td>Text</td><td>60</td><td>105</td><td>300</td><td>20</td><td>3</td><td/><td>##IDS_SetupTips_AllInstalledLocal##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>MenuText</td><td>Text</td><td>50</td><td>52</td><td>300</td><td>36</td><td>3</td><td/><td>##IDS_SetupTips_IconInstallState##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>NetworkInstall</td><td>Icon</td><td>21</td><td>205</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary13</td></row>
-		<row><td>CustomSetupTips</td><td>NetworkInstallText</td><td>Text</td><td>60</td><td>205</td><td>300</td><td>20</td><td>3</td><td/><td>##IDS_SetupTips_Network##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>OK</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_SetupTips_OK##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomSetupTips</td><td>PartialText</td><td>Text</td><td>60</td><td>130</td><td>300</td><td>20</td><td>3</td><td/><td>##IDS_SetupTips_SubFeaturesInstalledLocal##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>CustomerInformation</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>NameLabel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>CompanyEdit</td><td>Edit</td><td>21</td><td>100</td><td>237</td><td>17</td><td>3</td><td>COMPANYNAME</td><td>##IDS__IsRegisterUserDlg_Tahoma80##</td><td>SerialLabel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>CompanyLabel</td><td>Text</td><td>21</td><td>89</td><td>75</td><td>10</td><td>3</td><td/><td>##IDS__IsRegisterUserDlg_Organization##</td><td>CompanyEdit</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsRegisterUserDlg_PleaseEnterInfo##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>DlgRadioGroupText</td><td>Text</td><td>21</td><td>161</td><td>300</td><td>14</td><td>3</td><td/><td>##IDS__IsRegisterUserDlg_InstallFor##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsRegisterUserDlg_CustomerInformation##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>NameEdit</td><td>Edit</td><td>21</td><td>63</td><td>237</td><td>17</td><td>3</td><td>USERNAME</td><td>##IDS__IsRegisterUserDlg_Tahoma50##</td><td>CompanyLabel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>NameLabel</td><td>Text</td><td>21</td><td>52</td><td>75</td><td>10</td><td>3</td><td/><td>##IDS__IsRegisterUserDlg_UserName##</td><td>NameEdit</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>RadioGroup</td><td>RadioButtonGroup</td><td>63</td><td>170</td><td>300</td><td>50</td><td>3</td><td>ApplicationUsers</td><td>##IDS__IsRegisterUserDlg_16##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>SerialLabel</td><td>Text</td><td>21</td><td>127</td><td>109</td><td>10</td><td>2</td><td/><td>##IDS__IsRegisterUserDlg_SerialNumber##</td><td>SerialNumber</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>CustomerInformation</td><td>SerialNumber</td><td>MaskedEdit</td><td>21</td><td>138</td><td>237</td><td>17</td><td>2</td><td>ISX_SERIALNUM</td><td/><td>RadioGroup</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>DatabaseFolder</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>ChangeFolder</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>ChangeFolder</td><td>PushButton</td><td>301</td><td>65</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CHANGE##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>DatabaseFolder</td><td>Icon</td><td>21</td><td>52</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary12</td></row>
-		<row><td>DatabaseFolder</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__DatabaseFolder_ChangeFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__DatabaseFolder_DatabaseFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>LocLabel</td><td>Text</td><td>57</td><td>52</td><td>290</td><td>10</td><td>131075</td><td/><td>##IDS_DatabaseFolder_InstallDatabaseTo##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Location</td><td>Text</td><td>57</td><td>65</td><td>240</td><td>40</td><td>3</td><td>_BrowseProperty</td><td>##IDS__DatabaseFolder_DatabaseDir##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DatabaseFolder</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>DestinationFolder</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>ChangeFolder</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>ChangeFolder</td><td>PushButton</td><td>301</td><td>65</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__DestinationFolder_Change##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>DestFolder</td><td>Icon</td><td>21</td><td>52</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary12</td></row>
-		<row><td>DestinationFolder</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__DestinationFolder_ChangeFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__DestinationFolder_DestinationFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>LocLabel</td><td>Text</td><td>57</td><td>52</td><td>290</td><td>10</td><td>131075</td><td/><td>##IDS__DestinationFolder_InstallTo##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Location</td><td>Text</td><td>56</td><td>65</td><td>240</td><td>40</td><td>3</td><td>_BrowseProperty</td><td>##IDS_INSTALLDIR##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DestinationFolder</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>DiskSpaceRequirements</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>DlgDesc</td><td>Text</td><td>17</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsFeatureDetailsDlg_SpaceRequired##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>DlgText</td><td>Text</td><td>10</td><td>185</td><td>358</td><td>41</td><td>3</td><td/><td>##IDS__IsFeatureDetailsDlg_VolumesTooSmall##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>DlgTitle</td><td>Text</td><td>9</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsFeatureDetailsDlg_DiskSpaceRequirements##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>List</td><td>VolumeCostList</td><td>8</td><td>55</td><td>358</td><td>125</td><td>393223</td><td/><td>##IDS__IsFeatureDetailsDlg_Numbers##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>DiskSpaceRequirements</td><td>OK</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsFeatureDetailsDlg_OK##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>FilesInUse</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsFilesInUse_FilesInUseMessage##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>DlgText</td><td>Text</td><td>21</td><td>51</td><td>348</td><td>29</td><td>3</td><td/><td>##IDS__IsFilesInUse_ApplicationsUsingFiles##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsFilesInUse_FilesInUse##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>Exit</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsFilesInUse_Exit##</td><td>List</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>Ignore</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsFilesInUse_Ignore##</td><td>Exit</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>List</td><td>ListBox</td><td>21</td><td>87</td><td>331</td><td>135</td><td>7</td><td>FileInUseProcess</td><td/><td>Retry</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>FilesInUse</td><td>Retry</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsFilesInUse_Retry##</td><td>Ignore</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>InstallChangeFolder</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>ComboText</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Combo</td><td>DirectoryCombo</td><td>21</td><td>64</td><td>277</td><td>80</td><td>4128779</td><td>_BrowseProperty</td><td>##IDS__IsBrowseFolderDlg_4##</td><td>Up</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>ComboText</td><td>Text</td><td>21</td><td>50</td><td>99</td><td>14</td><td>3</td><td/><td>##IDS__IsBrowseFolderDlg_LookIn##</td><td>Combo</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsBrowseFolderDlg_BrowseDestFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsBrowseFolderDlg_ChangeCurrentFolder##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>List</td><td>DirectoryList</td><td>21</td><td>90</td><td>332</td><td>97</td><td>15</td><td>_BrowseProperty</td><td>##IDS__IsBrowseFolderDlg_8##</td><td>TailText</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>NewFolder</td><td>PushButton</td><td>335</td><td>66</td><td>19</td><td>19</td><td>3670019</td><td/><td/><td>List</td><td>##IDS__IsBrowseFolderDlg_CreateFolder##</td><td>0</td><td/><td/><td>NewBinary2</td></row>
-		<row><td>InstallChangeFolder</td><td>OK</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsBrowseFolderDlg_OK##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Tail</td><td>PathEdit</td><td>20</td><td>207</td><td>332</td><td>17</td><td>15</td><td>_BrowseProperty</td><td>##IDS__IsBrowseFolderDlg_11##</td><td>OK</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>TailText</td><td>Text</td><td>21</td><td>193</td><td>99</td><td>13</td><td>3</td><td/><td>##IDS__IsBrowseFolderDlg_FolderName##</td><td>Tail</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallChangeFolder</td><td>Up</td><td>PushButton</td><td>310</td><td>66</td><td>19</td><td>19</td><td>3670019</td><td/><td/><td>NewFolder</td><td>##IDS__IsBrowseFolderDlg_UpOneLevel##</td><td>0</td><td/><td/><td>NewBinary3</td></row>
-		<row><td>InstallWelcome</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>Copyright</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallWelcome</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallWelcome</td><td>Copyright</td><td>Text</td><td>135</td><td>144</td><td>228</td><td>73</td><td>65539</td><td/><td>##IDS__IsWelcomeDlg_WarningCopyright##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallWelcome</td><td>DlgLine</td><td>Line</td><td>0</td><td>234</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>InstallWelcome</td><td>Image</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>234</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary19</td></row>
-		<row><td>InstallWelcome</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallWelcome</td><td>TextLine1</td><td>Text</td><td>135</td><td>8</td><td>225</td><td>45</td><td>196611</td><td/><td>##IDS__IsWelcomeDlg_WelcomeProductName##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>InstallWelcome</td><td>TextLine2</td><td>Text</td><td>135</td><td>55</td><td>228</td><td>45</td><td>196611</td><td/><td>##IDS__IsWelcomeDlg_InstallProductName##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Agree</td><td>RadioButtonGroup</td><td>8</td><td>190</td><td>291</td><td>40</td><td>3</td><td>AgreeToLicense</td><td/><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>LicenseAgreement</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>ISPrintButton</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsLicenseDlg_ReadLicenseAgreement##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsLicenseDlg_LicenseAgreement##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>ISPrintButton</td><td>PushButton</td><td>301</td><td>188</td><td>65</td><td>17</td><td>3</td><td/><td>##IDS_PRINT_BUTTON##</td><td>Agree</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>LicenseAgreement</td><td>Memo</td><td>ScrollableText</td><td>8</td><td>55</td><td>358</td><td>130</td><td>7</td><td/><td/><td/><td/><td>0</td><td/><td>&lt;ISProjectFolder&gt;\LICENSE.rtf</td><td/></row>
-		<row><td>LicenseAgreement</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>MaintenanceType</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>RadioGroup</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsMaintenanceDlg_MaitenanceOptions##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsMaintenanceDlg_ProgramMaintenance##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Ico1</td><td>Icon</td><td>35</td><td>75</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary6</td></row>
-		<row><td>MaintenanceType</td><td>Ico2</td><td>Icon</td><td>35</td><td>135</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary7</td></row>
-		<row><td>MaintenanceType</td><td>Ico3</td><td>Icon</td><td>35</td><td>195</td><td>24</td><td>24</td><td>5242881</td><td/><td/><td/><td/><td>0</td><td/><td/><td>NewBinary8</td></row>
-		<row><td>MaintenanceType</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>RadioGroup</td><td>RadioButtonGroup</td><td>21</td><td>55</td><td>290</td><td>170</td><td>3</td><td>_IsMaintenance</td><td/><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Text1</td><td>Text</td><td>80</td><td>72</td><td>260</td><td>35</td><td>3</td><td/><td>##IDS__IsMaintenanceDlg_ChangeFeatures##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Text2</td><td>Text</td><td>80</td><td>135</td><td>260</td><td>35</td><td>3</td><td/><td>##IDS__IsMaintenanceDlg_RepairMessage##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceType</td><td>Text3</td><td>Text</td><td>80</td><td>192</td><td>260</td><td>35</td><td>131075</td><td/><td>##IDS__IsMaintenanceDlg_RemoveProductName##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceWelcome</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceWelcome</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceWelcome</td><td>DlgLine</td><td>Line</td><td>0</td><td>234</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>MaintenanceWelcome</td><td>Image</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>234</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary19</td></row>
-		<row><td>MaintenanceWelcome</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceWelcome</td><td>TextLine1</td><td>Text</td><td>135</td><td>8</td><td>225</td><td>45</td><td>196611</td><td/><td>##IDS__IsMaintenanceWelcome_WizardWelcome##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MaintenanceWelcome</td><td>TextLine2</td><td>Text</td><td>135</td><td>55</td><td>228</td><td>50</td><td>196611</td><td/><td>##IDS__IsMaintenanceWelcome_MaintenanceOptionsDescription##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>MsiRMFilesInUse</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Restart</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsFilesInUse_FilesInUseMessage##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>DlgText</td><td>Text</td><td>21</td><td>51</td><td>348</td><td>14</td><td>3</td><td/><td>##IDS__IsMsiRMFilesInUse_ApplicationsUsingFiles##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsFilesInUse_FilesInUse##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>List</td><td>ListBox</td><td>21</td><td>66</td><td>331</td><td>135</td><td>3</td><td>FileInUseProcess</td><td/><td>OK</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>OK</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_OK##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>MsiRMFilesInUse</td><td>Restart</td><td>RadioButtonGroup</td><td>19</td><td>187</td><td>343</td><td>40</td><td>3</td><td>RestartManagerOption</td><td/><td>List</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>OutOfSpace</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsDiskSpaceDlg_DiskSpace##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>DlgText</td><td>Text</td><td>21</td><td>51</td><td>326</td><td>43</td><td>3</td><td/><td>##IDS__IsDiskSpaceDlg_HighlightedVolumes##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsDiskSpaceDlg_OutOfDiskSpace##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>List</td><td>VolumeCostList</td><td>21</td><td>95</td><td>332</td><td>120</td><td>393223</td><td/><td>##IDS__IsDiskSpaceDlg_Numbers##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>OutOfSpace</td><td>Resume</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsDiskSpaceDlg_OK##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>PatchWelcome</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>Next</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>PatchWelcome</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>PatchWelcome</td><td>DlgLine</td><td>Line</td><td>0</td><td>234</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>PatchWelcome</td><td>Image</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>234</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary19</td></row>
-		<row><td>PatchWelcome</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsPatchDlg_Update##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>PatchWelcome</td><td>TextLine1</td><td>Text</td><td>135</td><td>8</td><td>225</td><td>45</td><td>196611</td><td/><td>##IDS__IsPatchDlg_WelcomePatchWizard##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>PatchWelcome</td><td>TextLine2</td><td>Text</td><td>135</td><td>54</td><td>228</td><td>45</td><td>196611</td><td/><td>##IDS__IsPatchDlg_PatchClickUpdate##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>InstallNow</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>ReadyToInstall</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsVerifyReadyDlg_WizardReady##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgText</td><td>Text</td><td>21</td><td>51</td><td>326</td><td>20</td><td>3</td><td/><td>##IDS__IsVerifyReadyDlg_ClickInstall##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgText1</td><td>Text</td><td>21</td><td>70</td><td>330</td><td>24</td><td>3</td><td/><td>##IDS__IsVerifyReadyDlg_BackOrCancel##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65538</td><td/><td>##IDS__IsVerifyReadyDlg_ModifyReady##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgTitle2</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65538</td><td/><td>##IDS__IsVerifyReadyDlg_ReadyRepair##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>DlgTitle3</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65538</td><td/><td>##IDS__IsVerifyReadyDlg_ReadyInstall##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToInstall</td><td>InstallNow</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>8388611</td><td/><td>##IDS__IsVerifyReadyDlg_Install##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>RemoveNow</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>ReadyToRemove</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>##IDS_INSTALLSHIELD_FORMATTED##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>##IDS_INSTALLSHIELD##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsVerifyRemoveAllDlg_ChoseRemoveProgram##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>DlgText</td><td>Text</td><td>21</td><td>51</td><td>326</td><td>24</td><td>131075</td><td/><td>##IDS__IsVerifyRemoveAllDlg_ClickRemove##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>DlgText1</td><td>Text</td><td>21</td><td>79</td><td>330</td><td>23</td><td>3</td><td/><td>##IDS__IsVerifyRemoveAllDlg_ClickBack##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>DlgText2</td><td>Text</td><td>21</td><td>102</td><td>330</td><td>24</td><td>3</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>DlgTitle</td><td>Text</td><td>13</td><td>6</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS__IsVerifyRemoveAllDlg_RemoveProgram##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>ReadyToRemove</td><td>RemoveNow</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>8388611</td><td/><td>##IDS__IsVerifyRemoveAllDlg_Remove##</td><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_BACK##</td><td>ChangeCertDir</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>Banner</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>44</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary21</td></row>
-		<row><td>SetHPODBCCertDir</td><td>BannerLine</td><td>Line</td><td>0</td><td>44</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>Branding1</td><td>Text</td><td>4</td><td>229</td><td>50</td><td>13</td><td>3</td><td/><td>{&amp;MSSWhiteSerif8}InstallShield</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>Branding2</td><td>Text</td><td>3</td><td>228</td><td>50</td><td>13</td><td>65537</td><td/><td>{&amp;Tahoma8}InstallShield</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>CERTDIREDIT</td><td>Edit</td><td>43</td><td>180</td><td>241</td><td>19</td><td>13</td><td>CERTDIRNAME</td><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>Cancel</td><td>PushButton</td><td>299</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>CertDefDirTxt</td><td>Text</td><td>45</td><td>109</td><td>264</td><td>15</td><td>65539</td><td>CERTDIRNAME</td><td>##NEW_STRING1##</td><td>RadioButtonGroup</td><td/><td/><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>ChangeCertDir</td><td>PushButton</td><td>288</td><td>180</td><td>60</td><td>19</td><td>8388609</td><td/><td>##IDS_CHANGE_CERT_DIR##</td><td>Next</td><td/><td/><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>DlgDesc</td><td>Text</td><td>21</td><td>23</td><td>292</td><td>25</td><td>65539</td><td/><td>##IDS_DIALOG_TEXT2_DESCRIPTION##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>DlgLine</td><td>Line</td><td>48</td><td>234</td><td>326</td><td>0</td><td>1</td><td/><td/><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>DlgTitle</td><td>Text</td><td>12</td><td>6</td><td>292</td><td>13</td><td>65539</td><td/><td>##IDS_DIALOG_TEXT_DESCRIPTION_INTERIOR##</td><td/><td/><td>0</td><td>0</td><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>GroupBoxChgCertDir</td><td>GroupBox</td><td>17</td><td>155</td><td>334</td><td>50</td><td>3</td><td/><td>##NEW_STRING7##</td><td>Cancel</td><td/><td/><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>GroupBoxDefCertDir</td><td>GroupBox</td><td>16</td><td>86</td><td>334</td><td>43</td><td>3</td><td/><td>##NEW_STRING8##</td><td>GroupBoxChgCertDir</td><td/><td/><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>Icon1</td><td>Icon</td><td>18</td><td>176</td><td>24</td><td>24</td><td>5767169</td><td/><td/><td/><td/><td/><td/><td/><td>NewBinary12</td></row>
-		<row><td>SetHPODBCCertDir</td><td>Next</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS_NEXT##</td><td>CertDefDirTxt</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetHPODBCCertDir</td><td>RadioButtonGroup</td><td>RadioButtonGroup</td><td>8</td><td>58</td><td>354</td><td>162</td><td>16777219</td><td>CERT_DIR_RADIOS</td><td>##NEW_STRING9##</td><td>GroupBoxDefCertDir</td><td/><td/><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>Finish</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_CANCEL##</td><td>Back</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>CheckShowMsiLog</td><td>CheckBox</td><td>151</td><td>172</td><td>10</td><td>9</td><td>2</td><td>ISSHOWMSILOG</td><td/><td>Cancel</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>DlgLine</td><td>Line</td><td>0</td><td>234</td><td>374</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>Finish</td><td>PushButton</td><td>230</td><td>243</td><td>66</td><td>17</td><td>3</td><td/><td>##IDS__IsFatalError_Finish##</td><td>Image</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>FinishText1</td><td>Text</td><td>135</td><td>80</td><td>228</td><td>50</td><td>65539</td><td/><td>##IDS__IsFatalError_NotModified##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>FinishText2</td><td>Text</td><td>135</td><td>135</td><td>228</td><td>25</td><td>65539</td><td/><td>##IDS__IsFatalError_ClickFinish##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>Image</td><td>Bitmap</td><td>0</td><td>0</td><td>374</td><td>234</td><td>1</td><td/><td/><td>CheckShowMsiLog</td><td/><td/><td/><td/><td>NewBinary19</td></row>
-		<row><td>SetupCompleteError</td><td>RestContText1</td><td>Text</td><td>135</td><td>80</td><td>228</td><td>50</td><td>65539</td><td/><td>##IDS__IsFatalError_KeepOrRestore##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>RestContText2</td><td>Text</td><td>135</td><td>135</td><td>228</td><td>25</td><td>65539</td><td/><td>##IDS__IsFatalError_RestoreOrContinueLater##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>ShowMsiLogText</td><td>Text</td><td>164</td><td>172</td><td>228</td><td>10</td><td>65538</td><td/><td>##IDS__IsSetupComplete_ShowMsiLog##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>TextLine1</td><td>Text</td><td>135</td><td>8</td><td>225</td><td>45</td><td>65539</td><td/><td>##IDS__IsFatalError_WizardCompleted##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteError</td><td>TextLine2</td><td>Text</td><td>135</td><td>55</td><td>228</td><td>25</td><td>196611</td><td/><td>##IDS__IsFatalError_WizardInterrupted##</td><td/><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteSuccess</td><td>Back</td><td>PushButton</td><td>164</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_BACK##</td><td>OK</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteSuccess</td><td>Cancel</td><td>PushButton</td><td>301</td><td>243</td><td>66</td><td>17</td><td>1</td><td/><td>##IDS_CANCEL##</td><td>Image</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteSuccess</td><td>CheckBoxUpdates</td><td>CheckBox</td><td>135</td><td>164</td><td>10</td><td>9</td><td>2</td><td>ISCHECKFORPRODUCTUPDATES</td><td>CheckBox1</td><td>CheckShowMsiLog</td><td/><td>0</td><td/><td/><td/></row>
-		<row><td>SetupCompleteSuccess</td><td>CheckForUpdatesText</td><td>Text</td><td>152</td><td>162</td><td>190</td><td>30</td><td>65538</td><td/><td>##IDS__IsExitDialog_Update_YesCheckForUpdates##</td><td/><td/><td>0</td><td/><td/><td/>

<TRUNCATED>

[5/8] incubator-trafodion git commit: Changed veriosn of win-odbc from 1.2.0 to 1.3.0

Posted by rm...@apache.org.
Changed veriosn of win-odbc from 1.2.0 to 1.3.0


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

Branch: refs/heads/master
Commit: a65530aaea8b71859450649da049425c8305dcde
Parents: 521c35c
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Fri Oct 23 17:20:37 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Fri Oct 23 17:20:37 2015 +0800

----------------------------------------------------------------------
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc           | 8 ++++----
 win-odbc64/odbcclient/TranslationDll/TranslationDll.rc | 8 ++++----
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC        | 8 ++++----
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC        | 8 ++++----
 win-odbc64/odbcclient/drvr35/drvr35.rc                 | 8 ++++----
 win-odbc64/odbcclient/drvr35adm/drvr35adm.rc           | 8 ++++----
 win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc            | 8 ++++----
 7 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc b/win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc
index 0c6a13e..800de2c 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC Driver Resource DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_ores0100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc b/win-odbc64/odbcclient/TranslationDll/TranslationDll.rc
index 07d8c4f..dcc435b 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC Translation DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_translation01.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/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 3794ef6..b1d7afb 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC TCPIPV4 DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_tcpipv40100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/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 6799f18..2f17379 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC TCPIPV6 DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_tcpipv60100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/win-odbc64/odbcclient/drvr35/drvr35.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/drvr35.rc b/win-odbc64/odbcclient/drvr35/drvr35.rc
index 130b7ac..b07a269 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC Driver DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "trfodbc1.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc b/win-odbc64/odbcclient/drvr35adm/drvr35adm.rc
index 8348ec0..1f8566d 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC Client Adminstration DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "trfoadm1.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a65530aa/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc b/win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc
index 02f38a9..991ec7e 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,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,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", "1.2.0.0"
+            VALUE "FileVersion", "1.3.0.0"
             VALUE "InternalName", "TRAF ODBC Client Msg DLL"
             VALUE "LegalCopyright", "?Copyright 2015 Apache Trafodion"
             VALUE "OriginalFilename", "traf_odbcDrvMsg_intl0100.dll"
             VALUE "ProductName", "TRAF ODBC"
-            VALUE "ProductVersion", "1.2.0.0"
+            VALUE "ProductVersion", "1.3.0.0"
         END
     END
     BLOCK "VarFileInfo"


[3/8] incubator-trafodion git commit: [TRAFODION-1519]Use free tool to build windows ODBC

Posted by rm...@apache.org.
[TRAFODION-1519]Use free tool to build windows ODBC

1. Use Visual Studio Community 2013 instead of Visual Studio 2010.
Visual Studio Community 2013 is free.
2. Use open source tool inno setup to package windows ODBC Driver.
3. cleanup unused files


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

Branch: refs/heads/master
Commit: f9bc12d9327dca79652a1335770dfe63a504d7fb
Parents: ab8f637
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Mon Oct 12 20:32:53 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Thu Oct 15 15:55:51 2015 +0800

----------------------------------------------------------------------
 .../SetCertificateDirReg/SetCertDirDlg.cpp      |  165 -
 .../SetCertificateDirReg/SetCertDirDlg.h        |   47 -
 .../SetCertificateDirReg.cpp                    |   58 -
 .../SetCertificateDirReg/SetCertificateDirReg.h |   23 -
 .../SetCertificateDirReg.rc                     |  111 -
 .../SetCertificateDirReg_os.vcxproj             |  192 -
 .../SetCertificateDirReg_os.vcxproj.filters     |   53 -
 .../SetCertificateDirReg_os.vcxproj.user        |    3 -
 .../SetCertificateDirReg/dialog.bmp             |  Bin 99008 -> 0 bytes
 .../SetCertificateDirReg/odbccp32.props         |   18 -
 .../SetCertificateDirReg/resource.h             |   40 -
 .../SetCertificateDirReg/stdafx.cpp             |   28 -
 .../SetCertificateDirReg/stdafx.h               |   68 -
 .../SetCertificateDirReg_os.sln                 |   26 -
 .../Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp   |  200 -
 .../UpdateDSN/UpdateDSN/UpdateDSN.vcxproj       |  170 -
 .../UpdateDSN/UpdateDSN.vcxproj.filters         |   33 -
 .../UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj    |  104 -
 .../UpdateDSN/UpdateDSN_os.vcxproj.filters      |   33 -
 .../UpdateDSN/UpdateDSN_os.vcxproj.user         |    3 -
 .../Install/UpdateDSN/UpdateDSN/stdafx.cpp      |   28 -
 win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h |   37 -
 win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln   |   26 -
 .../Install/win64_installer/installer.iss       |  181 +
 .../win64_installer/win64_installer_os.ism      | 6029 ------------------
 win-odbc64/odbcclient/Drvr35Res/Drvr35Res.rc    |    6 +-
 .../odbcclient/Drvr35Res/Drvr35Res_os.vcxproj   |    4 +-
 .../odbcclient/Drvr35Res/res/Drvr35Res.rc2      |   26 +-
 win-odbc64/odbcclient/README.txt                |  108 +-
 .../odbcclient/TranslationDll/TranslationDll.rc |    6 +-
 .../TranslationDll/TranslationDll_os.vcxproj    |    4 +-
 win-odbc64/odbcclient/build_os.bat              |  325 +-
 win-odbc64/odbcclient/drvr35/TCPIPV4/TCPIPV4.RC |    6 +-
 .../drvr35/TCPIPV4/TCPIPV4_os.vcxproj           |    8 +-
 win-odbc64/odbcclient/drvr35/TCPIPV6/TCPIPV6.RC |    6 +-
 .../drvr35/TCPIPV6/TCPIPV6_os.vcxproj           |    8 +-
 win-odbc64/odbcclient/drvr35/drvr35.rc          |    6 +-
 win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj  |   16 +-
 .../odbcclient/drvr35adm/Drvr35Adm_os.vcxproj   |    5 +-
 win-odbc64/odbcclient/drvr35adm/drvr35adm.rc    |    6 +-
 win-odbc64/odbcclient/drvr35adm/pagenetwork.cpp |    2 +-
 .../odbcclient/drvr35adm/tabpagenetwork.cpp     |    2 +-
 win-odbc64/odbcclient/drvr35msg/DrvMsg35.rc     |    6 +-
 .../odbcclient/drvr35msg/Drvr35Msg_os.vcxproj   |    4 +-
 win-odbc64/odbcclient/odbcclient_os.sln         |   31 +-
 win-odbc64/odbcclient/pkg.bat                   |   38 -
 46 files changed, 446 insertions(+), 7853 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
deleted file mode 100644
index 6891b86..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// SetCertDirDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "SetCertificateDirReg.h"
-#include "SetCertDirDlg.h"
-#include <odbcinst.h>
-#include <ShlObj.h>
-
-
-#define ODBC_SET_CERTIFICATE_DIR ODBC_CONFIG_DRIVER_MAX+1
-
-CString ErrorString(DWORD err)
-{
-     CString Error;
-     LPTSTR s;
-     if(::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-            FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL,
-            err,
-            0,
-            (LPTSTR)&s,
-            0,
-            NULL) == 0)
-    {
-		Error = "Unknown error code";
-    }
-    else
-    {
-		LPTSTR p = _tcschr(s, _T('\r'));
-		if(p != NULL)
-		{ /* lose CRLF */
-			*p = _T('\0');
-		} /* lose CRLF */
-		Error = s;
-		::LocalFree(s);
-    }
-    return Error;
-
-} // ErrorString()
-
-// SetCertDirDlg dialog
-
-IMPLEMENT_DYNAMIC(SetCertDirDlg, CDialog)
-
-SetCertDirDlg::SetCertDirDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(SetCertDirDlg::IDD, pParent)
-{
-
-}
-
-SetCertDirDlg::~SetCertDirDlg()
-{
-}
-
-void SetCertDirDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	DDX_Control(pDX, IDC_EDIT1, m_CertificatePath);
-	m_CertificatePath.SetWindowText("SYSTEM_DEFAULT");
-}
-
-
-BEGIN_MESSAGE_MAP(SetCertDirDlg, CDialog)
-	ON_BN_CLICKED(IDC_BUTTON1, &SetCertDirDlg::OnBnClickedButton1)
-	ON_BN_CLICKED(IDOK, &SetCertDirDlg::OnBnClickedOk)
-	ON_EN_CHANGE(IDC_EDIT1, &SetCertDirDlg::OnEnChangeEdit1)
-END_MESSAGE_MAP()
-
-
-// SetCertDirDlg message handlers
-
-void SetCertDirDlg::OnBnClickedButton1()
-{
-	LPMALLOC pMalloc;
-    
-    if( SUCCEEDED( SHGetMalloc( &pMalloc ) ) ) 
-    {
-        TCHAR szTitle[] = _T("Choose Directory for storing certificates.");
-        BROWSEINFO bi;
-        ZeroMemory( &bi, sizeof( bi ) );
-        bi.hwndOwner = NULL;
-        bi.pszDisplayName = NULL;
-        bi.lpszTitle = szTitle;
-        bi.pidlRoot = NULL;
-		bi.ulFlags = BIF_RETURNONLYFSDIRS;
-        
-        LPITEMIDLIST pidl = SHBrowseForFolder( &bi );
-        if( pidl ) 
-        {
-            TCHAR szDir[MAX_PATH];
-            if( SHGetPathFromIDList( pidl, szDir ) ) 
-            {
-				m_CertificatePath.SetWindowText(szDir);
-				m_CertificatePath.SetFocus();
-            }
-            pMalloc->Free(pidl); 
-            pMalloc->Release();
-        }
-    }
-}
-
-void SetCertDirDlg::OnBnClickedOk()
-{
-	const char DriverName[]= "TRAF ODBC 1.0";
-	CString szCertificateDir;
-	TCHAR szCertificateDirRegEntry[_MAX_PATH];
-	CHAR  szConfigMsg[_MAX_PATH] = "";
-	WORD  cbPathOut;
-
-	m_CertificatePath.GetWindowText(szCertificateDir);
-
-	sprintf_s(szCertificateDirRegEntry,"CertificateDir=%s\0",szCertificateDir);
-	SQLConfigDriver( NULL, ODBC_CONFIG_DRIVER, DriverName,
-						 szCertificateDirRegEntry,szConfigMsg,
-						 sizeof(szConfigMsg), &cbPathOut );
-	/*
-	if(!SQLConfigDriver( NULL, ODBC_CONFIG_DRIVER, DriverName,
-						 szCertificateDirRegEntry,szConfigMsg,
-						 sizeof(szConfigMsg), &cbPathOut ))
-	{
-		CString szErrorMessage;
-		DWORD dwErrorCode;
-		WORD wRetSize;
-		LPSTR pszMessage=szErrorMessage.GetBuffer(SQL_MAX_MESSAGE_LENGTH-4);
-		SQLInstallerError(1,&dwErrorCode,pszMessage,SQL_MAX_MESSAGE_LENGTH-8,&wRetSize);
-		szErrorMessage.ReleaseBuffer();
-		szErrorMessage+="\nDriver Diags:";
-		szErrorMessage+=szConfigMsg;
-		MessageBox(szErrorMessage,"SQLConfigDriver Failed",MB_ICONERROR|MB_OK);
-	}
-	*/
-	OnOK();
-}
-
-
-void SetCertDirDlg::OnEnChangeEdit1()
-{
-	// TODO:  If this is a RICHEDIT control, the control will not
-	// send this notification unless you override the CDialog::OnInitDialog()
-	// function and call CRichEditCtrl().SetEventMask()
-	// with the ENM_CHANGE flag ORed into the mask.
-
-	// TODO:  Add your control notification handler code here
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
deleted file mode 100644
index 1142152..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertDirDlg.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-#pragma once
-#include "afxwin.h"
-
-
-// SetCertDirDlg dialog
-
-class SetCertDirDlg : public CDialog
-{
-	DECLARE_DYNAMIC(SetCertDirDlg)
-
-public:
-	SetCertDirDlg(CWnd* pParent = NULL);   // standard constructor
-	virtual ~SetCertDirDlg();
-
-// Dialog Data
-	enum { IDD = IDD_SET_CERT_DIALOG };
-
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-
-	DECLARE_MESSAGE_MAP()
-public:
-	CEdit m_CertificatePath;
-	afx_msg void OnBnClickedButton1();
-	afx_msg void OnBnClickedOk();
-	afx_msg void OnEnChangeEdit1();
-};

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
deleted file mode 100644
index 3d82c0b..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// SetCertificateDirReg.cpp : Defines the entry point for the console application.
-//
-
-#include "stdafx.h"
-#include "SetCertificateDirReg.h"
-#include "SetCertDirDlg.h" // Dialog box to choose the certificate directory location
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-
-// The one and only application object
-
-CWinApp theApp;
-
-using namespace std;
-
-int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
-{
-	int nRetCode = 0;
-
-	// initialize MFC and print and error on failure
-	if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
-	{
-		// TODO: change error code to suit your needs
-		_tprintf(_T("Fatal Error: MFC initialization failed\n"));
-		nRetCode = 1;
-	}
-	else
-	{
-		// TODO: code your application's behavior here.
-		SetCertDirDlg dlg;
-		dlg.DoModal();
-	}
-
-	return nRetCode;
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
deleted file mode 100644
index 5db1c52..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-#pragma once
-
-#include "resource.h"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
deleted file mode 100644
index 0bd739b..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg.rc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_SET_CERT_DIALOG DIALOGEX 0, 0, 276, 135
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "TRAF ODBC Setup - Certificate Directory"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,206,109,50,14
-    LTEXT           "Select a folder for storing certificates and press OK",IDC_STATIC,92,34,164,8
-    EDITTEXT        IDC_EDIT1,48,66,208,14,ES_AUTOHSCROLL | ES_READONLY
-    PUSHBUTTON      "Browse",IDC_BUTTON1,206,86,50,14
-    LTEXT           "or just press OK to use the system default",IDC_STATIC,120,48,136,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_SET_CERT_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 16
-        RIGHTMARGIN, 256
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 123
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_APP_TITLE           "SetCertificateDirReg"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
deleted file mode 100644
index 8d2689e..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|Win32">
-      <Configuration>Template</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|x64">
-      <Configuration>Template</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{11B34636-6E3D-40ED-BA02-FD50B258D18D}</ProjectGuid>
-    <RootNamespace>SetCertificateDirReg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <UseOfMfc>Dynamic</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="odbccp32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="odbccp32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="odbccp32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="odbccp32.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="odbccp32.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Import Project="odbccp32.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;$(Odbccp32lib64Dir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\..\lib\x64\Debug/SetCertificateDirReg.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\lib\release/$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;$(Odbccp32lib64Dir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\..\..\..\lib\x64\Release/SetCertificateDirReg.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Link>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;$(Odbccp32libDir)\odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="SetCertDirDlg.cpp" />
-    <ClCompile Include="SetCertificateDirReg.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Resource.h" />
-    <ClInclude Include="SetCertDirDlg.h" />
-    <ClInclude Include="SetCertificateDirReg.h" />
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="dialog.bmp" />
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SetCertificateDirReg.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="SetCertificateDirReg.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
deleted file mode 100644
index c78dba2..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.filters
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="SetCertDirDlg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SetCertificateDirReg.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SetCertDirDlg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SetCertificateDirReg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="dialog.bmp">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="SetCertificateDirReg.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/SetCertificateDirReg_os.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp
deleted file mode 100644
index 6087e3d..0000000
Binary files a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/dialog.bmp and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
deleted file mode 100644
index 2093760..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/odbccp32.props
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <Odbccp32libDir>.\</Odbccp32libDir>
-    <Odbccp32lib64Dir>.\amd64</Odbccp32lib64Dir>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="Odbccp32libDir">
-      <Value>$(Odbccp32libDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="Odbccp32lib64Dir">
-      <Value>$(Odbccp32lib64Dir)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
deleted file mode 100644
index b6c6bf6..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/resource.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by SetCertificateDirReg.rc
-//
-#define IDD_SET_CERT_DIALOG             101
-#define IDS_APP_TITLE                   103
-#define IDC_EDIT1                       1000
-#define IDC_BUTTON1                     1001
-#define IDC_SCROLLBAR1                  1002
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        104
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1003
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
deleted file mode 100644
index 350f87e..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// stdafx.cpp : source file that includes just the standard includes
-// SetCertificateDirReg.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
deleted file mode 100644
index df9fc5f..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg/stdafx.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif						
-
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
-#endif
-
-#include <stdio.h>
-#include <tchar.h>
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-#endif
-
-#include <afx.h>
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#ifndef _AFX_NO_OLE_SUPPORT
-#include <afxdtctl.h>		// MFC support for Internet Explorer 4 Common Controls
-#endif
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include <iostream>
-
-
-
-// TODO: reference additional headers your program requires here

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln b/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
deleted file mode 100644
index 25ea788..0000000
--- a/win-odbc64/Install/SetCertificateDirReg/SetCertificateDirReg_os.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SetCertificateDirReg", "SetCertificateDirReg\SetCertificateDirReg.vcxproj", "{11B34636-6E3D-40ED-BA02-FD50B258D18D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|Win32.Build.0 = Debug|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.ActiveCfg = Debug|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Debug|x64.Build.0 = Debug|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.ActiveCfg = Release|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|Win32.Build.0 = Release|Win32
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.ActiveCfg = Release|x64
-		{11B34636-6E3D-40ED-BA02-FD50B258D18D}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
deleted file mode 100644
index fd3cf94..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// UpdateDSN.cpp : Defines the entry point for the console application.
-//
-
-#include "stdafx.h"
-#include <windows.h>
-#include <sql.h>
-#include <sqlext.h>
-#include <odbcinst.h>
-#include <stdio.h>
-#include <string.h>
-#include <tchar.h>
-#include <shellapi.h>
-#include <string>
-
-bool DeleteThisFile(LPCTSTR lpszDir, bool noRecycleBin = true)
-{
-  int len = _tcslen(lpszDir);
-  TCHAR *pszFrom = new TCHAR[len+2];
-  _tcscpy(pszFrom, lpszDir);
-  pszFrom[len] = 0;
-  pszFrom[len+1] = 0;
-  
-  SHFILEOPSTRUCT fileop;
-  fileop.hwnd   = NULL;    // no status display
-  fileop.wFunc  = FO_DELETE;  // delete operation
-  fileop.pFrom  = pszFrom;  // source file name as double null terminated string
-  fileop.pTo    = NULL;    // no destination needed
-  fileop.fFlags = FOF_NOCONFIRMATION|FOF_SILENT;  // do not prompt the user
-  
-  if(!noRecycleBin)
-    fileop.fFlags |= FOF_ALLOWUNDO;
-
-  fileop.fAnyOperationsAborted = FALSE;
-  fileop.lpszProgressTitle     = NULL;
-  fileop.hNameMappings         = NULL;
-
-  int ret = SHFileOperation(&fileop);
-  delete [] pszFrom;  
-  return (ret == 0);
-}
-
-
-void CleanUp()
-{
-   DWORD ulOptions = 0;
-   PHKEY phkResult;
-   LONG  retVal;
-   HKEY hKey;
-
-#ifdef WIN64
-   REGSAM samDesired = KEY_WOW64_32KEY | KEY_SET_VALUE;
-#else
-   REGSAM samDesired = KEY_WOW64_64KEY | KEY_SET_VALUE;
-#endif
-
-	TCHAR buffer[2048];
-	std::string sysroot = getenv("SYSTEMROOT");
-	std::string hpodbcdll   = sysroot + "\\system32\\trfodbc1.dll";
-//	std::string OdbcTrace   = sysroot + "\\system32\\traf_OdbcTrace0100.dll";
-	std::string tcpipv6     = sysroot + "\\system32\\traf_tcpipv60100.dll";
-	std::string odbcDrvMsg  = sysroot + "\\system32\\traf_odbcDrvMsg_intl0100.dll";
-	std::string translation = sysroot + "\\system32\\traf_translation01.dll";
-	std::string hpoadm02    = sysroot + "\\system32\\trfoadm1.dll";
-	std::string ores        = sysroot + "\\system32\\traf_ores0100.dll";
-    mbstowcs(buffer,hpodbcdll.c_str(), sizeof(buffer));
-	DeleteThisFile((LPCTSTR)buffer, false);
-    mbstowcs(buffer,tcpipv6.c_str(), sizeof(buffer));
-	DeleteThisFile((LPCTSTR)buffer, false);
-
-    mbstowcs(buffer,odbcDrvMsg.c_str(), sizeof(buffer));
-	DeleteThisFile((LPCTSTR)buffer, false);
-
-    mbstowcs(buffer,translation.c_str(), sizeof(buffer));
-	DeleteThisFile((LPCTSTR)buffer, false);
-
-    mbstowcs(buffer,hpoadm02.c_str(), sizeof(buffer));
-	DeleteThisFile((LPCTSTR)buffer, false);
-
-    mbstowcs(buffer,ores.c_str(), sizeof(buffer));
-	DeleteThisFile((LPCTSTR)buffer, false);
-
-	retVal = RegOpenKeyEx(
-				HKEY_LOCAL_MACHINE,
-				(LPCWSTR)L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\SharedDlls",
-				ulOptions,
-				KEY_SET_VALUE,
-				&hKey);
-	retVal = RegDeleteValue(
-				hKey,
-				(LPCWSTR)L"C:\\WINDOWS\\system32\\trfodbc1.dll");
-
-//	retVal = RegDeleteValue(
-//				hKey,
-//				(LPCWSTR)L"C:\\WINDOWS\\system32\\traf_OdbcTrace0100.dll");
-
-	retVal = RegDeleteValue(
-				hKey,
-				(LPCWSTR)L"C:\\WINDOWS\\system32\\traf_tcpipv60100.dll");
-
-	retVal = RegDeleteValue(
-				hKey,
-				(LPCWSTR)L"C:\\WINDOWS\\system32\\traf_odbcDrvMsg_intl0100.dll");
-
-	retVal = RegDeleteValue(
-				hKey,
-				(LPCWSTR)L"C:\\WINDOWS\\system32\\traf_translation01.dll");
-
-	retVal = RegDeleteValue(
-				hKey,
-				(LPCWSTR)L"C:\\WINDOWS\\system32\\trfoadm1.dll");
-
-	retVal = RegDeleteValue(
-				hKey,
-				(LPCWSTR)L"C:\\WINDOWS\\system32\\traf_ores0100.dll");
-}
-
-int _tmain(int argc, _TCHAR* argv[])
-{
-
-	UWORD Mode,oldMode;
-	SQLHANDLE m_henv;
-	SQLUSMALLINT direction;
-	SQLRETURN retVal = SQL_SUCCESS;
-	SQLWCHAR DSNName[SQL_MAX_DSN_LENGTH + 1];
-	SQLWCHAR Description[100];
-	SQLSMALLINT nameLen, descLen;
-	TCHAR NewDriver[1024];
-
-	if(argc > 1 && strcmp((const char*)argv[1],"-cleanup"))
-	{
-		CleanUp();
-		return 0;
-	}
-
-	// The rest of the code was to deal with the file name change from hpodbc_0200.dll to hpodbc02.dll that was
-	// required for the move to MSI installer. (Installshield did not like file names > 8 letters)
-	// For seaquest, since we're starting off with an 8 character driver name, we won't need this, atleast for now
-
-//	SQLGetConfigMode(&oldMode);
-
-//	GetSystemDirectory(NewDriver,sizeof(NewDriver));
-
-//	if(argc > 1 && strcmp((const char*)argv[1],"-revert"))
-//		wcscat_s(NewDriver,L"\\hp_odbc0200.dll");
-//	else
-//		wcscat_s(NewDriver,L"\\hpodbc02.dll");
-
-//	Mode = ODBC_BOTH_DSN;
-//	direction = SQL_FETCH_NEXT;
-
-//	SQLSetConfigMode(Mode);
-
-//	retVal = SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &m_henv);
-//	retVal = SQLSetEnvAttr(m_henv, SQL_ATTR_ODBC_VERSION,(SQLPOINTER)SQL_OV_ODBC3, 0);
-	
-
-	//
-	// Loop through all of the HP ODBC 2.0 DataSources, modifying the Driver= entry
-	//
-
-//	retVal = SQLDataSources(m_henv, direction, DSNName,	sizeof(DSNName),
-//							&nameLen, Description, sizeof(Description),
-//							&descLen);
-
-//	while (retVal == SQL_SUCCESS || retVal == SQL_SUCCESS_WITH_INFO)
-//	{
-//		if (wcscmp(L"HP ODBC 2.0", Description) == 0)
-//			SQLWritePrivateProfileString((LPCWSTR)DSNName,L"Driver",NewDriver,L"ODBC.INI");
-
-//		retVal = SQLDataSources(m_henv, SQL_FETCH_NEXT, DSNName,
-//								sizeof(DSNName), &nameLen,
-//								Description, sizeof(Description), &descLen);
-//	}
-
-
-//	SQLSetConfigMode(oldMode);
-
-	return 0;
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj
deleted file mode 100644
index 9c66fc9..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{49D6B472-F361-4E6A-B060-D368855FB359}</ProjectGuid>
-    <RootNamespace>UpdateDSN</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\lib\debug/$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\lib\x64\Debug/$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\lib\release/$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\..\lib\x64\Release/$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="UpdateDSN.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters
deleted file mode 100644
index 522e178..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UpdateDSN.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj
deleted file mode 100644
index 19c5f85..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{49D6B472-F361-4E6A-B060-D368855FB359}</ProjectGuid>
-    <RootNamespace>UpdateDSN</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\lib\x64\Debug/UpdateDSN.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>..\..\..\..\lib\x64\Release/UpdateDSN.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="UpdateDSN.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters
deleted file mode 100644
index 522e178..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UpdateDSN.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user b/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/UpdateDSN_os.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
deleted file mode 100644
index 6b21c3b..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// stdafx.cpp : source file that includes just the standard includes
-// UpdateDSN.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h b/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
deleted file mode 100644
index 56596fa..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN/stdafx.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif						
-
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln
----------------------------------------------------------------------
diff --git a/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln b/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln
deleted file mode 100644
index 36cdd0c..0000000
--- a/win-odbc64/Install/UpdateDSN/UpdateDSN_os.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdateDSN", "UpdateDSN\UpdateDSN.vcxproj", "{49D6B472-F361-4E6A-B060-D368855FB359}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|Win32.ActiveCfg = Debug|Win32
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|Win32.Build.0 = Debug|Win32
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|x64.ActiveCfg = Debug|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Debug|x64.Build.0 = Debug|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|Win32.ActiveCfg = Release|Win32
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|Win32.Build.0 = Release|Win32
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|x64.ActiveCfg = Release|x64
-		{49D6B472-F361-4E6A-B060-D368855FB359}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f9bc12d9/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
new file mode 100644
index 0000000..17c2a2f
--- /dev/null
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -0,0 +1,181 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "Trafodion ODBC64 1.2"
+#define MyAppVersion "1.2.0"
+#define MyAppPublisher "Apache Trafodion"
+#define MyAppURL ""
+#define MyDriverName "TRAF ODBC 1.0"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{5E6042F8-7C2F-490A-899F-9552D5DE8DE2}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultGroupName={#MyAppName}
+DefaultDirName={pf}\Trafodion\TRAF ODBC 1.0
+OutputBaseFilename=TFODBC64-{#MyAppVersion}
+Compression=lzma
+SolidCompression=yes
+DisableProgramGroupPage=yes
+ArchitecturesInstallIn64BitMode=x64
+UninstallDisplayName={#MyAppName}
+ArchitecturesAllowed=x64
+SetupLogging=yes
+
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "C:\Build\winodbc64\inc\trafsqlext.h"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\Build\winodbc64\lib\x64\Release\traf_odbcDrvMsg_intl0100.dll"; DestDir: "{sys}"
+Source: "C:\Build\winodbc64\lib\x64\Release\traf_ores0100.dll"; DestDir: "{sys}"
+Source: "C:\Build\winodbc64\lib\x64\Release\traf_tcpipv40100.dll"; DestDir: "{sys}"
+Source: "C:\Build\winodbc64\lib\x64\Release\traf_tcpipv60100.dll"; DestDir: "{sys}"
+Source: "C:\Build\winodbc64\lib\x64\Release\traf_translation01.dll"; DestDir: "{sys}"
+Source: "C:\Build\winodbc64\lib\x64\Release\trfoadm1.dll"; DestDir: "{sys}"
+Source: "C:\Build\winodbc64\lib\x64\Release\trfodbc1.dll"; DestDir: "{sys}"
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\MS ODBC Administrator"; Filename: "{sys}\odbcad32.exe";  WorkingDir: "{sys}"
+Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
+
+[Registry]
+Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\ODBC Drivers; ValueType: string; ValueName: {#MyDriverName}; ValueData: Installed ;Flags: uninsdeletekey
+Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: dword; ValueName: UsageCount; ValueData: $00000001 ;Flags: uninsdeletekey
+Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: Driver; ValueData: {sys}\trfodbc1.dll ;Flags: uninsdeletekey
+Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: Setup; ValueData: {sys}\trfoadm1.dll ;Flags: uninsdeletekey
+Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: CertificateDir; ValueData: SYSTEM_DEFAULT ;Flags: uninsdeletekey
+Root: HKLM; SubKey: Software\ODBC\ODBCINST.INI\{#MyDriverName}; ValueType: string; ValueName: CPTimeout; ValueData: 60 ;Flags: uninsdeletekey
+
+[Code]
+[Files]
+Source: "C:\Build\winodbc64\redist\vcredist_x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall
+
+[Run]
+; add the Parameters, WorkingDir and StatusMsg as you wish, just keep here
+; the conditional installation Check
+Filename: "{tmp}\vcredist_x64.exe"; Check: VCRedistNeedsInstall
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{app}"
+
+[Code]
+#IFDEF UNICODE
+  #DEFINE AW "W"
+#ELSE
+  #DEFINE AW "A"
+#ENDIF
+type
+  INSTALLSTATE = Longint;
+const
+  INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
+  INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
+  INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
+  INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
+  INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
+
+  VC_2013_REDIST_X64_MIN = '{A749D8E6-B613-3BE3-8F5F-045C84EBA29B}';
+  VC_2013_REDIST_X64_ADD = '{929FBD26-9020-399B-9A7A-751D61F0B942}';
+
+function MsiQueryProductState(szProduct: string): INSTALLSTATE;
+  external 'MsiQueryProductState{#AW}@msi.dll stdcall';
+
+function VCVersionInstalled(const ProductID: string): Boolean;
+begin
+  Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
+end;
+
+function VCRedistNeedsInstall: Boolean;
+begin
+  // here the Result must be True when you need to install your VCRedist
+  // or False when you don't need to, so now it's upon you how you build
+  // this statement, the following won't install your VC redist only when
+  // the Visual C++ 2010 Redist (x64) and Visual C++ 2010 SP1 Redist(x64)
+  // are installed for the current user
+  Result := not (VCVersionInstalled(VC_2013_REDIST_X64_MIN) or
+    VCVersionInstalled(VC_2013_REDIST_X64_ADD));
+end;
+
+function GetUninstallString(): string;
+var
+  sUnInstPath: string;
+  sUnInstPath_is1: string;
+  sUnInstallString: String;
+  sAppId: String;
+  sAppId_is1: String;
+begin
+  Result := '';
+  sAppId := ExpandConstant('{#emit SetupSetting("AppId")}');
+  sAppId_is1 := ExpandConstant('{#emit SetupSetting("AppId")}_is1');
+  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\') + sAppId;
+  sUnInstPath_is1 := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\') + sAppId_is1;
+
+  sUnInstallString := '';
+  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
+    if not RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString) then
+      if not RegQueryStringValue(HKLM, sUnInstPath_is1, 'UninstallString', sUnInstallString) then
+        RegQueryStringValue(HKCU, sUnInstPath_is1, 'UninstallString', sUnInstallString);
+  Result := sUnInstallString;
+end;
+
+function IsUpgrade: Boolean;
+begin
+  Result := (GetUninstallString() <> '');
+end;
+
+function InitializeSetup: Boolean;
+var
+  V: Integer;
+  iResultCode: Integer;
+  sUnInstallString: string;
+  sAppId: String;
+  sAppId_is1: String;
+  sAppName: String;
+begin
+  Result := True; // in case when no previous version is found
+  sAppId := ExpandConstant('{#emit SetupSetting("AppId")}');
+  sAppId_is1 := ExpandConstant('{#emit SetupSetting("AppId")}_is1');
+  sAppName := ExpandConstant('{#emit SetupSetting("AppName")}');
+  sUnInstallString := GetUninstallString();
+  if (sUnInstallString <> '') then  //Your App GUID/ID
+  begin
+    V := MsgBox(ExpandConstant('An existing install of '+ sAppName + ' was detected.' + #13#10#13#10 +'The installer will now uninstall the old version and install the new version.' + #13#10#13#10 +'Do you want to continue?'), mbInformation, MB_YESNO); //Custom Message if App installed
+    if V = IDYES then
+    begin
+      sUnInstallString :=  RemoveQuotes(sUnInstallString);
+      if (Pos('msiexec',Lowercase(sUnInstallString)) <> 0) then
+      begin
+        if not Exec('msiexec.exe', '/X'+sAppId+' /qn', '', SW_SHOW, ewWaitUntilTerminated, iResultCode) then
+        begin
+        MsgBox('Failed to uninstall existing files.' + #13#10 + ' ' + SysErrorMessage(iResultCode), mbError, MB_OK);
+        Result := False;
+        end
+      end
+      else
+      begin
+        if not Exec(sUnInstallString, '/SILENT', '', SW_SHOW, ewWaitUntilTerminated, iResultCode) then
+        begin
+        MsgBox('Failed to uninstall existing files.' + #13#10 + ' ' + SysErrorMessage(iResultCode), mbError, MB_OK);
+        Result := False;
+        end
+        else
+
+        Result := True; //if you want to proceed after uninstall
+                  //Exit; //if you want to quit after uninstall
+     end
+     end
+    else
+      Result := False; //when older version present and not uninstalled
+  end;
+
+end;


[6/8] incubator-trafodion git commit: Update the windowsODBC package name to 1.3.0

Posted by rm...@apache.org.
Update the windowsODBC package name to 1.3.0

Chaged the windows ODBC package name from TFODBC64-1.2.0.exe to
TFODBC64-1.3.0.exe


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

Branch: refs/heads/master
Commit: f1446cdabe777392bf3746eaa698735a749806cd
Parents: a65530a
Author: Weiqing Xu <we...@esgyn.cn>
Authored: Mon Oct 26 10:48:27 2015 +0800
Committer: Weiqing Xu <we...@esgyn.cn>
Committed: Mon Oct 26 10:48:27 2015 +0800

----------------------------------------------------------------------
 win-odbc64/Install/win64_installer/installer.iss | 4 ++--
 win-odbc64/odbcclient/build_os.bat               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f1446cda/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 76d2e32..b9766d1 100644
--- a/win-odbc64/Install/win64_installer/installer.iss
+++ b/win-odbc64/Install/win64_installer/installer.iss
@@ -1,8 +1,8 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppName "Trafodion ODBC64 1.2"
-#define MyAppVersion "1.2.0"
+#define MyAppName "Trafodion ODBC64 1.3"
+#define MyAppVersion "1.3.0"
 #define MyAppPublisher "Apache Trafodion"
 #define MyAppURL ""
 #define MyDriverName "TRAF ODBC 1.0"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f1446cda/win-odbc64/odbcclient/build_os.bat
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/build_os.bat b/win-odbc64/odbcclient/build_os.bat
index cb3b62d..eccb5c7 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.2.0.exe %PACKDIR%
+copy /Y %BUILDDIR%\win-odbc64\Install\win64_installer\Output\TFODBC64-1.3.0.exe %PACKDIR%
 @echo on
 
-if exist %PACKDIR%\TFODBC64-1.2.0.exe (
+if exist %PACKDIR%\TFODBC64-1.3.0.exe (
 	set ALL_SUCCESS=1
 )
 cd %BUILDDIR%\win-odbc64\odbcclient