Use new path for downloadble sources and help sources

vbwagner · VictorSpirin · commit 8f954648c071 · 2020-04-28T16:20:24.000+03:00
diff --git a/build/helpers/postgres.cmd b/build/helpers/postgres.cmd
@@ -200,23 +200,11 @@ SET WGET=wget -N --no-check-certificate
 
 rem download help sources
 CD /D %DOWNLOADS_DIR%
-SET DOCURL=http://repo.l.postgrespro.ru/doc
-if "%BUILD_TYPE%" == "dev" SET DOCURL=http://repo.l.postgrespro.ru/doc/dev
-
-if "%PRODUCT_NAME%" == "PostgresPro" %WGET% -O help-sources-en.zip %DOCURL%/pgpro/%PG_MAJOR_VERSION%/en/help-sources.zip || GOTO :ERROR
-if "%PRODUCT_NAME%" == "PostgresPro" %WGET% -O help-sources-ru.zip %DOCURL%/pgpro/%PG_MAJOR_VERSION%/ru/help-sources.zip || GOTO :ERROR
-if "%PRODUCT_NAME%" == "PostgresProEnterprise" %WGET% -O help-sources-en.zip %DOCURL%/pgproee/%PG_MAJOR_VERSION%/en/help-sources.zip || GOTO :ERROR
-if "%PRODUCT_NAME%" == "PostgresProEnterprise" %WGET% -O help-sources-ru.zip %DOCURL%/pgproee/%PG_MAJOR_VERSION%/ru/help-sources.zip || GOTO :ERROR
-
-
-SET HAVE_PGSQL_DOC=0
-if "%PG_MAJOR_VERSION%" == "9.5" SET HAVE_PGSQL_DOC=1
-if "%PG_MAJOR_VERSION%" == "9.6" SET HAVE_PGSQL_DOC=1
-if "%PG_MAJOR_VERSION%" == "10"  SET HAVE_PGSQL_DOC=1
-if %HAVE_PGSQL_DOC% == 1 (
-   if "%PRODUCT_NAME%" == "PostgreSQL"  %WGET% -O help-sources-en.zip %DOCURL%/pgsql/%PG_MAJOR_VERSION%/en/help-sources.zip || GOTO :ERROR
-   if "%PRODUCT_NAME%" == "PostgreSQL"  %WGET% -O help-sources-ru.zip %DOCURL%/pgsql/%PG_MAJOR_VERSION%/ru/help-sources.zip || GOTO :ERROR
-)
+SET DOCURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/doc
+rem cut tar.bz2 extension from PGURL
+SET HELPURL=%PGURL:0,-7%
+%WGET% -O help-sources-en.zip %prefix%.help.en.zip || GOTO :ERROR
+%WGET% -O help-sources-ru.zip %prefix%.help.ru.zip || GOTO :ERROR
 
 rem building help files
 CD /D %BUILD_DIR%\postgresql
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -81,11 +81,14 @@ ECHO %PG_PATCH_VERSION% | grep "^[0-9]." > nul && (
   SET PG_DEF_VERSION=%PG_MAJOR_VERSION%%PG_PATCH_VERSION%
 )
 
+if "%BUILD_TYPE%"=="" SET BUILD_TYPE=dev
 SET PGVER=%PG_DEF_VERSION%
 IF "%PGURL%"=="" (
    IF "%PRODUCT_NAME%"=="" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
    IF "%PRODUCT_NAME%"=="PostgreSQL" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
-   IF "%PRODUCT_NAME%"=="PostgresPro" SET PGURL="http://repo.l.postgrespro.ru/pgpro-%PG_MAJOR_VERSION%-beta/src/postgrespro-standard-%PGVER%.tar.bz2"
+   IF "%PRODUCT_NAME%"=="PostgresPro" SET
+   PGURL="http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-standard-%PGVER%.tar.bz2"
+   IF "%PRODUCT_NAME%"=="PostgresProEnterprise" SET PGURL="http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-enterprise-%PGVER%.tar.bz2"
 )
 
 REM Set useful directories paths so they're used in scripts

Original file line number	Diff line number	Diff line change
`@@ -81,11 +81,14 @@ ECHO %PG_PATCH_VERSION% \| grep "^[0-9]." > nul && (`
`81`	`81`	`SET PG_DEF_VERSION=%PG_MAJOR_VERSION%%PG_PATCH_VERSION%`
`82`	`82`	`)`
`83`	`83`
	`84`	`+if "%BUILD_TYPE%"=="" SET BUILD_TYPE=dev`
`84`	`85`	`SET PGVER=%PG_DEF_VERSION%`
`85`	`86`	`IF "%PGURL%"=="" (`
`86`	`87`	`IF "%PRODUCT_NAME%"=="" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"`
`87`	`88`	`IF "%PRODUCT_NAME%"=="PostgreSQL" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"`
`88`		`- IF "%PRODUCT_NAME%"=="PostgresPro" SET PGURL="http://repo.l.postgrespro.ru/pgpro-%PG_MAJOR_VERSION%-beta/src/postgrespro-standard-%PGVER%.tar.bz2"`
	`89`	`+ IF "%PRODUCT_NAME%"=="PostgresPro" SET`
	`90`	`+ PGURL="http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-standard-%PGVER%.tar.bz2"`
	`91`	`+ IF "%PRODUCT_NAME%"=="PostgresProEnterprise" SET PGURL="http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-enterprise-%PGVER%.tar.bz2"`
`89`	`92`	`)`
`90`	`93`
`91`	`94`	`REM Set useful directories paths so they're used in scripts`