postgrespro
diff --git a/‎build/helpers/dependencies.cmd
Lines changed: 19 additions & 2 deletions b/‎build/helpers/dependencies.cmd
Lines changed: 19 additions & 2 deletions
diff --git a/‎build/helpers/postgres.cmd
Lines changed: 4 additions & 0 deletions b/‎build/helpers/postgres.cmd
Lines changed: 4 additions & 0 deletions
diff --git a/‎build/helpers/postgres_installer.cmd
Lines changed: 5 additions & 0 deletions b/‎build/helpers/postgres_installer.cmd
Lines changed: 5 additions & 0 deletions
diff --git a/‎build/helpers/setvars.cmd
Lines changed: 7 additions & 0 deletions b/‎build/helpers/setvars.cmd
Lines changed: 7 additions & 0 deletions
@@ -16,7 +16,11 @@ SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
 IF %SDK% == MSVC2017 (
 SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
 )
+IF %SDK% == MSVC2019 (
+SET WindowsTargetPlatformVersion=%WindowsSDKVersion%
+)
 
+rem GOTO :BUILD_ICONV
 
 if "%PRODUCT_NAME%" == "PostgreSQL"  goto :SKIP_ZSTD
 if "%PRODUCT_NAME%" == "PostgresPro" goto :SKIP_ZSTD
@@ -33,15 +37,25 @@ MKDIR %DEPENDENCIES_SRC_DIR%\zstd-%ZSTD_RELEASE%
 CD /D %DEPENDENCIES_SRC_DIR%
 7z x %DOWNLOADS_DIR%\zstd-%ZSTD_RELEASE%.zip
 CD zstd-%ZSTD_RELEASE%
+
 IF %SDK% == MSVC2017 (
 CD build/VS2010
+msbuild zstd.sln /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
+CD ../..
+GOTO :ENDZSTD
+)
+
+IF %SDK% == MSVC2019 (
+CD build/VS2010
 rem call "./../VS_Scripts/build.VS%REDIST_YEAR%.cmd" || GOTO :ERROR
 rem call "./../VS_Scripts/build.generic.cmd" VS2017 x64 Release v141 || GOTO :ERROR
 msbuild zstd.sln /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
 CD ../..
-)ELSE (
-call build/VS_Scripts/build.VS%REDIST_YEAR%.cmd || GOTO :ERROR
+GOTO :ENDZSTD
 )
+call build/VS_Scripts/build.VS%REDIST_YEAR%.cmd || GOTO :ERROR
+
+:ENDZSTD
 MKDIR %DEPENDENCIES_BIN_DIR%\zstd
 cp lib\zstd.h %DEPENDENCIES_BIN_DIR%\zstd
 if %ARCH% == X86 (
@@ -117,8 +131,11 @@ MKDIR %DEPENDENCIES_BIN_DIR%\iconv
 tar xf libiconv-%ICONV_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
 CD /D %DEPENDENCIES_SRC_DIR%\libiconv-%ICONV_VER%*
 cp -v %ROOT%/patches/libiconv/libiconv-%ICONV_VER%-%SDK%.patch libiconv.patch
+echo on
 patch -f -p0 < libiconv.patch || GOTO :ERROR
+
 msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=%Platform%  /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
+
 cp -av include %DEPENDENCIES_BIN_DIR%\iconv || GOTO :ERROR
 cp -av iconv.h %DEPENDENCIES_BIN_DIR%\iconv\include || GOTO :ERROR
 cp -av config.h %DEPENDENCIES_BIN_DIR%\iconv\include || GOTO :ERROR
 
@@ -64,6 +64,10 @@ IF %SDK% == MSVC2017 (
   cp -va %ROOT%/patches/postgresql/2017.patch .
   patch -p1 < 2017.patch || GOTO :ERROR
 )
+IF %SDK% == MSVC2019 (
+  cp -va %ROOT%/patches/postgresql/2017.patch .
+  patch -p1 < 2017.patch || GOTO :ERROR
+)
 
 
 :DONE_POSTGRESQL_PATCH
 
@@ -34,6 +34,11 @@ cp "%VCToolsRedistDir%vc_redist.x86.exe" "%BUILD_DIR%\vcredist\vcredist_x86_2017
 cp "%VCToolsRedistDir%vc_redist.x64.exe" "%BUILD_DIR%\vcredist\vcredist_x64_2017.exe"
 )
 
+IF %REDIST_YEAR% == 2019 (
+cp "%VCToolsRedistDir%vc_redist.x86.exe" "%BUILD_DIR%\vcredist\vcredist_x86_2019.exe"
+cp "%VCToolsRedistDir%vc_redist.x64.exe" "%BUILD_DIR%\vcredist\vcredist_x64_2019.exe"
+)
+
 REM Make directory for installers
 MKDIR "%BUILD_DIR%\installers"
 
 
@@ -61,6 +61,13 @@ IF %SDK% == MSVC2017 (
   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 As we use Msys2 for build we need to install useful packages we will use
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ IF %SDK% == MSVC2017 (`
`64`	`64`	`cp -va %ROOT%/patches/postgresql/2017.patch .`
`65`	`65`	`patch -p1 < 2017.patch \|\| GOTO :ERROR`
`66`	`66`	`)`
	`67`	`+IF %SDK% == MSVC2019 (`
	`68`	`+ cp -va %ROOT%/patches/postgresql/2017.patch .`
	`69`	`+ patch -p1 < 2017.patch \|\| GOTO :ERROR`
	`70`	`+)`
`67`	`71`
`68`	`72`
`69`	`73`	`:DONE_POSTGRESQL_PATCH`