[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1600-g5ab40cc

The ghostpdl branch, master has been updated
       via  5ab40cc018d8ac76758cebc7b4962e9b19fffc86 (commit)
      from  863d77f731c6144dcf139e06e64a857754d8327f (commit)

----------------------------------------------------------------------
commit 5ab40cc018d8ac76758cebc7b4962e9b19fffc86
Author: Chris Liddell <[email protected]>
Date:   Fri Aug 23 10:11:05 2019 +0100

    Windows Installer: cope with COMPILE_INITS=0
    
    We default to COMPILE_INITS=1, and that was the only case that the installer
    handled - i.e. building the installer with COMPILE_INITS=0 would install an
    executable that wouldn't work without extra action (-I.. or similar).
    
    This changes the installer compiler invocation, and the installer creation
    so it behaves as it does now with COMPILE_INITS=1, but with COMPILE_INITS=0 the
    installer will write the path to Resource/Init into the GS_LIB registry
    key.

diff --git a/psi/nsisinst.nsi b/psi/nsisinst.nsi
index b90dbcd..e26d66c 100644
--- a/psi/nsisinst.nsi
+++ b/psi/nsisinst.nsi
@@ -105,6 +105,11 @@
 !define VERSION 8.99
 !endif
 
+; Defaulting to 0 is the safer option
+!ifndef COMPILE_INITS
+!define COMPILE_INITS 0
+!endif
+
 SetCompressor /SOLID /FINAL lzma
 XPStyle on
 CRCCheck on
@@ -191,7 +196,13 @@ File /oname=bin\gswin${WINTYPE}c.exe .\bin\gswin${WINTYPE}c.exe
 !endif
 
 WriteRegStr HKEY_LOCAL_MACHINE "Software\GPL Ghostscript\${VERSION}" "GS_DLL" "$INSTDIR\bin\gsdll${WINTYPE}.dll"
+
+!if "${COMPILE_INITS}" == "0"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\GPL Ghostscript\${VERSION}" "GS_LIB" "$INSTDIR\Resource\Init;$INSTDIR\bin;$INSTDIR\lib;$INSTDIR\fonts"
+!else
 WriteRegStr HKEY_LOCAL_MACHINE "Software\GPL Ghostscript\${VERSION}" "GS_LIB" "$INSTDIR\bin;$INSTDIR\lib;$INSTDIR\fonts"
+!endif
+
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Artifex\GPL Ghostscript\${VERSION}" "" "$INSTDIR"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript ${VERSION}" "DisplayName" "GPL Ghostscript"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript ${VERSION}" "UninstallString" '"$INSTDIR\uninstgs.exe"'
diff --git a/psi/winint.mak b/psi/winint.mak
index 4db99d2..08452e5 100644
--- a/psi/winint.mak
+++ b/psi/winint.mak
@@ -186,7 +186,7 @@ $(PSOBJ)zwinutf8.$(OBJ) : $(PSSRC)zwinutf8.c $(OP)\
 # -------------------- NSIS Installer -------------------------------- #
 nsis: $(PSSRC)nsisinst.nsi $(GSCONSOLE_XE) $(GS_ALL) $(GS_XE) $(GSDLL_DLL) $(BINDIR)\$(GSDLL).lib \
       $(WININT_MAK)
-	$(MAKENSIS_XE) -NOCD -DTARGET=$(NSISTARGET) -DVERSION=$(GS_DOT_VERSION) $(PSSRC)nsisinst.nsi
+	$(MAKENSIS_XE) -NOCD -DTARGET=$(NSISTARGET) -DVERSION=$(GS_DOT_VERSION) -DCOMPILE_INITS=$(COMPILE_INITS) $(PSSRC)nsisinst.nsi
 !if defined(KEYFILE) && defined(KEYPWORD) && defined(TIMESTAMP)
         signtool sign -f $(KEYFILE) /p $(KEYPWORD) /t $(TIMESTAMP) $(NSISTARGET)$(XE)
 !endif


Summary of changes:
 psi/nsisinst.nsi | 11 +++++++++++
 psi/winint.mak   |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)