Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7847e5d

Browse files
committed
Added use of icu 67_1 for Visual Studio 2019 build.
1 parent138f8fd commit7847e5d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
2121
)
2222

2323
rem GOTO :BUILD_ICONV
24+
rem GOTO :BUILD_ICU
2425

2526
if"%PRODUCT_NAME%"=="PostgreSQL"goto :SKIP_ZSTD
2627
if"%PRODUCT_NAME%"=="PostgresPro"goto :SKIP_ZSTD
@@ -310,14 +311,18 @@ CD /D %DOWNLOADS_DIR%
310311
:BUILD_ICU
311312
TITLE Building icu...
312313
CD /D%DOWNLOADS_DIR%
313-
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
314314
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
315315
wget --no-check-certificate -c http://repo.postgrespro.ru/depends/icu4c-%ICU_VER%-src.zip -O icu4c-%ICU_VER%-src.zip
316316
rm -rf%DEPENDENCIES_BIN_DIR%\icu%DEPENDENCIES_SRC_DIR%\icu
317317
MKDIR%DEPENDENCIES_BIN_DIR%\icu
318318
7z x icu4c-%ICU_VER%-src.zip -o%DEPENDENCIES_SRC_DIR% -y
319319
CD /D%DEPENDENCIES_SRC_DIR%\icu
320-
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
320+
IF%SDK%== MSVC2013 (
321+
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
322+
)ELSE (
323+
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% /p:WindowsTargetPlatformVersion=10.0 /p:SkipUWP=true||GOTO :ERROR
324+
)
325+
321326
IF%ARCH%== X64 (
322327
cp -va%DEPENDENCIES_SRC_DIR%\icu\bin64%DEPENDENCIES_BIN_DIR%\icu\bin||GOTO :ERROR
323328
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib64%DEPENDENCIES_BIN_DIR%\icu\lib||GOTO :ERROR

‎build/helpers/setvars.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ IF %SDK% == MSVC2013 (
5252
)
5353

5454
IF%SDK%== MSVC2015 (
55+
SETICU_VER=67_1
5556
SETREDIST_YEAR=2015
5657
SETPlatformToolset=v140
5758
IF%ARCH%== X86CALL"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" x86||GOTO :ERROR
@@ -60,13 +61,15 @@ IF %SDK% == MSVC2015 (
6061
ECHOON
6162
)
6263
IF%SDK%== MSVC2017 (
64+
SETICU_VER=67_1
6365
SETREDIST_YEAR=2017
6466
SETPlatformToolset=v141
6567
IF%ARCH%== X86CALL"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86||GOTO :ERROR
6668
ECHOON
6769
IF%ARCH%== X64call"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64||GOTO :ERROR
6870
)
6971
IF%SDK%== MSVC2019 (
72+
SETICU_VER=67_1
7073
SETREDIST_YEAR=2019
7174
SETPlatformToolset=v142
7275
IF%ARCH%== X86CALL"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86||GOTO :ERROR

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp