Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc532a3f

Browse files
committed
Fixed path for downloadble help sources
1 parent8f95464 commitc532a3f

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+
SETARCH=X64
2+
SETSDK=MSVC2013
3+
SETPG_MAJOR_VERSION=12
4+
SETPG_PATCH_VERSION=2.1
5+
SETPRODUCT_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+
SETPERL5LIB=.
12+
SETMSBFLAGS=/m
13+
SETWITHTAPTESTS=1
14+
SETNOLOAD_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-
ECHOON
3130
TITLE"Building libzstd"
3231
IF"ZSTD_RELEASE"==""setZSTD_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-
echoon
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-
SETDOCURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/doc
203+
remSET DOCURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/doc
204204
rem cut tar.bz2 extension from PGURL
205-
SETHELPURL=%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+
SETHELPURL=%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
SETPG_DEF_VERSION=%PG_MAJOR_VERSION%%PG_PATCH_VERSION%
8282
)
8383

84+
IF"%ISDEV%"=="1"SETBUILD_TYPE=dev
85+
IF"%ISDEV%"=="0"SETBUILD_TYPE=stable
86+
8487
if"%BUILD_TYPE%"==""SETBUILD_TYPE=dev
88+
8589
SETPGVER=%PG_DEF_VERSION%
90+
8691
IF"%PGURL%"=="" (
87-
IF"%PRODUCT_NAME%"==""SETPGURL="https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2"
88-
IF"%PRODUCT_NAME%"=="PostgreSQL"SETPGURL="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"SETPGURL="http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-enterprise-%PGVER%.tar.bz2"
92+
IF"%PRODUCT_NAME%"==""SETPGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
93+
IF"%PRODUCT_NAME%"=="PostgreSQL"SETPGURL=https://ftp.postgresql.org/pub/source/v%PGVER%/postgresql-%PGVER%.tar.bz2
94+
IF"%PRODUCT_NAME%"=="PostgresPro"SETPGURL=http://localrepo.l.postgrespro.ru/%BUILD_TYPE%/src/postgrespro-standard-%PGVER%.tar.bz2
95+
IF"%PRODUCT_NAME%"=="PostgresProEnterprise"SETPGURL=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
SETBUILD_DIR=%ROOT%\builddir
9699
SETDEPENDENCIES_SRC_DIR=%BUILD_DIR%\dependencies_src

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp