Commit4c0b934

committed

Fixed for 32 bit build

1 parent6d81a21 commit4c0b934Copy full SHA for 4c0b934

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ GOTO :NOTAR`
`35`	`35`	`wget --no-check-certificate%PGURL% -O postgresql-%PGVER%.tar.bz2\|\|GOTO :ERROR`
`36`	`36`	`rm -rf%BUILD_DIR%\postgresql`
`37`	`37`	`MKDIR%BUILD_DIR%\postgresql`
`38`		`-tar xf postgres*-%PGVER%.tar.bz2 -C%BUILD_UDIR%/postgresql\|\|GOTO :ERROR`
	`38`	`+%MSYS2_PATH%\tar xf postgres*-%PGVER%.tar.bz2 -C%BUILD_UDIR%/postgresql\|\|GOTO :ERROR`
`39`	`39`	`CD /D%BUILD_DIR%\postgresql\%PGVER%\|\|GOTO :ERROR`
`40`	`40`
`41`	`41`	`:NOTAR`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ SET PYTHON32_PATH=C:\Python27x86`
`21`	`21`	`SETPYTHON64_PATH=C:\Python27x64`
`22`	`22`	`SETZIP_PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip`
`23`	`23`	`SETNSIS_PATH=C:\Program Files (x86)\NSIS`
`24`		`-SETMSYS2_PATH=C:\msys32\usr\bin;C:\msys64\usr\bin`
	`24`	`+SETMSYS2_PATH=C:\msys32\usr\bin`
	`25`	`+rem ;C:\msys64\usr\bin`
`25`	`26`	`SETPATH=%PATH%;%ZIP_PATH%;%MSYS2_PATH%;%NSIS_PATH%`
`26`	`27`	`SETPERL5LIB=.`
`27`	`28`
`@@ -30,8 +31,6 @@ IF EXIST "%PERL32_BIN%" SET PERL_EXE=%PERL32_BIN%\perl`
`30`	`31`	`IFEXIST"%PERL64_BIN%"SETPATH=%PERL64_BIN%;%PATH%`
`31`	`32`	`IFEXIST"%PERL64_BIN%"SETPERL_EXE=%PERL64_BIN%\perl`
`32`	`33`
`33`		`-IF%ARCH%== X86SETPlatform=Win32`
`34`		`-IF%ARCH%== X64SETPlatform=X64`
`35`	`34`	`IF%SDK%== SDK71 (`
`36`	`35`	`SETREDIST_YEAR=2010`
`37`	`36`	`SETPlatformToolset=v100`
`@@ -71,6 +70,10 @@ IF %SDK% == MSVC2019 (`
`71`	`70`	`IF%ARCH%== X64call"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64\|\|GOTO :ERROR`
`72`	`71`	`)`
`73`	`72`
	`73`	`+rem vcvarsall of VS 2019 rewrite this variable`
	`74`	`+IF%ARCH%== X86SETPlatform=Win32`
	`75`	`+IF%ARCH%== X64SETPlatform=X64`
	`76`	`+`
`74`	`77`
`75`	`78`	`REM As we use Msys2 for build we need to install useful packages we will use`
`76`	`79`	`@ECHO"Current PATH is:"`

Comments

(0)