Skip to content

Commit c532a3f

Browse files
committed
Fixed path for downloadble help sources
1 parent 8f95464 commit c532a3f

File tree

4 files changed

+31
-12
lines changed

4 files changed

+31
-12
lines changed

build/build64.cmd

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
SET ARCH=X64
2+
SET SDK=MSVC2013
3+
SET PG_MAJOR_VERSION=12
4+
SET PG_PATCH_VERSION=2.1
5+
SET PRODUCT_NAME=PostgresProEnterprise
6+
rem SET PRODUCT_NAME=PostgreSQL 1C
7+
rem SET ONE_C=YES
8+
rem SET PGURL=http://repo.postgrespro.ru/1c-10-beta/src/postgrespro-1c-10.3.tar.bz2
9+
rem SET GIT_PATH=https://git.postgrespro.ru/pgpro-dev/postgrespro.git
10+
rem GIT_BRANCH=PGPROEE12_DEV
11+
SET PERL5LIB=.
12+
SET MSBFLAGS=/m
13+
SET WITHTAPTESTS=1
14+
SET NOLOAD_SRC=
15+
rem SET ISDEV=0
16+
rem SET BUILD_TYPE=dev
17+
call run.cmd %1

build/helpers/dependencies.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ if "%PRODUCT_NAME%" == "PostgresPro" goto :SKIP_ZSTD
2727

2828

2929
:ZSTD
30-
ECHO ON
3130
TITLE "Building libzstd"
3231
IF "ZSTD_RELEASE" == "" set ZSTD_RELEASE=1.1.0
3332
CD /D %DOWNLOADS_DIR%
@@ -131,7 +130,7 @@ MKDIR %DEPENDENCIES_BIN_DIR%\iconv
131130
tar xf libiconv-%ICONV_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
132131
CD /D %DEPENDENCIES_SRC_DIR%\libiconv-%ICONV_VER%*
133132
cp -v %ROOT%/patches/libiconv/libiconv-%ICONV_VER%-%SDK%.patch libiconv.patch
134-
echo on
133+
135134
patch -f -p0 < libiconv.patch || GOTO :ERROR
136135

137136
msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR

build/helpers/postgres.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ SET WGET=wget -N --no-check-certificate
200200

201201
rem download help sources
202202
CD /D %DOWNLOADS_DIR%
203-
SET DOCURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/doc
203+
rem SET DOCURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/doc
204204
rem cut tar.bz2 extension from PGURL
205-
SET HELPURL=%PGURL:0,-7%
206-
%WGET% -O help-sources-en.zip %prefix%.help.en.zip || GOTO :ERROR
207-
%WGET% -O help-sources-ru.zip %prefix%.help.ru.zip || GOTO :ERROR
205+
SET HELPURL=%PGURL:~0,-8%
206+
%WGET% -O help-sources-en.zip %HELPURL%.help.en.zip || GOTO :ERROR
207+
%WGET% -O help-sources-ru.zip %HELPURL%.help.ru.zip || GOTO :ERROR
208208

209209
rem building help files
210210
CD /D %BUILD_DIR%\postgresql

build/helpers/setvars.cmd

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,19 @@ ECHO %PG_PATCH_VERSION% | grep "^[0-9]." > nul && (
8181
SET PG_DEF_VERSION=%PG_MAJOR_VERSION%%PG_PATCH_VERSION%
8282
)
8383

84+
IF "%ISDEV%"=="1" SET BUILD_TYPE=dev
85+
IF "%ISDEV%"=="0" SET BUILD_TYPE=stable
86+
8487
if "%BUILD_TYPE%"=="" SET BUILD_TYPE=dev
88+
8589
SET PGVER=%PG_DEF_VERSION%
90+
8691
IF "%PGURL%"=="" (
87-
IF "%PRODUCT_NAME%"=="" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
88-
IF "%PRODUCT_NAME%"=="PostgreSQL" SET PGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%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"
92+
IF "%PRODUCT_NAME%"=="" SET PGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
93+
IF "%PRODUCT_NAME%"=="PostgreSQL" SET PGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
94+
IF "%PRODUCT_NAME%"=="PostgresPro" SET PGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-standard-%PGVER%.tar.bz2
95+
IF "%PRODUCT_NAME%"=="PostgresProEnterprise" SET PGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-enterprise-%PGVER%.tar.bz2
9296
)
93-
9497
REM Set useful directories paths so they're used in scripts
9598
SET BUILD_DIR=%ROOT%\builddir
9699
SET DEPENDENCIES_SRC_DIR=%BUILD_DIR%\dependencies_src

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy