Skip to content

Commit a27ae18

Browse files
VictorSpirinVictorSpirin
committed
Fixed after merge
1 parent 0415a9a commit a27ae18

File tree

9 files changed

+310
-82
lines changed

9 files changed

+310
-82
lines changed

‎build/helpers/postgres_nsis_installer.cmd

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ IF %ONE_C% == YES (
3232
SET WITH_1C="FALSE"
3333
)
3434

35+
SET OLD_PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_MAJOR_VERSION%
36+
SET OLD_PREV_PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PG_PREV_MAJOR_VERSION%
37+
38+
SET PG_OLD_REG_KEY="%OLD_PRODUCT_DIR_REGKEY%\Installations\postgresql-%PG_MAJOR_VERSION%"
39+
SET PG_OLD_REG_SERVICE_KEY="%OLD_PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_MAJOR_VERSION%"
40+
SET PG_OLD_PREV_REG_KEY="%OLD_PREV_PRODUCT_DIR_REGKEY%\Installations\postgresql-%PG_PREV_MAJOR_VERSION%"
41+
SET PG_OLD_PREV_REG_SERVICE_KEY="%OLD_PREV_PRODUCT_DIR_REGKEY%\Services\postgresql-%PG_PREV_MAJOR_VERSION%"
42+
43+
3544
SET PRODUCT_DIR_REGKEY=SOFTWARE\%COMPANY_NAME%\%ARCH%\%PRODUCT_NAME%\%PG_MAJOR_VERSION%
3645
SET PG_REG_KEY=%PRODUCT_DIR_REGKEY%\Installations\%PG_DEF_SERVICEID%
3746
SET PG_REG_SERVICE_KEY=%PRODUCT_DIR_REGKEY%\Services\%PG_DEF_SERVICEID%
@@ -42,7 +51,8 @@ SET PG_DEF_PORT="%DEFAULT_PORT%"
4251
SET PG_DEF_SUPERUSER="%DEFAULT_USER%"
4352
SET PG_DEF_SERVICEACCOUNT="NT AUTHORITY\NetworkService"
4453
SET PG_DEF_BRANDING="%PRODUCT_NAME% %PG_MAJOR_VERSION% (%BITS%)"
45-
SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql\*.*"
54+
rem SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql\*.*"
55+
SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql"
4656

4757
SET NSIS_RES_DIR=%~dp0
4858
SET NSIS_RES_DIR=%NSIS_RES_DIR:~0,-1%
@@ -72,12 +82,41 @@ REM PostgreSQL Section
7282
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define SDK %SDK%
7383
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define HAVE_PGSQL_DOC %HAVE_PGSQL_DOC%
7484

85+
86+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_OLD_REG_KEY %PG_OLD_REG_KEY%
87+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_OLD_REG_SERVICE_KEY %PG_OLD_REG_SERVICE_KEY%
88+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_OLD_PREV_REG_KEY %PG_OLD_PREV_REG_KEY%
89+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_OLD_PREV_REG_SERVICE_KEY %PG_OLD_PREV_REG_SERVICE_KEY%
90+
91+
7592
IF "%ARCH%" == "X64" (
7693
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PG_64bit
7794
)
7895

96+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define myLicenseFile_ru "license.txt"
97+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define myLicenseFile_en "license.txt"
98+
>>%NSIS_RES_DIR%\postgres.def.nsh ECHO !define PRODUCT_NAME_SHORT "PostgreSQL"
99+
79100

80101
CD %NSIS_RES_DIR% || GOTO :ERROR
102+
103+
rem Genarate file lists
104+
rem Remove old filelists first
105+
rm -f *_list.nsi
106+
rem tune pattern lists to major version and product
107+
IF "%PG_MAJOR_VERSION%" == "9.6" (
108+
sed "s/wal/xlog/" server.files > allserver.files
109+
sed "s/wal/xlog/" client.files > allclient.files
110+
echo ./bin/createlang.* >> allclient.files
111+
echo ./bin/droplang.* >> allclient.files
112+
) ELSE (
113+
cat server.files > allserver.files
114+
type client.files > allclient.files
115+
)
116+
117+
rem expand pattern lists to actual file lists
118+
%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %PG_INS_SOURCE_DIR% allclient.files devel.files plperl.files plpython2.files plpython3.files unneeded.files allserver.files || GOTO :ERROR
119+
81120
makensis postgresql.nsi || GOTO :ERROR
82121

83122
GOTO :DONE

‎build/helpers/setvars.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,5 @@ if "%PRODUCT_NAME%" == "PostgreSQL 1C" GOTO :NO_PGSQL_DOC
100100
if "%PG_MAJOR_VERSION%" == "9.5" SET HAVE_PGSQL_DOC=1
101101
if "%PG_MAJOR_VERSION%" == "9.6" SET HAVE_PGSQL_DOC=1
102102
if "%PG_MAJOR_VERSION%" == "10" SET HAVE_PGSQL_DOC=1
103+
if "%PG_MAJOR_VERSION%" == "11" SET HAVE_PGSQL_DOC=1
103104
:NO_PGSQL_DOC

‎nsis/allclient.files

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
./bin/*.dll
2+
./bin/clusterdb.*
3+
./bin/createdb.*
4+
./bin/createuser.*
5+
./bin/dropdb.*
6+
./bin/dropuser.*
7+
./bin/pg_basebackup.*
8+
./bin/pgbench.*
9+
./bin/pg_dump.*
10+
./bin/pg_dumpall.*
11+
./bin/pg_isready.*
12+
./bin/pg_receivewal.*
13+
./bin/pg_recvlogical.*
14+
./bin/pg_restore.*
15+
./bin/psql.*
16+
./bin/reindexdb.*
17+
./bin/vacuumdb.*
18+
./bin/oid2name.*
19+
./bin/vacuumlo.*
20+
./bin/less.*
21+
./bin/lesskey.*
22+
./bin/openssl.*
23+
./share/psqlrc.sample
24+
./doc/postgresql-en.chm
25+
./doc/postgresql-ru.chm
26+
./share/locale/*/libpq*.mo
27+
./share/locale/*/pgscripts*.mo

‎nsis/allserver.files

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# This file contains some quite broad catch-all wildcard patterns, so
2+
# it should be last of all modules
3+
./bin/initdb.*
4+
./bin/pg_archivecleanup.*
5+
./bin/pg_controldata.*
6+
./bin/pg_ctl.*
7+
./bin/pg_probackup.*
8+
./bin/pg_resetwal.*
9+
./bin/pg_rewind.*
10+
./bin/pg_standby.*
11+
./bin/pg_test_fsync.*
12+
./bin/pg_test_timing.*
13+
./bin/pg_upgrade.*
14+
./bin/pg_waldump.*
15+
./bin/pg_verify_checksums.*
16+
./bin/postgres.*
17+
./bin/postmaster.*
18+
./bin/zic.*
19+
./doc/extension/*.example
20+
./doc/buildinfo.txt
21+
./lib/*.dll
22+
./share/extension/*
23+
./share/*.sample
24+
./share/*.sql
25+
./share/postgres.bki
26+
./share/*.description
27+
./share/*.shdescription
28+
./share/sql_features.txt
29+
./share/extension/plpgsql*
30+
./share/locale/*/LC_MESSAGES/plpgsql*
31+
./share/timezonesets/*
32+
./share/timezone/*
33+
./share/tsearch_data/*

‎nsis/devel.files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
./bin/pg_config.*
44
./bin/ecpg.*
55
./symbols/*.pdb
6+
./share/errcodes.txt

‎nsis/pgpro_upgrade.files

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
./bin/sh.*
2+
./bin/mv.*
3+
./bin/sed.*
4+
./bin/pgpro_upgrade
5+
./share/pgpro-upgrade/*

0 commit comments

Comments
 (0)