From d869f896b5e8af8f303f509a1ea1e7892da8eff2 Mon Sep 17 00:00:00 2001
From: KangBu Jeong <54855268+Kang-dot@users.noreply.github.com>
Date: Tue, 24 Dec 2024 15:41:19 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[APIS-1007]=2011.4=20=EB=93=9C=EB=9D=BC?=
=?UTF-8?q?=EC=9D=B4=EB=B2=84=20=ED=98=B8=ED=99=98=20=ED=85=8C=EC=8A=A4?=
=?UTF-8?q?=ED=8A=B8=20-=20ODBC=20(#3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* [APIS-1008] ODBC submodule(cci) 버전 업데이트
* [APIS-1008] ODBC 프로젝트 파일 수정
- ODBC에서 사용하는 windows sdk 버전 수정 (10.0.17763.0)
- build.bat 파일 수정
* [APIS-1008] cci 로드 스크립트 수정
- vs2017로 cci를 로드해서 빌드하던 스크립트를 기존 스크립트에 반영
* [APIS-1008] batch 파일 수정
- nsis 환경 변수를 사용하도록 수정
- release|x64를 테스트에 사용하도록 수정
* [APIS-1008] odbc 버전 변경
- 11.4.0.0062로 버전 변경
---
build_2017.bat | 4 ----
build_unicode_2017.bat | 4 ----
cubrid_odbc_14.vcxproj | 5 ++++-
cubrid_odbc_unicode_14.vcxproj | 1 +
odbc_version.i | 6 +++---
script/get_cci_driver.bat | 21 ++++++++++-----------
test.bat | 6 +++---
7 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/build_2017.bat b/build_2017.bat
index 9076e1b..48cae41 100755
--- a/build_2017.bat
+++ b/build_2017.bat
@@ -2,7 +2,6 @@ set WORKSPACE=%~dp0
set INSTALL_DIRS=output
echo %INSTALL_DIRS%
-:VS2017COMNTOOLS PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\
call "%VS2017COMNTOOLS%VsDevCmd.bat"
mkdir %INSTALL_DIRS%
@@ -20,7 +19,4 @@ 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
\ No newline at end of file
diff --git a/build_unicode_2017.bat b/build_unicode_2017.bat
index c199263..973fa7b 100755
--- a/build_unicode_2017.bat
+++ b/build_unicode_2017.bat
@@ -2,7 +2,6 @@ set WORKSPACE=%~dp0
set INSTALL_DIRS=output_unicode
echo %INSTALL_DIRS%
-:VS2017COMNTOOLS PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\
call "%VS2017COMNTOOLS%VsDevCmd.bat"
mkdir %INSTALL_DIRS%
@@ -15,7 +14,4 @@ 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
diff --git a/cubrid_odbc_14.vcxproj b/cubrid_odbc_14.vcxproj
index 2ce38c7..177f537 100644
--- a/cubrid_odbc_14.vcxproj
+++ b/cubrid_odbc_14.vcxproj
@@ -22,6 +22,7 @@
cubrid_odbc
{37E00A2E-BBC5-4736-90D9-A1B4271759BB}
cubrid_odbc
+ 10.0.17763.0
@@ -171,6 +172,7 @@
$(OutDir)$(ProjectName).pdb
Windows
MachineX64
+ NotSet
@@ -253,7 +255,7 @@
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)
$(OutDir)$(ProjectName).dll
- $(ProjectDir)\cci\lib64;C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\VC\lib\amd64;%(AdditionalLibraryDirectories)
+ $(ProjectDir)cci\lib64;C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\VC\lib\amd64;%(AdditionalLibraryDirectories)
cubrid_odbc.def
true
$(OutDir)$(ProjectName).pdb
@@ -262,6 +264,7 @@
false
+ NotSet
false
diff --git a/cubrid_odbc_unicode_14.vcxproj b/cubrid_odbc_unicode_14.vcxproj
index 7fd8ff5..ce434b6 100644
--- a/cubrid_odbc_unicode_14.vcxproj
+++ b/cubrid_odbc_unicode_14.vcxproj
@@ -22,6 +22,7 @@
cubrid_odbc_unicode
{0092BD82-BCE8-4E10-A9DB-D083FC5C9D67}
cubrid_odbc
+ 10.0.17763.0
diff --git a/odbc_version.i b/odbc_version.i
index 07227ad..10a7a5e 100644
--- a/odbc_version.i
+++ b/odbc_version.i
@@ -1,5 +1,5 @@
#define MAJOR_VERSION 11
-#define MINOR_VERSION 3
+#define MINOR_VERSION 4
#define PATCH_VERSION 0
-#define BUILD_SERIAL_NUMBER 0061
-#define VERSION_STRING "11.3.0.0061"
+#define BUILD_SERIAL_NUMBER 0062
+#define VERSION_STRING "11.4.0.0062"
diff --git a/script/get_cci_driver.bat b/script/get_cci_driver.bat
index 2e1873c..c4abfe7 100755
--- 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
index b3c8eac..f012de7 100644
--- 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
\ No newline at end of file
From 1350a27bde7fff5eb291fd0454b9f4871874dbd4 Mon Sep 17 00:00:00 2001
From: Kang-dot
Date: Thu, 26 Dec 2024 15:04:10 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[APIS-1007]=20build=20=EC=8A=A4=ED=81=AC?=
=?UTF-8?q?=EB=A6=BD=ED=8A=B8,=20=EB=B2=84=EC=A0=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 드라이버 버전을 11.3.1.0062로 수정
- 빌드 스크립트에서 vs2017, nsis 환경 변수를 확인하도록 설정
---
build_2017.bat | 15 +++++++++++++--
build_unicode_2017.bat | 12 ++++++++++++
odbc_version.i | 6 +++---
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/build_2017.bat b/build_2017.bat
index 48cae41..a8fc382 100755
--- a/build_2017.bat
+++ b/build_2017.bat
@@ -1,6 +1,12 @@
+@echo off
+
set WORKSPACE=%~dp0
set INSTALL_DIRS=output
-echo %INSTALL_DIRS%
+
+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%
@@ -19,4 +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
-makensis %WORKSPACE%\%INSTALL_DIRS%\installer.nsi
\ No newline at end of file
+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
index 973fa7b..5128abc 100755
--- a/build_unicode_2017.bat
+++ b/build_unicode_2017.bat
@@ -1,7 +1,14 @@
+@echo off
+
set WORKSPACE=%~dp0
set INSTALL_DIRS=output_unicode
echo %INSTALL_DIRS%
+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,3 +22,8 @@ copy installer\license.txt %INSTALL_DIRS%\license.txt
copy installer\README.txt %INSTALL_DIRS%\README.txt
makensis %WORKSPACE%\%INSTALL_DIRS%\installer-unicode.nsi
+
+if %ERRORLEVEL% NEQ 0 (
+ echo "error: cannot find NSIS. Are system environment variables set?"
+ GOTO :EOF
+)
\ No newline at end of file
diff --git a/odbc_version.i b/odbc_version.i
index 10a7a5e..ce13bed 100644
--- a/odbc_version.i
+++ b/odbc_version.i
@@ -1,5 +1,5 @@
#define MAJOR_VERSION 11
-#define MINOR_VERSION 4
-#define PATCH_VERSION 0
+#define MINOR_VERSION 3
+#define PATCH_VERSION 1
#define BUILD_SERIAL_NUMBER 0062
-#define VERSION_STRING "11.4.0.0062"
+#define VERSION_STRING "11.3.1.0062"