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

Commite682dc3

Browse files
committed
Added ICU_VER to icu-dep-path
1 parenta871e43 commite682dc3

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,22 +314,22 @@ rem wget --no-check-certificate -c http://download.icu-project.org/files/icu4c/5
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
rem wget --no-check-certificate -c https://github.com/unicode-org/icu/releases/download/release-67-1/icu4c-%ICU_VER%-src.zip -O icu4c-%ICU_VER%-src.zip
317-
rm -rf%DEPENDENCIES_BIN_DIR%\icu%DEPENDENCIES_SRC_DIR%\icu
318-
MKDIR%DEPENDENCIES_BIN_DIR%\icu
317+
rm -rf%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%%DEPENDENCIES_SRC_DIR%\icu
318+
MKDIR%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%
319319
7z x icu4c-%ICU_VER%-src.zip -o%DEPENDENCIES_SRC_DIR% -y
320320
CD /D%DEPENDENCIES_SRC_DIR%\icu
321321
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
322322
IF%ARCH%== X64 (
323-
cp -va%DEPENDENCIES_SRC_DIR%\icu\bin64%DEPENDENCIES_BIN_DIR%\icu\bin||GOTO :ERROR
324-
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib64%DEPENDENCIES_BIN_DIR%\icu\lib||GOTO :ERROR
325-
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib64%DEPENDENCIES_BIN_DIR%\icu\lib64||GOTO :ERROR
323+
cp -va%DEPENDENCIES_SRC_DIR%\icu\bin64%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\bin||GOTO :ERROR
324+
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib64%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\lib||GOTO :ERROR
325+
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib64%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\lib64||GOTO :ERROR
326326
)ELSE (
327-
cp -va%DEPENDENCIES_SRC_DIR%\icu\bin%DEPENDENCIES_BIN_DIR%\icu\bin||GOTO :ERROR
328-
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib%DEPENDENCIES_BIN_DIR%\icu\lib||GOTO :ERROR
327+
cp -va%DEPENDENCIES_SRC_DIR%\icu\bin%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\bin||GOTO :ERROR
328+
cp -va%DEPENDENCIES_SRC_DIR%\icu\lib%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\lib||GOTO :ERROR
329329
)
330-
cp -va%DEPENDENCIES_SRC_DIR%\icu\include%DEPENDENCIES_BIN_DIR%\icu\include||GOTO :ERROR
330+
cp -va%DEPENDENCIES_SRC_DIR%\icu\include%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\include||GOTO :ERROR
331331
CD /D%DOWNLOADS_DIR%
332-
7z a -r%DOWNLOADS_DIR%\%DEPS_ZIP%%DEPENDENCIES_BIN_DIR%\icu
332+
7z a -r%DOWNLOADS_DIR%\%DEPS_ZIP%%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%
333333

334334
REM If everything is compiled OK go to DONE
335335
GOTO :DONE

‎build/helpers/postgres.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO python ^=^> '%PYTHON32_PATH%'
101101
>>src\tools\msvc\config.plECHO xslt^=^> '%DEPENDENCIES_BIN_DIR%\libxslt',
102102
>>src\tools\msvc\config.plECHO iconv^=^> '%DEPENDENCIES_BIN_DIR%\iconv',
103103
>>src\tools\msvc\config.plECHO zlib^=^> '%DEPENDENCIES_BIN_DIR%\zlib',
104-
>>src\tools\msvc\config.plECHO icu^=^> '%DEPENDENCIES_BIN_DIR%\icu'
104+
>>src\tools\msvc\config.plECHO icu^=^> '%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%'
105105
>>src\tools\msvc\config.plECHO^};
106106
>>src\tools\msvc\config.plECHO 1^;
107107

@@ -111,8 +111,8 @@ REM )
111111

112112
SETDEPENDENCIES_BIN_DIR=%DEPENDENCIES_BIN_DIR:\=/%
113113

114-
cp -va%DEPENDENCIES_BIN_DIR%/icu/include/* src\include\||GOTO :ERROR
115-
cp -va%DEPENDENCIES_BIN_DIR%/icu/lib/* .||GOTO :ERROR
114+
cp -va%DEPENDENCIES_BIN_DIR%/icu%ICU_VER%/include/* src\include\||GOTO :ERROR
115+
cp -va%DEPENDENCIES_BIN_DIR%/icu%ICU_VER%/lib/* .||GOTO :ERROR
116116

117117
:NOLOAD
118118
REM IF %ARCH% == X86 SET PERL5LIB=%PERL32_PATH%\lib;src\tools\msvc;.
@@ -146,7 +146,7 @@ rem cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/*.dll %BUILD_DIR%\distr_%ARCH%_
146146
cp -va%DEPENDENCIES_BIN_DIR%/openssl/bin/*.dll%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
147147
cp -va%DEPENDENCIES_BIN_DIR%/openssl/bin/openssl.exe%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
148148
cp -va%DEPENDENCIES_BIN_DIR%/zlib/lib/*.dll%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
149-
cp -va%DEPENDENCIES_BIN_DIR%/icu/bin/*.dll%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
149+
cp -va%DEPENDENCIES_BIN_DIR%/icu%ICU_VER%/bin/*.dll%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin||GOTO :ERROR
150150

151151
REM Copy libraries headers to "include" directory for a God sake
152152
cp -va%DEPENDENCIES_BIN_DIR%/libintl/include/*%BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\include||GOTO :ERROR

0 commit comments

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