Skip to content

Commit 6332f5e

Browse files
VictorSpirinVictorSpirin
committed
Builds 2 ICU lib version in dependencies for compatibility with old postres builds
1 parent ccd773e commit 6332f5e

File tree

3 files changed

+37
-15
lines changed

3 files changed

+37
-15
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -336,30 +336,37 @@ CD /D %DOWNLOADS_DIR%
336336

337337
:BUILD_ICU
338338
TITLE Building icu...
339+
echo on
339340
CD /D %DOWNLOADS_DIR%
340341
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
341342
wget --no-check-certificate -c http://repo.postgrespro.ru/depends/icu4c-%ICU_VER%-src.zip -O icu4c-%ICU_VER%-src.zip
342-
rm -rf %DEPENDENCIES_BIN_DIR%\icu %DEPENDENCIES_SRC_DIR%\icu
343-
MKDIR %DEPENDENCIES_BIN_DIR%\icu
343+
rm -rf %DEPENDENCIES_BIN_DIR%\icu%ICU_VER% %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%
344+
MKDIR %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%
344345
7z x icu4c-%ICU_VER%-src.zip -o%DEPENDENCIES_SRC_DIR% -y
345-
CD /D %DEPENDENCIES_SRC_DIR%\icu
346+
mv %DEPENDENCIES_SRC_DIR%\icu %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%
347+
CD /D %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%
346348
IF %SDK% == MSVC2013 (
347349
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
348350
) ELSE (
349351
msbuild source\allinone\allinone.sln /m /p:Configuration="Release" /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% /p:WindowsTargetPlatformVersion=%WindowsSDKVersion% /p:SkipUWP=true || GOTO :ERROR
350352
)
351353

352354
IF %ARCH% == X64 (
353-
cp -va %DEPENDENCIES_SRC_DIR%\icu\bin64 %DEPENDENCIES_BIN_DIR%\icu\bin || GOTO :ERROR
354-
cp -va %DEPENDENCIES_SRC_DIR%\icu\lib64 %DEPENDENCIES_BIN_DIR%\icu\lib || GOTO :ERROR
355-
cp -va %DEPENDENCIES_SRC_DIR%\icu\lib64 %DEPENDENCIES_BIN_DIR%\icu\lib64 || GOTO :ERROR
355+
cp -va %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%\bin64 %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\bin || GOTO :ERROR
356+
cp -va %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%\lib64 %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\lib || GOTO :ERROR
357+
cp -va %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%\lib64 %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\lib64 || GOTO :ERROR
356358
) ELSE (
357-
cp -va %DEPENDENCIES_SRC_DIR%\icu\bin %DEPENDENCIES_BIN_DIR%\icu\bin || GOTO :ERROR
358-
cp -va %DEPENDENCIES_SRC_DIR%\icu\lib %DEPENDENCIES_BIN_DIR%\icu\lib || GOTO :ERROR
359+
cp -va %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%\bin %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\bin || GOTO :ERROR
360+
cp -va %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%\lib %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\lib || GOTO :ERROR
359361
)
360-
cp -va %DEPENDENCIES_SRC_DIR%\icu\include %DEPENDENCIES_BIN_DIR%\icu\include || GOTO :ERROR
362+
cp -va %DEPENDENCIES_SRC_DIR%\icu%ICU_VER%\include %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%\include || GOTO :ERROR
361363
CD /D %DOWNLOADS_DIR%
362-
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\icu
364+
7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\icu%ICU_VER%
365+
366+
IF "%ICU_VER%" NEQ "56_2" (
367+
SET ICU_VER=56_2
368+
goto :BUILD_ICU
369+
)
363370

364371
REM If everything is compiled OK go to DONE
365372
GOTO :DONE

