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

Commit78270a1

Browse files
committed
Fix filelist generation to remove unpackaged files
1 parente621609 commit78270a1

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

‎build/helpers/postgres_nsis_installer.cmd

100644100755
Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,28 @@ GOTO :ENDLIC
122122

123123
CD /D%NSIS_RES_DIR%||GOTO :ERROR
124124
rem Genarate file lists
125-
126-
type server.files> allserver.files
125+
rem Remove old filelists first
126+
rm -f *_list.nsi
127+
rem tune pattern lists to major version and product
128+
IF"%PG_MAJOR_VERSION%"=="9.6" (
129+
sed"s/wal/xlog/" server.files> allserver.files
130+
sed"s/wal/xlog/" client.files> allclient.files
131+
echo ./bin/createlang.*>> allclient.files
132+
echo ./bin/droplang.*>> allclient.files
133+
)ELSE (
134+
cat server.files> allserver.files
135+
type client.files> allclient.files
136+
)
127137
IFNOT"%PG_MAJOR_VERSION%"=="9.6"GOTO :NO_PGPRO_UPGRADE
128138
IF"%PRODUCT_NAME%"=="PostgresPro"GOTO :ADD_PGPRO_UPGRADE
129139
IF"%PRODUCT_NAME%"=="PostgresProEnterprise"GOTO :ADD_PGPRO_UPGRADE
130140
GOTO :NO_PGPRO_UPGRADE
131141
:ADD_PGPRO_UPGRADE
132-
typeserver.filespgpro_upgrade.files> allserver.files
142+
type pgpro_upgrade.files>> allserver.files
133143
:NO_PGPRO_UPGRADE
134144

135-
%PYTHON64_PATH%/python%ROOT%/build/helpers/genlists.py%PG_INS_SOURCE_DIR% client.files devel.files plperl.files plpython2.files plpython3.files unneeded.files allserver.files||GOTO :ERROR
145+
rem expand pattern lists to actual file lists
146+
%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
136147

137148
rem generate installer itself
138149
makensis postgresql.nsi||GOTO :ERROR

‎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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
./bin/sh.*
2+
./bin/mv.*
23
./bin/sed.*
34
./bin/pgpro_upgrade
5+
./share/pgpro-upgrade/*

‎nsis/postgresql.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ Section $(componentClient) secClient
253253

254254

255255

256-
!includeclient_list.nsi
256+
!includeallclient_list.nsi
257257
;SetOutPath "$INSTDIR\bin"
258258
;File /r ${PG_INS_SOURCE_DIR}\*.*
259259
;File /r ${PG_INS_SOURCE_DIR}\bin\*.*

‎nsis/server.files

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
./bin/pg_controldata.*
66
./bin/pg_ctl.*
77
./bin/pg_probackup.*
8-
./bin/pg_reset*.*
8+
./bin/pg_resetwal.*
99
./bin/pg_rewind.*
1010
./bin/pg_standby.*
1111
./bin/pg_test_fsync.*
1212
./bin/pg_test_timing.*
1313
./bin/pg_upgrade.*
1414
./bin/pg_waldump.*
15-
./bin/pg_verifychecksums.*
15+
./bin/pg_verify_checksums.*
1616
./bin/postgres.*
1717
./bin/postmaster.*
1818
./bin/zic.*

0 commit comments

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