[APIS-1007] 11.4 드라이버 호환성 테스트 - ODBC (#3) (#76)

http://jira.cubrid.org/browse/APIS-1007 * [APIS-1007] 11.4 드라이버 호환 테스트 - ODBC (#3) - Windows SDK 버전 수정 * [APIS-1007] build 스크립트, 버전 수정 - 드라이버 버전을 11.3.1.0062로 수정 - 빌드 스크립트에서 vs2017, nsis 환경 변수를 확인하도록 설정
CUBRID · Dec 27, 2024 · e9bbfdf · e9bbfdf
1 parent f19ae18
commit e9bbfdf
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 27 deletions.
diff --git a/build_2017.bat b/build_2017.bat
@@ -1,8 +1,13 @@
+@echo off
+
 set WORKSPACE=%~dp0
 set INSTALL_DIRS=output
-echo %INSTALL_DIRS%
 
-:VS2017COMNTOOLS PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\
+if "%VS2017COMNTOOLS%x" == "x" (
+ echo "Please add 'VS2017COMNTOOLS' in the environment variable\n ex) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools"
+ GOTO :EOF
+)
+
 call "%VS2017COMNTOOLS%VsDevCmd.bat"
 mkdir %INSTALL_DIRS%
 
@@ -20,7 +25,9 @@ copy installer\installer.nsi %INSTALL_DIRS%\installer.nsi
 copy installer\license.txt %INSTALL_DIRS%\license.txt
 copy installer\README.txt %INSTALL_DIRS%\README.txt
 
-c:
-cd C:\NSIS
+makensis %WORKSPACE%\%INSTALL_DIRS%\installer.nsi
 
-makensis %WORKSPACE%\%INSTALL_DIRS%\installer.nsi
+if %ERRORLEVEL% NEQ 0 (
+  echo "Error: cannot find NSIS. Are system environment variables set?"
+  GOTO :EOF
+)
diff --git a/build_unicode_2017.bat b/build_unicode_2017.bat
@@ -1,8 +1,14 @@
+@echo off
+
 set WORKSPACE=%~dp0
 set INSTALL_DIRS=output_unicode
 echo %INSTALL_DIRS%
 
-:VS2017COMNTOOLS PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\
+if "%VS2017COMNTOOLS%x" == "x" (
+ echo "Please add 'VS2017COMNTOOLS' in the environment variable\n ex) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools"
+ GOTO :EOF
+)
+
 call "%VS2017COMNTOOLS%VsDevCmd.bat"
 mkdir %INSTALL_DIRS%
 
@@ -15,7 +21,9 @@ copy installer\installer-unicode.nsi %INSTALL_DIRS%\installer-unicode.nsi
 copy installer\license.txt %INSTALL_DIRS%\license.txt
 copy installer\README.txt %INSTALL_DIRS%\README.txt
 
-c:
-cd C:\NSIS
-
 makensis %WORKSPACE%\%INSTALL_DIRS%\installer-unicode.nsi
+
+if %ERRORLEVEL% NEQ 0 (
+  echo "error: cannot find NSIS. Are system environment variables set?"
+  GOTO :EOF
+)
diff --git a/cubrid_odbc_14.vcxproj b/cubrid_odbc_14.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>cubrid_odbc</ProjectName>
     <ProjectGuid>{37E00A2E-BBC5-4736-90D9-A1B4271759BB}</ProjectGuid>
     <RootNamespace>cubrid_odbc</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -171,6 +172,7 @@
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <ShowProgress>NotSet</ShowProgress>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -253,7 +255,7 @@
     <Link>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;cas_cci_d_14.lib;libssl.lib;libcrypto.lib;Crypt32.lib;Ws2_32.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
-      <AdditionalLibraryDirectories>$(ProjectDir)\cci\lib64;C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\VC\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ProjectDir)cci\lib64;C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\VC\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>cubrid_odbc.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
@@ -262,6 +264,7 @@
       <AdditionalOptions>
       </AdditionalOptions>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ShowProgress>NotSet</ShowProgress>
     </Link>
     <ProjectReference>
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

