Skip to content

Commit 5f35b7f

Browse files
VictorSpirinVictorSpirin
committed
Changes after testing install
1 parent d01c6cd commit 5f35b7f

File tree

5 files changed

+8
-24
lines changed

5 files changed

+8
-24
lines changed

‎build/helpers/genlists.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
for f in sorted(found):
4343
filedir=os.path.dirname(f)
4444
if filedir !=curdir:
45-
print >>out,"SetOutDir ${INSTDIR}"+filedir[1:]
45+
print >>out,"SetOutPath $INSTDIR"+filedir[1:].replace("/","\\")
4646
curdir=filedir
47-
print >>out, "File ${PG_INS_SOURCE_DIR}"+f[1:]
47+
print >>out, "File ${PG_INS_SOURCE_DIR}"+f[1:].replace("/","\\")
4848

4949
# When all module files are processed:
5050
if len(filelist):

‎build/helpers/postgres_nsis_installer.cmd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ SET PG_DEF_PORT="%DEFAULT_PORT%"
5656
SET PG_DEF_SUPERUSER="%DEFAULT_USER%"
5757
SET PG_DEF_SERVICEACCOUNT="NT AUTHORITY\NetworkService"
5858
SET PG_DEF_BRANDING="%PRODUCT_NAME% %PG_MAJOR_VERSION% (%BITS%)"
59-
SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql\*.*"
59+
rem SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql\*.*"
60+
SET PG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql"
6061

6162
SET NSIS_RES_DIR=%~dp0
6263
SET NSIS_RES_DIR=%NSIS_RES_DIR:~0,-1%
@@ -98,7 +99,7 @@ IF "%ARCH%" == "X64" (
9899

99100
CD /D %NSIS_RES_DIR% || GOTO :ERROR
100101
rem Genarate file lists
101-
%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %INSTDIR% client.files devel.files plperl.files plpython2.files plpython3.files unneeded.files server.files
102+
%PYTHON64_PATH%/python %ROOT%/build/helpers/genlists.py %PG_INS_SOURCE_DIR% client.files devel.files plperl.files plpython2.files plpython3.files unneeded.files server.files
102103

103104
rem generate installer itself
104105
makensis postgresql.nsi || GOTO :ERROR

‎nsis/clientlist.nsi

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎nsis/postgresql.nsi

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,9 @@ Section $(PostgreSQLString) sec1
303303
${endif}
304304

305305
!include server_list.nsi
306+
!include plperl_list.nsi
307+
!include plpython2_list.nsi
308+
306309
;SetOutPath "$INSTDIR"
307310
;File /r ${PG_INS_SOURCE_DIR}\*.*
308311
;File /r ${PG_INS_SOURCE_DIR}\bin\*.*

‎nsis/serverlist.nsi

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)