Added use of icu 67_1 for Visual Studio 2019 build.

VictorSpirin · VictorSpirin · commit 7847e5d94382 · 2020-10-08T13:24:01.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -21,6 +21,7 @@ SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
 )
 
 rem GOTO :BUILD_ICONV
+rem GOTO :BUILD_ICU
 
 if "%PRODUCT_NAME%" == "PostgreSQL"  goto :SKIP_ZSTD
 if "%PRODUCT_NAME%" == "PostgresPro" goto :SKIP_ZSTD
@@ -310,14 +311,18 @@ CD /D %DOWNLOADS_DIR%
 :BUILD_ICU
 TITLE Building icu...
 CD /D %DOWNLOADS_DIR%
-rem wget --no-check-certificate -c http://download.icu-project.org/files/icu4c/56.1/icu4c-56_1-src.zip -O icu4c-56_1-src.zip
 rem wget --no-check-certificate -c https://github.com/unicode-org/icu/releases/download/release-56-2/icu4c-56_2-src.zip -O icu4c-56_2-src.zip
 wget --no-check-certificate -c http://repo.postgrespro.ru/depends/icu4c-%ICU_VER%-src.zip -O icu4c-%ICU_VER%-src.zip
 rm -rf %DEPENDENCIES_BIN_DIR%\icu %DEPENDENCIES_SRC_DIR%\icu
 MKDIR %DEPENDENCIES_BIN_DIR%\icu
 7z x icu4c-%ICU_VER%-src.zip -o%DEPENDENCIES_SRC_DIR% -y
 CD /D %DEPENDENCIES_SRC_DIR%\icu
-msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
+IF %SDK% == MSVC2013 (
+  msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
+) ELSE (
+  msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset%  /p:WindowsTargetPlatformVersion=10.0 /p:SkipUWP=true || GOTO :ERROR
+)
+
 IF %ARCH% == X64 (
   cp -va %DEPENDENCIES_SRC_DIR%\icu\bin64 %DEPENDENCIES_BIN_DIR%\icu\bin || GOTO :ERROR
   cp -va %DEPENDENCIES_SRC_DIR%\icu\lib64 %DEPENDENCIES_BIN_DIR%\icu\lib || GOTO :ERROR
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -52,6 +52,7 @@ IF %SDK% == MSVC2013 (
 )
 
 IF %SDK% == MSVC2015 (
+  SET ICU_VER=67_1
   SET REDIST_YEAR=2015
   SET PlatformToolset=v140
   IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" x86 || GOTO :ERROR
@@ -60,13 +61,15 @@ IF %SDK% == MSVC2015 (
   ECHO ON
 )
 IF %SDK% == MSVC2017 (
+  SET ICU_VER=67_1
   SET REDIST_YEAR=2017
   SET PlatformToolset=v141
   IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 || GOTO :ERROR
   ECHO ON
   IF %ARCH% == X64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
 )
 IF %SDK% == MSVC2019 (
+  SET ICU_VER=67_1
   SET REDIST_YEAR=2019
   SET PlatformToolset=v142
   IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 || GOTO :ERROR
