Merge branch 'master' into dev

dmpgpro · dmpgpro · commit a871e4351cfd · 2021-10-15T10:42:28.000+03:00
diff --git a/build/helpers/postgres.cmd b/build/helpers/postgres.cmd
@@ -86,6 +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
@@ -114,8 +115,9 @@ cp -va %DEPENDENCIES_BIN_DIR%/icu/include/* src\include\ || GOTO :ERROR
 cp -va %DEPENDENCIES_BIN_DIR%/icu/lib/*     . || GOTO :ERROR
 
 :NOLOAD
-IF %ARCH% == X86 SET PERL5LIB=%PERL32_PATH%\lib;src\tools\msvc;.
-IF %ARCH% == X64 SET PERL5LIB=%PERL64_PATH%\lib;src\tools\msvc;.
+REM IF %ARCH% == X86 SET PERL5LIB=%PERL32_PATH%\lib;src\tools\msvc;.
+REM IF %ARCH% == X64 SET PERL5LIB=%PERL64_PATH%\lib;src\tools\msvc;.
+SET PERL5LIB=%PERL64_PATH%\lib;src\tools\msvc;.
 
 %PERL_EXE% src\tools\msvc\build.pl || GOTO :ERROR
 
diff --git a/build/helpers/postgres_nsis_installer.cmd b/build/helpers/postgres_nsis_installer.cmd
@@ -104,6 +104,12 @@ rem Genarate file lists
 rem Remove old filelists first
 rm -f *_list.nsi
 rem tune pattern lists to major version and product
+
+IF %PG_MAJOR_VERSION% LEQ 13 (
+    sed "s/pg_amcheck//" client.files > client-14.files
+    mv client-14.files client.files
+)
+
 IF "%PG_MAJOR_VERSION%" == "9.6" (
 	sed "s/wal/xlog/" server.files > allserver.files
 	sed  "s/wal/xlog/" client.files > allclient.files
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -28,7 +28,7 @@ SET PERL5LIB=.
 
 IF %ARCH% == X86 SET PATH=%PERL32_BIN%;%PATH%
 IF %ARCH% == X86 SET PERL_EXE=%PERL32_BIN%\perl.exe
-IF %ARCH% == X86 GOTO :NOT64
+REM IF %ARCH% == X86 GOTO :NOT64
 
 IF EXIST "%PERL64_BIN%" SET PATH=%PERL64_BIN%;%PATH%
 IF EXIST "%PERL64_BIN%" SET PERL_EXE=%PERL64_BIN%\perl.exe
diff --git a/nsis/client.files b/nsis/client.files
@@ -4,6 +4,7 @@
 ./bin/createuser.*
 ./bin/dropdb.*
 ./bin/dropuser.*
+./bin/pg_amcheck.*
 ./bin/pg_basebackup.*
 ./bin/pgbench.*
 ./bin/pg_dump.*
diff --git a/nsis/unneeded.files b/nsis/unneeded.files
@@ -1,3 +1,4 @@
+./bin/libpq_pipeline.exe
 ./bin/pg_regress*.exe
 ./bin/pg_isolation_regress.exe
 ./bin/isolationtester.exe

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+./bin/libpq_pipeline.exe`
`1`	`2`	`./bin/pg_regress*.exe`
`2`	`3`	`./bin/pg_isolation_regress.exe`
`3`	`4`	`./bin/isolationtester.exe`