Updated for zstd 1.4.4

VictorSpirin · VictorSpirin · commit 47e28b8aa124 · 2020-05-07T13:56:31.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -28,7 +28,7 @@ if "%PRODUCT_NAME%" == "PostgresPro" goto :SKIP_ZSTD
 
 :ZSTD
 TITLE "Building libzstd"
-IF "ZSTD_RELEASE" == "" set ZSTD_RELEASE=1.1.0
+IF "ZSTD_RELEASE" == "" set ZSTD_RELEASE=1.4.4
 CD /D %DOWNLOADS_DIR%
 wget -O zstd-%ZSTD_RELEASE%.zip --no-check-certificate -c https://github.com/facebook/zstd/archive/v%ZSTD_RELEASE%.zip
 rm -rf %DEPENDENCIES_SRC_DIR%/zstd-%ZSTD_RELEASE%
@@ -37,32 +37,19 @@ 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
+msbuild zstd.sln /m /t:Clean,Build /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 ../..
-GOTO :ENDZSTD
-)
-call build/VS_Scripts/build.VS%REDIST_YEAR%.cmd || GOTO :ERROR
+rem Not working on 1.4.4, problem with /p:OutDir: fatal error LNK1181: cannot open input file 'libzstd.lib' for fullbench-dll.vcxproj
+rem 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 (
-	cp -va build/VS_Scripts/BIN/Release/Win32/zstdlib_x86* %DEPENDENCIES_BIN_DIR%\zstd
+	cp -va build/VS2010/bin/Win32_Release/libzstd* %DEPENDENCIES_BIN_DIR%\zstd
 ) else (
-	cp -va build/VS_Scripts/BIN/Release/x64/zstdlib_x64* %DEPENDENCIES_BIN_DIR%\zstd
 	cp -va build/VS2010/bin/x64_Release/libzstd* %DEPENDENCIES_BIN_DIR%\zstd
-	cp -va build/VS2010/bin/x64/Release/zstdlib_x64* %DEPENDENCIES_BIN_DIR%\zstd
 )
 7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\zstd
 
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -9,7 +9,7 @@ SET GETTEXT_VER=0.19.8
 SET LIBSSH2_VER=1.6.0
 SET WXWIDGETS_VER=3.0.2
 SET EDITLINE_VER=2.205
-SET ZSTD_RELEASE=1.1.0
+SET ZSTD_RELEASE=1.4.4
 
 REM Path vars
 SET PERL32_PATH=C:\Perl
