Merge branch 'PGPRO_DEV' of https://github.com/postgrespro/pgwininstall into PGPRO_DEV

VictorSpirin · VictorSpirin · commit ffc2668f8fea · 2019-07-04T18:46:44.000+03:00
diff --git a/build/helpers/postgres.cmd b/build/helpers/postgres.cmd
@@ -187,19 +187,8 @@ rem Copy msys shell and sed
 CD /D %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin
 if exist pgpro_upgrade 7z x %DOWNLOADS_DIR%\min_msys_%ARCH%.zip
 
-rem download and build pg_repack extension
 SET WGET=wget -N --no-check-certificate
 
-set PG_REPACK_URL=https://repo.postgrespro.ru/pgproee-%PG_MAJOR_VERSION%-beta/src/pg_repack-%PG_REPACK_VER%.tar.bz2
-if "%PRODUCT_NAME%" == "PostgresProEnterprise" (
-	CD /D %DOWNLOADS_DIR%
-	%WGET% %PG_REPACK_URL% || goto :ERROR
-	tar xf pg_repack*%PG_REPACK_VER%.tar.bz2 -C %BUILD_UDIR%/postgresql|| goto :ERROR
-	CD /D %BUILD_DIR%\postgresql
-	CD pg_repack-%PG_REPACK_VER%
-	perl win32build.pl  %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql
-)
-
 rem download help sources
 CD /D %DOWNLOADS_DIR%
 SET DOCURL=http://repo.l.postgrespro.ru/doc
diff --git a/build/helpers/postgres_nsis_installer.cmd b/build/helpers/postgres_nsis_installer.cmd
@@ -142,15 +142,6 @@ GOTO :NO_PGPRO_UPGRADE
 type pgpro_upgrade.files >> allserver.files
 :NO_PGPRO_UPGRADE
 
-rem pg_repack binary should be in serever section
-rem It is included into PostgresProEnterpise only
-rem pg_repack extension is included by same pattern as
-rem all other contrib extensions
-
-IF "%PRODUCT_NAME%" == "PostgresProEnterprise" (
-	echo ./bin/pg_repack.* >> allserver.files
-)
-
 rem expand pattern lists to actual file lists
 %PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %PG_INS_SOURCE_DIR% allclient.files devel.files plperl.files plpython2.files plpython3.files unneeded.files allserver.files || GOTO :ERROR
 
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -10,10 +10,6 @@ SET WXWIDGETS_VER=3.0.2
 SET EDITLINE_VER=2.205
 SET ZSTD_RELEASE=1.1.0
 
-SET PG_REPACK_VER=1.4.2
-IF "%PG_MAJOR_VERSION%"=="9.5" SET PG_REPACK_VER=1.3.4
-IF "%PG_MAJOR_VERSION%"=="11" SET PG_REPACK_VER=1.4.3
-
 REM Path vars
 SET PERL32_PATH=C:\Perl
 SET PERL64_PATH=C:\Perl64
