Fixed for 32 bit build

VictorSpirin · VictorSpirin · commit 4c0b934335d6 · 2020-09-16T13:07:12.000+03:00
diff --git a/build/helpers/postgres.cmd b/build/helpers/postgres.cmd
@@ -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 postgres*-%PGVER%.tar.bz2 -C %BUILD_UDIR%/postgresql || GOTO :ERROR
+%MSYS2_PATH%\tar xf postgres*-%PGVER%.tar.bz2 -C %BUILD_UDIR%/postgresql || GOTO :ERROR
 CD /D %BUILD_DIR%\postgresql\*%PGVER%* || GOTO :ERROR
 
 :NOTAR
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -21,7 +21,8 @@ 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:\msys32\usr\bin;C:\msys64\usr\bin
+SET MSYS2_PATH=C:\msys32\usr\bin
+rem ;C:\msys64\usr\bin
 SET PATH=%PATH%;%ZIP_PATH%;%MSYS2_PATH%;%NSIS_PATH%
 SET PERL5LIB=.
 
@@ -30,8 +31,6 @@ IF EXIST "%PERL32_BIN%" SET PERL_EXE=%PERL32_BIN%\perl
 IF EXIST "%PERL64_BIN%" SET PATH=%PERL64_BIN%;%PATH%
 IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl
 
-IF %ARCH% == X86 SET Platform=Win32
-IF %ARCH% == X64 SET Platform=X64
 IF %SDK% == SDK71 (
   SET REDIST_YEAR=2010
   SET PlatformToolset=v100
@@ -71,6 +70,10 @@ IF %SDK% == MSVC2019 (
   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:"
