Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b47a517

Browse files
VictorSpirinVictorSpirin
committed
Updated for new dependencies and for Visual Studio 2019 build
1 parent 55ec85a commit b47a517

19 files changed

+20109
-66
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 146 additions & 39 deletions
Large diffs are not rendered by default.

‎build/helpers/postgres.cmd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CALL %ROOT%\build\helpers\setvars.cmd
2-
2+
echo on
33
IF EXIST %DOWNLOADS_DIR%\%DEPS_ZIP% (
44
7z x %DOWNLOADS_DIR%\%DEPS_ZIP% -o%DEPENDENCIES_BIN_DIR% -y
55
REM Go to last build
@@ -35,7 +35,7 @@ GOTO :NOTAR
3535
wget --no-check-certificate %PGURL% -O postgresql-%PGVER%.tar.bz2 || GOTO :ERROR
3636
rm -rf %BUILD_DIR%\postgresql
3737
MKDIR %BUILD_DIR%\postgresql
38-
tar xf postgresql-%PGVER%.tar.bz2 -C %BUILD_UDIR%/postgresql
38+
%MSYS2_PATH%\tar xf postgresql-%PGVER%.tar.bz2 -C %BUILD_UDIR%/postgresql
3939
CD /D %BUILD_DIR%\postgresql\*%PGVER%* || GOTO :ERROR
4040
:NOTAR
4141
IF %ONE_C% == YES (
@@ -86,7 +86,7 @@ IF %HAVE_PGURL% == 0 (
8686
>>src\tools\msvc\config.pl ECHO nls ^=^> '%DEPENDENCIES_BIN_DIR%\libintl',
8787
>>src\tools\msvc\config.pl ECHO tcl ^=^> undef,
8888
IF %SDK% == SDK71 GOTO :DISABLE_PERL
89-
IF %ARCH% == X86 GOTO :DISABLE_PERL
89+
IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO perl ^=^> '%PERL32_PATH%', )
9090
IF %ARCH% == X64 (>>src\tools\msvc\config.pl ECHO perl ^=^> '%PERL64_PATH%', )
9191
GOTO :PERL_CONF_DONE
9292
:DISABLE_PERL
@@ -107,6 +107,7 @@ IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO python ^=^> '%PYTHON32_PATH%'
107107
REM IF %ONE_C% == YES (
108108
REM mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in || GOTO :ERROR
109109
REM )
110+
110111
SET DEPENDENCIES_BIN_DIR=%DEPENDENCIES_BIN_DIR:\=/%
111112

112113
cp -va %DEPENDENCIES_BIN_DIR%/icu/include/* src\include\ || GOTO :ERROR

‎build/helpers/setvars.cmd

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
REM LIBRARY VERSIONS
2-
SET ICONV_VER=1.15
3-
SET XSLT_VER=1.1.29
2+
SET ICONV_VER=1.16
3+
SET XSLT_VER=1.1.32
44
SET ZLIB_VER=1.2.11
5-
SET XML_VER=2.9.4
6-
SET OPENSSL_VER=1.0.2n
7-
SET GETTEXT_VER=0.19.8
5+
SET XML_VER=2.9.9
6+
rem SET OPENSSL_VER=1.0.2n
7+
SET OPENSSL_VER=1.1.1g
8+
SET GETTEXT_VER=0.20.2
89
SET LIBSSH2_VER=1.6.0
910
SET WXWIDGETS_VER=3.0.2
11+
SET EDITLINE_VER=2.205
12+
SET ZSTD_RELEASE=1.4.4
13+
rem SET ICU_VER=67_1
14+
SET ICU_VER=56_2
1015

1116
REM Path vars
1217
SET PERL32_PATH=C:\Perl
@@ -17,28 +22,25 @@ SET PYTHON32_PATH=C:\Python27x86
1722
SET PYTHON64_PATH=C:\Python27x64
1823
SET ZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
1924
SET NSIS_PATH=C:\Program Files (x86)\NSIS
20-
SET MSYS2_PATH=C:\msys64\mingw32\bin;C:\msys64\mingw64\bin;C:\msys32\usr\bin;C:\msys64\usr\bin
25+
SET MSYS2_PATH=C:\msys64\usr\bin
2126
SET PATH=%PATH%;%ZIP_PATH%;%MSYS2_PATH%;%NSIS_PATH%
2227
SET PERL5LIB=.
2328

24-
IF EXIST "%PERL32_BIN%" SET PATH=%PERL32_BIN%;%PATH%
29+
IF %ARCH% == X86 SET PATH=%PERL32_BIN%;%PATH%
30+
IF %ARCH% == X86 SET PERL_EXE=%PERL32_BIN%\perl.exe
31+
IF %ARCH% == X86 GOTO :NOT64
32+
2533
IF EXIST "%PERL64_BIN%" SET PATH=%PERL64_BIN%;%PATH%
26-
IF EXIST "%PERL32_BIN%" SET PERL_EXE=%PERL32_BIN%\perl
27-
IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl
34+
IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl.exe
2835

29-
IF %SDK% == SDK71 (
30-
SET REDIST_YEAR=2010
31-
SET PlatformToolset=v100
32-
CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv" /%ARCH% || GOTO :ERROR
33-
ECHO ON
34-
)
36+
:NOT64
3537

36-
IF %SDK% == MSVC2010 (
38+
IF %ARCH% == X86 SET Platform=Win32
39+
IF %ARCH% == X64 SET Platform=X64
40+
IF %SDK% == SDK71 (
3741
SET REDIST_YEAR=2010
3842
SET PlatformToolset=v100
39-
IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall" x86 || GOTO :ERROR
40-
ECHO ON
41-
IF %ARCH% == X64 CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall" amd64 || GOTO :ERROR
43+
CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv" /xp /%ARCH% || GOTO :ERROR
4244
ECHO ON
4345
)
4446

@@ -65,9 +67,20 @@ IF %SDK% == MSVC2017 (
6567
IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 || GOTO :ERROR
6668
ECHO ON
6769
IF %ARCH% == X64 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
70+
)
71+
IF %SDK% == MSVC2019 (
72+
SET REDIST_YEAR=2019
73+
SET PlatformToolset=v142
74+
IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 || GOTO :ERROR
6875
ECHO ON
76+
IF %ARCH% == X64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
6977
)
7078

79+
rem vcvarsall of VS 2019 rewrite this variable
80+
IF %ARCH% == X86 SET Platform=Win32
81+
IF %ARCH% == X64 SET Platform=X64
82+
83+
7184
REM As we use Msys2 for build we need to install useful packages we will use
7285
@ECHO "Current PATH is:"
7386
PATH
@@ -79,12 +92,24 @@ ECHO %PG_PATCH_VERSION% | grep "^[0-9]." > nul && (
7992
SET PG_DEF_VERSION=%PG_MAJOR_VERSION%%PG_PATCH_VERSION%
8093
)
8194

95+
IF "%ISDEV%"=="1" SET BUILD_TYPE=dev
96+
IF "%ISDEV%"=="0" SET BUILD_TYPE=stable
97+
98+
if "%BUILD_TYPE%"=="" SET BUILD_TYPE=dev
99+
82100
SET PGVER=%PG_DEF_VERSION%
83101
SET PGTARNAME=postgresql
84102
SET HAVE_PGURL=1
85103
IF "%PGURL%"=="" SET HAVE_PGURL=0
86104
IF "%PGURL%"=="" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
87105

106+
107+
IF "%PGURL%"=="" (
108+
IF "%PRODUCT_NAME%"=="" SET PGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
109+
IF "%PRODUCT_NAME%"=="PostgreSQL" SET PGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
110+
IF "%PRODUCT_NAME%"=="PostgresPro" SET PGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-standard-%PGVER%.tar.bz2
111+
IF "%PRODUCT_NAME%"=="PostgresProEnterprise" SET PGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-enterprise-%PGVER%.tar.bz2
112+
)
88113
REM Set useful directories paths so they're used in scripts
89114
SET BUILD_DIR=%ROOT%\builddir
90115
SET DEPENDENCIES_SRC_DIR=%BUILD_DIR%\dependencies_src
@@ -109,4 +134,5 @@ if "%PG_MAJOR_VERSION%" == "9.5" SET HAVE_PGSQL_DOC=1
109134
if "%PG_MAJOR_VERSION%" == "9.6" SET HAVE_PGSQL_DOC=1
110135
if "%PG_MAJOR_VERSION%" == "10" SET HAVE_PGSQL_DOC=1
111136
if "%PG_MAJOR_VERSION%" == "11" SET HAVE_PGSQL_DOC=1
137+
if "%PG_MAJOR_VERSION%" == "12" SET HAVE_PGSQL_DOC=1
112138
:NO_PGSQL_DOC

‎nsis/server.files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
./bin/postgres.*
1717
./bin/postmaster.*
1818
./bin/zic.*
19+
./bin/pg_verifybackup.*
1920
./doc/extension/*.example
2021
./doc/buildinfo.txt
2122
./lib/*.dll

0 commit comments

Comments
 (0)