Browse Source

Update build scripts to (potentially) allow 64 bit Windows installers.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7597 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 12 years ago
parent
commit
8b708ccc8e
  1. 4
      prism/Makefile
  2. 16
      prism/src/nsis_script.nsi

4
prism/Makefile

@ -444,9 +444,9 @@ dist_copy:
fi fi
dist_bin_copy: dist_bin_copy:
@if [ "$(BINDISTSUFFIX)" = "win" ]; then \
@if [ "$(BINDISTSUFFIX)" = "win32" -o "$(BINDISTSUFFIX)" = "win64" ]; then \
echo Building NSIS Windows installer... && \ echo Building NSIS Windows installer... && \
makensis /NOCD /DPRISM_NAME="PRISM $(VERSION)" /DPRISM_BUILD="prism-$(VERSION)" /DPRISM_DIR="" src/nsis_script.nsi; \
makensis /NOCD /DPRISM_NAME="PRISM $(VERSION)" /DPRISM_BUILD="prism-$(VERSION)" /DPRISM_BINDISTSUFFIX="$(BINDISTSUFFIX)" /DPRISM_DIR="" src/nsis_script.nsi; \
else \ else \
BIN_DIST_DIR=`/bin/pwd | sed 's/-src$$//'`"-$(BINDISTSUFFIX)" && \ BIN_DIST_DIR=`/bin/pwd | sed 's/-src$$//'`"-$(BINDISTSUFFIX)" && \
BIN_DIST_DIR_NAME=`basename $$BIN_DIST_DIR` && \ BIN_DIST_DIR_NAME=`basename $$BIN_DIST_DIR` && \

16
prism/src/nsis_script.nsi

@ -2,13 +2,15 @@
; You should always call makensis in the following way: ; You should always call makensis in the following way:
; ;
; > makensis /NOCD /DPRISM_NAME="PRISM X.y" /DPRISM_BUILD="prism-X.y"
; /DPRISM_DIR="" installer_script.nsi
; > makensis /NOCD /DPRISM_NAME="PRISM X.y" /DPRISM_BUILD="prism-X.y"
; /DPRISM_BINDISTSUFFIX="winXX" /DPRISM_DIR="" installer_script.nsi
; ;
; Where "PRISM X.y" is the name of the program displayed to the user, prism-3.0
; is the name of the build (no spaces). The PRISM_DIR variable should be set
; to "" if the working directory is the prism directory or to the prism
; directory otherwise (ending with `\').
; where:
; * PRISM X.y" is the name of the program displayed to the user
; * prism-3.0 is the4 name of the build (no spaces)
; * winXX is win32 or win6
; The PRISM_DIR variable should be set to "" if the working directory
; is the prism directory or to the prism directory otherwise (ending with `\').
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
@ -23,7 +25,7 @@ UninstPage instfiles
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
Name "${PRISM_NAME}" Name "${PRISM_NAME}"
OutFile "..\${PRISM_BUILD}-win-installer.exe"
OutFile "..\${PRISM_BUILD}-${PRISM_BINDISTSUFFIX}-installer.exe"
CRCCheck on CRCCheck on

Loading…
Cancel
Save