WIP

gsmolk · gsmolk · commit fc38526a8a36 · 2019-08-07T23:14:12.000+03:00
diff --git a/build/helpers/probackup.cmd b/build/helpers/probackup.cmd
@@ -4,7 +4,7 @@ SET PROBACKUP_URL=https://github.com/postgrespro/pg_probackup/tarball/%PROBACKUP
 SET BIN_DIR=%BUILD_DIR%\pg_probackup_%PG_MAJOR_VERSION%_%PROBACKUP_VERSION%_%ARCH%
 SET PRODUCT_NAME=PostgreSQL
 
-SET PGDIRSRC=%BUILD_DIR%\postgresql\postgresql-%PG_MAJOR_VERSION%\
+SET PGDIRSRC=%BUILD_DIR%\postgresql\postgresql-%PGVER%\
 SET PGDIR=Z:\inst\
 
 SET PGDIR=Z:\Program Files\PostgresProEnterprise\11
@@ -27,14 +27,13 @@ tar xf pg_probackup-%PROBACKUP_VERSION%.tar.bz2 -C %BUILD_UDIR%/pg_probackup ||
 
 CD /D %BUILD_DIR%\pg_probackup\*%PROBACKUP_VERSION%* || GOTO :ERROR
 
-gen_probackup_project.pl %BUILD_DIR%\postgresql\postgresql-%PG_MAJOR_VERSION%
+gen_probackup_project.pl %BUILD_DIR%\postgresql\postgresql-%PGVER%
 
 MKDIR %BIN_DIR% || GOTO :ERROR
-MKDIR %BIN_DIR%\bin || GOTO :ERROR
 
 rem copy pg_probackup binaries and dependencies
-copy %BUILD_DIR%\postgresql\postgresql-%PG_MAJOR_VERSION%\Release\pg_probackup.exe %BIN_DIR% || GOTO :ERROR
-copy %BUILD_DIR%\postgresql\postgresql-%PG_MAJOR_VERSION%\Release\libpq\libpq.dll %BIN_DIR% || GOTO :ERROR
+copy %BUILD_DIR%\postgresql\postgresql-%PGVER%\Release\pg_probackup.exe %BIN_DIR% || GOTO :ERROR
+copy %BUILD_DIR%\postgresql\postgresql-%PGVER%\Release\libpq\libpq.dll %BIN_DIR% || GOTO :ERROR
 copy %DEPENDENCIES_BIN_DIR%\zlib\lib\zlib1.dll %BIN_DIR% || GOTO :ERROR
 copy %DEPENDENCIES_BIN_DIR%\openssl\lib\libeay32.dll %BIN_DIR% || GOTO :ERROR
 copy %DEPENDENCIES_BIN_DIR%\openssl\lib\ssleay32.dll %BIN_DIR% || GOTO :ERROR