‎build/helpers/postgres.cmd

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ IF NOT "%GIT_BRANCH%"=="" (
2727
rm -rf %BUILD_DIR%\postgresql
2828
MKDIR %BUILD_DIR%\postgresql
2929
MKDIR %BUILD_DIR%\postgresql\postgresql-%PGVER%
30-
git clone --depth 1 -b %GIT_BRANCH% %GIT_PATH% %BUILD_DIR%\postgresql\postgresql-%PGVER%
30+
git clone -b %GIT_BRANCH% %GIT_PATH% %BUILD_DIR%\postgresql\postgresql-%PGVER%
31+
rem --depth 1 to save traffic
3132
CD /D %BUILD_DIR%\postgresql\*%PGVER%* || GOTO :ERROR
3233
GOTO :NOTAR
3334
)
@@ -62,7 +63,7 @@ if "%PRODUCT_NAME%" == "PostgreSQL" (
6263
:DONE_POSTGRESQL_PATCH
6364
IF "%SDK%" == "MSVC2017" (
6465
cp -va %ROOT%/patches/postgresql/2017.patch .
65-
patch -p1 < 2017.patch || GOTO :ERROR
66+
rem patch -p1 < 2017.patch || GOTO :ERROR
6667

6768
rem cp -va %ROOT%/patches/postgresql/perl.5.30.patch .
6869
rem patch -p1 < perl.5.30.patch || GOTO :ERROR
@@ -71,13 +72,15 @@ IF "%SDK%" == "MSVC2017" (
7172

7273
IF "%SDK%" == "MSVC2019" (
7374
cp -va %ROOT%/patches/postgresql/2017.patch .
74-
patch -p1 < 2017.patch || GOTO :ERROR
75+
rem patch -p1 < 2017.patch || GOTO :ERROR
7576

7677
rem cp -va %ROOT%/patches/postgresql/perl.5.30.patch .
7778
rem patch -p1 < perl.5.30.patch || GOTO :ERROR
7879

7980
)
8081

82+
IF "%PG_MAJOR_VERSION%" LSS "13" SET ICU_VER=56_2
83+
IF "%PG_MAJOR_VERSION%" == "9.6" SET ICU_VER=56_2
8184

8285
>src\tools\msvc\config.pl ECHO use strict;
8386
>>src\tools\msvc\config.pl ECHO use warnings;
@@ -109,7 +112,8 @@ IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO python ^=^> '%PYTHON32_PATH%'
109112
>>src\tools\msvc\config.pl ECHO iconv ^=^> '%DEPENDENCIES_BIN_DIR%\iconv',
110113
>>src\tools\msvc\config.pl ECHO zlib ^=^> '%DEPENDENCIES_BIN_DIR%\zlib',
111114
if "%PRODUCT_NAME%" == "PostgresProEnterprise" >>src\tools\msvc\config.pl ECHO zstd ^=^> '%DEPENDENCIES_BIN_DIR%\zstd',
112-
>>src\tools\msvc\config.pl ECHO icu ^=^> '%DEPENDENCIES_BIN_DIR%\icu',
115+
if "%PRODUCT_NAME%" == "PostgresProEnterprise" >>src\tools\msvc\config.pl ECHO lz4 ^=^> '%DEPENDENCIES_BIN_DIR%\lz4',
116+
>>src\tools\msvc\config.pl ECHO icu ^=^> '%DEPENDENCIES_BIN_DIR%\icu%ICU_VER%',
113117
IF "%WITHTAPTESTS%" == "1" >>src\tools\msvc\config.pl ECHO tap_tests ^=^> 1,
114118
>>src\tools\msvc\config.pl ECHO libedit ^=^> '%DEPENDENCIES_BIN_DIR%\wineditline'
115119

@@ -184,7 +188,8 @@ cp -va %DEPENDENCIES_BIN_DIR%/openssl/bin/openssl.exe %BUILD_DIR%\distr_%ARCH%_%
184188

185189
cp -va %DEPENDENCIES_BIN_DIR%/zlib/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
186190
if "%PRODUCT_NAME%" == "PostgresProEnterprise" cp -va %DEPENDENCIES_BIN_DIR%/zstd/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
187-
cp -va %DEPENDENCIES_BIN_DIR%/icu/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
191+
if "%PRODUCT_NAME%" == "PostgresProEnterprise" cp -va %DEPENDENCIES_BIN_DIR%/lz4/lib/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
192+
cp -va %DEPENDENCIES_BIN_DIR%/icu%ICU_VER%/bin/*.dll %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
188193
REM Copy needed executables
189194
rem cp -va %DEPENDENCIES_BIN_DIR%/openssl/lib/VC/openssl.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
190195
cp -va %DEPENDENCIES_BIN_DIR%/less/*.exe %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR

‎nsis/client.files

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,13 @@
2525
./doc/postgresql-ru.chm
2626
./share/locale/*/libpq*.mo
2727
./share/locale/*/pgscripts*.mo
28+
${if pg_major >= 13}
29+
./bin/pg_verifybackup.*
30+
./share/locale/*/LC_MESSAGES/pg_verifybackup*.mo
31+
${endif}
32+
${if pg_major >= 14}
33+
./bin/pg_amcheck.*
34+
./share/locale/*/LC_MESSAGES/pg_amcheck*.mo
35+
./bin/libpq_pipeline.*
36+
./share/locale/*/LC_MESSAGES/libpq_pipeline*.mo
37+
${endif}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy