Updated for new dependencies and for Visual Studio 2019 build

Author: VictorSpirin

build/helpers/dependencies.cmd

@@ -1,5 +1,5 @@
 CALL %ROOT%\build\helpers\setvars.cmd
-
+echo on
 IF EXIST %DOWNLOADS_DIR%\%DEPS_ZIP% (
   7z x %DOWNLOADS_DIR%\%DEPS_ZIP% -o%DEPENDENCIES_BIN_DIR% -y
   REM Go to last build
@@ -35,7 +35,7 @@ GOTO :NOTAR
 wget --no-check-certificate %PGURL% -O postgresql-%PGVER%.tar.bz2 || GOTO :ERROR
 rm -rf %BUILD_DIR%\postgresql
 MKDIR %BUILD_DIR%\postgresql
-tar xf postgresql-%PGVER%.tar.bz2 -C %BUILD_UDIR%/postgresql
+%MSYS2_PATH%\tar xf postgresql-%PGVER%.tar.bz2 -C %BUILD_UDIR%/postgresql
 CD /D %BUILD_DIR%\postgresql\*%PGVER%* || GOTO :ERROR
 :NOTAR
 IF %ONE_C% == YES (
@@ -86,7 +86,7 @@ IF %HAVE_PGURL% == 0 (
 >>src\tools\msvc\config.pl ECHO nls     ^=^> '%DEPENDENCIES_BIN_DIR%\libintl',
 >>src\tools\msvc\config.pl ECHO tcl     ^=^> undef,
 IF %SDK% == SDK71 GOTO :DISABLE_PERL
-IF %ARCH% == X86  GOTO :DISABLE_PERL
+IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO perl    ^=^> '%PERL32_PATH%',   )
 IF %ARCH% == X64 (>>src\tools\msvc\config.pl ECHO perl    ^=^> '%PERL64_PATH%',   )
 GOTO :PERL_CONF_DONE
 :DISABLE_PERL
@@ -107,6 +107,7 @@ IF %ARCH% == X86 (>>src\tools\msvc\config.pl ECHO python  ^=^> '%PYTHON32_PATH%'
 REM IF %ONE_C% == YES (
 REM   mv -v contrib\fulleq\fulleq.sql.in.in contrib\fulleq\fulleq.sql.in || GOTO :ERROR
 REM )
+
 SET DEPENDENCIES_BIN_DIR=%DEPENDENCIES_BIN_DIR:\=/%
 
 cp -va %DEPENDENCIES_BIN_DIR%/icu/include/* src\include\ || GOTO :ERROR

build/helpers/postgres.cmd

@@ -1,12 +1,17 @@
 REM LIBRARY VERSIONS
-SET ICONV_VER=1.15
-SET XSLT_VER=1.1.29
+SET ICONV_VER=1.16
+SET XSLT_VER=1.1.32
 SET ZLIB_VER=1.2.11
-SET XML_VER=2.9.4
-SET OPENSSL_VER=1.0.2n
-SET GETTEXT_VER=0.19.8
+SET XML_VER=2.9.9
+rem SET OPENSSL_VER=1.0.2n
+SET OPENSSL_VER=1.1.1g
+SET GETTEXT_VER=0.20.2
 SET LIBSSH2_VER=1.6.0
 SET WXWIDGETS_VER=3.0.2
+SET EDITLINE_VER=2.205
+SET ZSTD_RELEASE=1.4.4
+rem SET ICU_VER=67_1
+SET ICU_VER=56_2
 
 REM Path vars
 SET PERL32_PATH=C:\Perl
@@ -17,28 +22,25 @@ SET PYTHON32_PATH=C:\Python27x86
 SET PYTHON64_PATH=C:\Python27x64
 SET ZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
 SET NSIS_PATH=C:\Program Files (x86)\NSIS
-SET MSYS2_PATH=C:\msys64\mingw32\bin;C:\msys64\mingw64\bin;C:\msys32\usr\bin;C:\msys64\usr\bin
+SET MSYS2_PATH=C:\msys64\usr\bin
 SET PATH=%PATH%;%ZIP_PATH%;%MSYS2_PATH%;%NSIS_PATH%
 SET PERL5LIB=.
 
-IF EXIST "%PERL32_BIN%" SET PATH=%PERL32_BIN%;%PATH%
+IF %ARCH% == X86 SET PATH=%PERL32_BIN%;%PATH%
+IF %ARCH% == X86 SET PERL_EXE=%PERL32_BIN%\perl.exe
+IF %ARCH% == X86 GOTO :NOT64
+
 IF EXIST "%PERL64_BIN%" SET PATH=%PERL64_BIN%;%PATH%
-IF EXIST "%PERL32_BIN%" SET PERL_EXE=%PERL32_BIN%\perl
-IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl
+IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl.exe
 
-IF %SDK% == SDK71 (
-  SET REDIST_YEAR=2010
-  SET PlatformToolset=v100
-  CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv" /%ARCH% || GOTO :ERROR
-  ECHO ON
-)
+:NOT64
 
-IF %SDK% == MSVC2010 (
+IF %ARCH% == X86 SET Platform=Win32
+IF %ARCH% == X64 SET Platform=X64
+IF %SDK% == SDK71 (
   SET REDIST_YEAR=2010
   SET PlatformToolset=v100
-  IF %ARCH% == X86 CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall" x86 || GOTO :ERROR
-  ECHO ON
-  IF %ARCH% == X64 CALL "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall" amd64 || GOTO :ERROR
+  CALL "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv" /xp /%ARCH% || GOTO :ERROR
   ECHO ON
 )
 
@@ -65,9 +67,20 @@ IF %SDK% == MSVC2017 (
   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 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
   ECHO ON
+  IF %ARCH% == X64 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 || GOTO :ERROR
 )
 
+rem vcvarsall of VS 2019 rewrite this variable
+IF %ARCH% == X86 SET Platform=Win32
+IF %ARCH% == X64 SET Platform=X64
+
+
 REM As we use Msys2 for build we need to install useful packages we will use
 @ECHO "Current PATH is:"
 PATH
@@ -79,12 +92,24 @@ ECHO %PG_PATCH_VERSION% | grep "^[0-9]." > nul && (
   SET PG_DEF_VERSION=%PG_MAJOR_VERSION%%PG_PATCH_VERSION%
 )
 
+IF "%ISDEV%"=="1" SET BUILD_TYPE=dev
+IF "%ISDEV%"=="0" SET BUILD_TYPE=stable
+
+if "%BUILD_TYPE%"=="" SET BUILD_TYPE=dev
+
 SET PGVER=%PG_DEF_VERSION%
 SET PGTARNAME=postgresql
 SET HAVE_PGURL=1
 IF "%PGURL%"=="" SET HAVE_PGURL=0
 IF "%PGURL%"=="" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
 
+
+IF "%PGURL%"=="" (
+   IF "%PRODUCT_NAME%"=="" SET PGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
+   IF "%PRODUCT_NAME%"=="PostgreSQL" SET PGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
+   IF "%PRODUCT_NAME%"=="PostgresPro" SET PGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-standard-%PGVER%.tar.bz2
+   IF "%PRODUCT_NAME%"=="PostgresProEnterprise" SET PGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-enterprise-%PGVER%.tar.bz2
+)
 REM Set useful directories paths so they're used in scripts
 SET BUILD_DIR=%ROOT%\builddir
 SET DEPENDENCIES_SRC_DIR=%BUILD_DIR%\dependencies_src
@@ -109,4 +134,5 @@ if "%PG_MAJOR_VERSION%" == "9.5" SET HAVE_PGSQL_DOC=1
 if "%PG_MAJOR_VERSION%" == "9.6" SET HAVE_PGSQL_DOC=1
 if "%PG_MAJOR_VERSION%" == "10"  SET HAVE_PGSQL_DOC=1
 if "%PG_MAJOR_VERSION%" == "11"  SET HAVE_PGSQL_DOC=1
+if "%PG_MAJOR_VERSION%" == "12"  SET HAVE_PGSQL_DOC=1
 :NO_PGSQL_DOC

build/helpers/setvars.cmd

@@ -16,6 +16,7 @@
 ./bin/postgres.*
 ./bin/postmaster.*
 ./bin/zic.*
+./bin/pg_verifybackup.*
 ./doc/extension/*.example
 ./doc/buildinfo.txt
 ./lib/*.dll