diff --git a/cubrid_odbc_unicode_14.vcxproj b/cubrid_odbc_unicode_14.vcxproj
@@ -22,6 +22,7 @@
     <ProjectName>cubrid_odbc_unicode</ProjectName>
     <ProjectGuid>{0092BD82-BCE8-4E10-A9DB-D083FC5C9D67}</ProjectGuid>
     <RootNamespace>cubrid_odbc</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

diff --git a/odbc_version.i b/odbc_version.i
@@ -1,5 +1,5 @@
 #define MAJOR_VERSION 11
 #define MINOR_VERSION 3
-#define PATCH_VERSION 0
-#define BUILD_SERIAL_NUMBER 0061
-#define VERSION_STRING "11.3.0.0061"
+#define PATCH_VERSION 1
+#define BUILD_SERIAL_NUMBER 0062
+#define VERSION_STRING "11.3.1.0062"
diff --git a/script/get_cci_driver.bat b/script/get_cci_driver.bat
@@ -26,20 +26,19 @@ if EXIST "%SCRIPT_DIR%\cubrid-cci" rmdir /s /q cubrid-cci
 
 git clone git@github.com:CUBRID/cubrid-cci.git
 
-if "%VS140COMNTOOLS%x" == "x" echo "Please add 'VS140COMNTOOLS' in the environment variable\n ex) C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools"
-if "%VS110COMNTOOLS%x" == "x" echo "Please add 'VS110COMNTOOLS' in the environment variable\n ex) C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\Tools"
+if "%VS2017COMNTOOLS%x" == "x" echo "Please add 'VS2017COMNTOOLS' in the environment variable\n ex) C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools"
 
 cd %CCI_WIN_DIR%
 
-call "%VS140COMNTOOLS%vsvars32.bat"
-devenv cas_cci_v140_lib.vcxproj /build "release|x86"
-if not "%ERRORLEVEL%" == "0" echo "Please check for 32bit V140 Relase Library." & GOTO END_SCRIPT
-devenv cas_cci_v140_lib.vcxproj /build "debug|x86"
-if not "%ERRORLEVEL%" == "0" echo "Please check for 32bit V140 Debug Library." & GOTO END_SCRIPT
-devenv cas_cci_v140_lib.vcxproj /build "release|x64"
-if not "%ERRORLEVEL%" == "0" echo "Please check for 64bit V140 Relase Library." & GOTO END_SCRIPT
-devenv cas_cci_v140_lib.vcxproj /build "debug|x64"
-if not "%ERRORLEVEL%" == "0" echo "Please check for 64bit V140 Debug Library." & GOTO END_SCRIPT
+call "%VS2017COMNTOOLS%VsDevCmd.bat"
+devenv cas_cci_v141_lib.vcxproj /build "release|x86"
+if not "%ERRORLEVEL%" == "0" echo "Please check for 32bit V141 Relase Library." & GOTO END_SCRIPT
+devenv cas_cci_v141_lib.vcxproj /build "debug|x86"
+if not "%ERRORLEVEL%" == "0" echo "Please check for 32bit V141 Debug Library." & GOTO END_SCRIPT
+devenv cas_cci_v141_lib.vcxproj /build "release|x64"
+if not "%ERRORLEVEL%" == "0" echo "Please check for 64bit V141 Relase Library." & GOTO END_SCRIPT
+devenv cas_cci_v141_lib.vcxproj /build "debug|x64"
+if not "%ERRORLEVEL%" == "0" echo "Please check for 64bit V141 Debug Library." & GOTO END_SCRIPT
 
 copy %CCI_WIN_DIR%\Win32\Release\cas_cci.lib  %INSTALL_DIRS%\lib32\cas_cci_14.lib
 copy %CCI_WIN_DIR%\Win32\Debug\cas_cci.lib  %INSTALL_DIRS%\lib32\cas_cci_d_14.lib

diff --git a/test.bat b/test.bat
@@ -1,5 +1,5 @@
-call "E:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools\vsvars32.bat"
+call "%VS2017COMNTOOLS%VsDevCmd.bat"
 cd UnitTest
-devenv UnitTest.sln /project UnitTest\UnitTest.csproj /rebuild "Release|x86" 
-cd UnitTest\bin\x86\Release
+devenv UnitTest.sln /project UnitTest\UnitTest.csproj /rebuild "Release|x64" 
+cd UnitTest\bin\x64\Release
 MSTest/testcontainer:UnitTest.dll