Commit5f35b7f

committed

Changes after testing install

1 parentd01c6cd commit5f35b7fCopy full SHA for 5f35b7f

File tree

-24

lines changed

-24

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@`
`42`	`42`	`forfinsorted(found):`
`43`	`43`	`filedir=os.path.dirname(f)`
`44`	`44`	`iffiledir!=curdir:`
`45`		`-print>>out,"SetOutDir ${INSTDIR}"+filedir[1:]`
	`45`	`+print>>out,"SetOutPath $INSTDIR"+filedir[1:].replace("/","\\")`
`46`	`46`	`curdir=filedir`
`47`		`-print>>out,"File ${PG_INS_SOURCE_DIR}"+f[1:]`
	`47`	`+print>>out,"File ${PG_INS_SOURCE_DIR}"+f[1:].replace("/","\\")`
`48`	`48`
`49`	`49`	`# When all module files are processed:`
`50`	`50`	`iflen(filelist):`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ SET PG_DEF_PORT="%DEFAULT_PORT%"`
`56`	`56`	`SETPG_DEF_SUPERUSER="%DEFAULT_USER%"`
`57`	`57`	`SETPG_DEF_SERVICEACCOUNT="NT AUTHORITY\NetworkService"`
`58`	`58`	`SETPG_DEF_BRANDING="%PRODUCT_NAME%%PG_MAJOR_VERSION% (%BITS%)"`
`59`		`-SETPG_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`	`+SETPG_INS_SOURCE_DIR="%BUILD_DIR%\distr_%ARCH%_%PG_DEF_VERSION%\postgresql"`
`60`	`61`
`61`	`62`	`SETNSIS_RES_DIR=%~dp0`
`62`	`63`	`SETNSIS_RES_DIR=%NSIS_RES_DIR:~0,-1%`
`@@ -98,7 +99,7 @@ IF "%ARCH%" == "X64" (`
`98`	`99`
`99`	`100`	`CD /D%NSIS_RES_DIR%\|\|GOTO :ERROR`
`100`	`101`	`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`
`102`	`103`
`103`	`104`	`rem generate installer itself`
`104`	`105`	`makensis postgresql.nsi\|\|GOTO :ERROR`

Lines changed: 0 additions & 4 deletions

This file was deleted.

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,9 @@ Section $(PostgreSQLString) sec1`
`303`	`303`	`${endif}`
`304`	`304`
`305`	`305`	`!include server_list.nsi`
	`306`	`+ !include plperl_list.nsi`
	`307`	`+ !include plpython2_list.nsi`
	`308`	`+`
`306`	`309`	`;SetOutPath "$INSTDIR"`
`307`	`310`	`;File /r ${PG_INS_SOURCE_DIR}\.`
`308`	`311`	`;File /r ${PG_INS_SOURCE_DIR}\bin\.`

Lines changed: 0 additions & 16 deletions

This file was deleted.

Comments

(0)