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

Commit355ded5

Browse files
committed
Updated for compatibility with pgpro-pkg/postgrespro
1 parent30c44c2 commit355ded5

File tree

4 files changed

+249
-210
lines changed

4 files changed

+249
-210
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IF %SDK% == MSVC2019 (
2020
SETWindowsTargetPlatformVersion=%WindowsSDKVersion%
2121
)
2222

23-
rem GOTO :BUILD_GETTEXT
23+
rem GOTO :BUILD_ICONV
2424

2525
if"%PRODUCT_NAME%"=="PostgreSQL"goto :SKIP_ZSTD
2626
if"%PRODUCT_NAME%"=="PostgresPro"goto :SKIP_ZSTD

‎build/helpers/postgres.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ IF NOT "%GIT_BRANCH%"=="" (
2626
rm -rf%BUILD_DIR%\postgresql
2727
MKDIR%BUILD_DIR%\postgresql
2828
MKDIR%BUILD_DIR%\postgresql\postgresql-%PGVER%
29-
git clone -b%GIT_BRANCH%%GIT_PATH%%BUILD_DIR%\postgresql\postgresql-%PGVER%
29+
git clone --depth1 -b%GIT_BRANCH%%GIT_PATH%%BUILD_DIR%\postgresql\postgresql-%PGVER%
3030
CD /D%BUILD_DIR%\postgresql\*%PGVER%*||GOTO :ERROR
31-
3231
GOTO :NOTAR
3332
)
3433

‎build/helpers/postgres_nsis_installer.cmd

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,33 @@ REM The OLD_* variables used for upgrade from old installers, which was built wi
2020
SETOLD_PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_MAJOR_VERSION%
2121
SETOLD_PREV_PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_PREV_MAJOR_VERSION%
2222

23-
REM Set Service-Id
24-
SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
25-
IF"%PRODUCT_NAME%"=="PostgreSQL"SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
26-
IF"%PRODUCT_NAME%"=="PostgresPro"SETPG_DEF_SERVICEID="postgrespro-%ARCH%-%PG_MAJOR_VERSION%"
27-
IF"%PRODUCT_NAME%"=="PostgresProEnterprise"SETPG_DEF_SERVICEID="postgrespro-enterprise-%ARCH%-%PG_MAJOR_VERSION%"
28-
2923
IF%ARCH%== X86 (
3024
SETBITS=32bit
3125
)else (
3226
SETBITS=64bit
3327
)
28+
29+
REM Set Service-Id
30+
SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
31+
IF"%PRODUCT_NAME%"=="PostgreSQL" (
32+
SETPG_DEF_SERVICEID="postgresql-%ARCH%-%PG_MAJOR_VERSION%"
33+
IF%BITS%==32bitSETPG_DEF_SERVICEID=postgresql-%PG_MAJOR_VERSION%-%BITS%
34+
)
35+
IF"%PRODUCT_NAME%"=="PostgresPro"SETPG_DEF_SERVICEID="postgrespro-%ARCH%-%PG_MAJOR_VERSION%"
36+
IF"%PRODUCT_NAME%"=="PostgresProEnterprise"SETPG_DEF_SERVICEID="postgrespro-enterprise-%ARCH%-%PG_MAJOR_VERSION%"
37+
38+
3439
IF%ONE_C%== YES (
35-
SETPRODUCT_NAME=PostgresPro 1C
36-
SETPG_DEF_SERVICEID="postgrespro-1C-${PRODUCT_VERSION}"
40+
SETPRODUCT_NAME=PostgreSQL 1C
41+
rem SET PG_DEF_SERVICEID="postgrespro-1C-${PRODUCT_VERSION}"
42+
IF%BITS%==32bitSETPG_DEF_SERVICEID=postgresql-1c-%PG_MAJOR_VERSION%-%BITS%
43+
IF%BITS%==64bitSETPG_DEF_SERVICEID=postgresql-1c-%PG_MAJOR_VERSION%
3744
SETPG_INS_SUFFIX="%ARCH%bit_1C_Setup.exe"
3845
SETPG_REG_KEY="Software\Postgres Professional\${PRODUCT_NAME}\Installations\postgresql-${PRODUCT_VERSION}"
3946
SETPG_REG_SERVICE_KEY="Software\Postgres Professional\${PRODUCT_NAME}\Services\postgresql-${PRODUCT_VERSION}"
4047
SETPRODUCT_DIR_REGKEY="Software\Postgres Professional\${PRODUCT_NAME}\${PRODUCT_VERSION}"
4148
SETPRODUCT_VERSION="%PG_MAJOR_VERSION%"
49+
SETWITH_1C="TRUE"
4250
)ELSE (
4351
SETPG_INS_SUFFIX="%BITS%_Setup.exe"
4452
SETPRODUCT_VERSION="%PG_MAJOR_VERSION% (%BITS%)"
@@ -50,6 +58,7 @@ IF %ONE_C% == YES (
5058
SETPG_OLD_REG_SERVICE_KEY="%OLD_PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_MAJOR_VERSION%"
5159
SETPG_OLD_PREV_REG_KEY="%OLD_PREV_PRODUCT_DIR_REGKEY%\Installations\postgresql-%PG_PREV_MAJOR_VERSION%"
5260
SETPG_OLD_PREV_REG_SERVICE_KEY="%OLD_PREV_PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_PREV_MAJOR_VERSION%"
61+
SETWITH_1C="FALSE"
5362
)
5463

5564
SETPG_DEF_PORT="%DEFAULT_PORT%"
@@ -88,6 +97,7 @@ REM PostgreSQL Section
8897
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PG_INS_SUFFIX%PG_INS_SUFFIX%
8998
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define PG_INS_SOURCE_DIR%PG_INS_SOURCE_DIR%
9099
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define REDIST_YEAR%REDIST_YEAR%
100+
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define WITH_1C%WITH_1C%
91101
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define BUILD_DIR%BUILD_DIR%
92102
>>%NSIS_RES_DIR%\postgres.def.nshECHO !define SDK%SDK%
93103
>>%NSIS_RES_DIR%\postgres.def.nshECHO !addplugindir Plugins

0 commit comments

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