Fix filelist generation to remove unpackaged files

vbwagner · vbwagner · commit 78270a1a4725 · 2018-11-13T18:47:43.000+03:00
diff --git a/build/helpers/postgres_nsis_installer.cmd b/build/helpers/postgres_nsis_installer.cmd
@@ -122,17 +122,28 @@ GOTO :ENDLIC
 
 CD /D %NSIS_RES_DIR% || GOTO :ERROR
 rem Genarate file lists
-
-type server.files > allserver.files
+rem Remove old filelists first
+rm -f *_list.nsi
+rem tune pattern lists to major version and product
+IF "%PG_MAJOR_VERSION%" == "9.6" (
+	sed "s/wal/xlog/" server.files > allserver.files
+	sed  "s/wal/xlog/" client.files > allclient.files
+	echo ./bin/createlang.* >> allclient.files
+	echo ./bin/droplang.* >> allclient.files
+) ELSE (
+    cat server.files > allserver.files
+	type client.files > allclient.files
+)
 IF NOT "%PG_MAJOR_VERSION%" == "9.6" GOTO :NO_PGPRO_UPGRADE
 IF "%PRODUCT_NAME%" == "PostgresPro" GOTO :ADD_PGPRO_UPGRADE
 IF "%PRODUCT_NAME%" == "PostgresProEnterprise" GOTO :ADD_PGPRO_UPGRADE
 GOTO :NO_PGPRO_UPGRADE
 :ADD_PGPRO_UPGRADE
-type server.files pgpro_upgrade.files > allserver.files
+type pgpro_upgrade.files >> allserver.files
 :NO_PGPRO_UPGRADE
 
-%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
+rem expand pattern lists to actual file lists
+%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
 
 rem generate installer itself
 makensis postgresql.nsi || GOTO :ERROR
diff --git a/nsis/devel.files b/nsis/devel.files
@@ -3,3 +3,4 @@
 ./bin/pg_config.*
 ./bin/ecpg.*
 ./symbols/*.pdb
+./share/errcodes.txt
diff --git a/nsis/pgpro_upgrade.files b/nsis/pgpro_upgrade.files
@@ -1,3 +1,5 @@
 ./bin/sh.*
+./bin/mv.*
 ./bin/sed.*
 ./bin/pgpro_upgrade
+./share/pgpro-upgrade/*
diff --git a/nsis/postgresql.nsi b/nsis/postgresql.nsi
@@ -253,7 +253,7 @@ Section $(componentClient) secClient
 
 
 
-  !include client_list.nsi
+  !include allclient_list.nsi
   ;SetOutPath "$INSTDIR\bin"
   ;File /r ${PG_INS_SOURCE_DIR}\*.*
   ;File /r ${PG_INS_SOURCE_DIR}\bin\*.*
diff --git a/nsis/server.files b/nsis/server.files
@@ -5,14 +5,14 @@
 ./bin/pg_controldata.*
 ./bin/pg_ctl.*
 ./bin/pg_probackup.*
-./bin/pg_reset*.*
+./bin/pg_resetwal.*
 ./bin/pg_rewind.*
 ./bin/pg_standby.*
 ./bin/pg_test_fsync.*
 ./bin/pg_test_timing.*
 ./bin/pg_upgrade.*
 ./bin/pg_waldump.*
-./bin/pg_verifychecksums.*
+./bin/pg_verify_checksums.*
 ./bin/postgres.*
 ./bin/postmaster.*
 ./bin/zic.*
