[Commits] (bear) Fixed windows installer so that it properly
determined debug/release
commits at osafoundation.org
commits at osafoundation.org
Mon Feb 28 19:46:04 PST 2005
Commit by: bear
Modified files:
internal/installers/win/chandler.nsi 1.7 1.8
internal/installers/win/makeinstaller.sh 1.1 1.2
Log message:
Fixed windows installer so that it properly determined debug/release
when bundling files. Fixes Bug 2569 and Bug 2571.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/installers/win/chandler.nsi.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/internal/installers/win/makeinstaller.sh.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
Index: internal/installers/win/chandler.nsi
diff -u internal/installers/win/chandler.nsi:1.7 internal/installers/win/chandler.nsi:1.8
--- internal/installers/win/chandler.nsi:1.7 Tue Feb 22 09:17:28 2005
+++ internal/installers/win/chandler.nsi Mon Feb 28 19:46:03 2005
@@ -1,15 +1,23 @@
-; $Revision: 1.7 $
-; $Date: 2005/02/22 17:17:28 $
+; $Revision: 1.8 $
+; $Date: 2005/03/01 03:46:03 $
; Copyright (c) 2004,2005 Open Source Applications Founation
; http://osafoundation.org/Chandler_0.1_license_terms.htm
; Script generated by the HM NIS Edit Script Wizard.
+!ifdef SNAP_DEBUG
+ !define PRODUCT_BINARY "chandlerDebug.exe"
+ !define SNAP "debug"
+!else
+ !define PRODUCT_BINARY "chandler.exe"
+ !define SNAP "release"
+!endif
+
!define PRODUCT_NAME "Chandler"
!define PRODUCT_VERSION "0.4+"
!define PRODUCT_PUBLISHER "Open Source Applications Foundation"
!define PRODUCT_WEB_SITE "http://osafoundation.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\chandler.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_BINARY}"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -28,11 +36,11 @@
; Wizard pages
!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\..\..\Chandler\LICENSE.txt"
+!insertmacro MUI_PAGE_LICENSE "..\..\..\${DISTRIB_DIR}\LICENSE.txt"
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_RUN "$INSTDIR\chandler.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_BINARY}"
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.win.txt"
!define MUI_PAGE_CUSTOMFUNCTION_PRE "change_cancel_text"
@@ -72,25 +80,28 @@
Section "MainSection" SEC01
SetOutPath "$INSTDIR"
- File "..\..\..\Chandler\*.*"
-
+ File "..\..\..\${DISTRIB_DIR}\*.py"
+ File "..\..\..\${DISTRIB_DIR}\${PRODUCT_BINARY}"
+ File "..\..\..\${DISTRIB_DIR}\LICENSE.txt"
+ File "..\..\..\${DISTRIB_DIR}\README.win.txt"
+
; this could be handled completely by the above line
; if the /r option was used - I kept them as individual
; items to better document what sub-folders are included
; NOTE: any File entry added here also needs to be added
; to the uninstall section below
- File /r "..\..\..\Chandler\application"
- File /r "..\..\..\Chandler\crypto"
- File /r "..\..\..\Chandler\release"
- File /r "..\..\..\Chandler\locale"
- File /r "..\..\..\Chandler\parcels"
- File /r "..\..\..\Chandler\repository"
- File /r "..\..\..\Chandler\tools"
+ File /r "..\..\..\${DISTRIB_DIR}\application"
+ File /r "..\..\..\${DISTRIB_DIR}\crypto"
+ File /r "..\..\..\${DISTRIB_DIR}\${SNAP}"
+ File /r "..\..\..\${DISTRIB_DIR}\locale"
+ File /r "..\..\..\${DISTRIB_DIR}\parcels"
+ File /r "..\..\..\${DISTRIB_DIR}\repository"
+ File /r "..\..\..\${DISTRIB_DIR}\tools"
CreateDirectory "$SMPROGRAMS\Chandler"
- CreateShortCut "$SMPROGRAMS\Chandler\Chandler.lnk" "$INSTDIR\chandler.exe"
- CreateShortCut "$DESKTOP\Chandler.lnk" "$INSTDIR\chandler.exe"
+ CreateShortCut "$SMPROGRAMS\Chandler\Chandler.lnk" "$INSTDIR\${PRODUCT_BINARY}"
+ CreateShortCut "$DESKTOP\Chandler.lnk" "$INSTDIR\${PRODUCT_BINARY}"
SectionEnd
; create the uninstall shortcut - done here so that it will only
@@ -104,10 +115,10 @@
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\chandler.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_BINARY}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
- WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\chandler.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_BINARY}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -133,18 +144,18 @@
Delete "$DESKTOP\Chandler.lnk"
Delete "$SMPROGRAMS\Chandler\Chandler.lnk"
- Delete "$INSTDIR\*.*"
-
RMDir "$SMPROGRAMS\Chandler"
RMDir /r "$INSTDIR\application"
RMDir /r "$INSTDIR\crypto"
- RMDir /r "$INSTDIR\release"
+ RMDir /r "$INSTDIR\${SNAP}"
RMDir /r "$INSTDIR\locale"
RMDir /r "$INSTDIR\parcels"
RMDir /r "$INSTDIR\repository"
RMDir /r "$INSTDIR\tools"
+ Delete "$INSTDIR\*.*"
+
RMDir "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
Index: internal/installers/win/makeinstaller.sh
diff -u internal/installers/win/makeinstaller.sh:1.1 internal/installers/win/makeinstaller.sh:1.2
--- internal/installers/win/makeinstaller.sh:1.1 Wed Feb 23 20:50:40 2005
+++ internal/installers/win/makeinstaller.sh Mon Feb 28 19:46:03 2005
@@ -6,16 +6,17 @@
# windows command shell
#
-NSI_PATH="$1"
-NSI_FILE="$2"
+NSI_OPTION="$1"
+NSI_PATH="$2"
+NSI_FILE="$3"
if [ -z "$NSI_FILE" ]; then
echo
- echo "usage: $0 <path to .nsi file> <.nsi file>"
+ echo "usage: $0 <snap_option> <path to .nsi file> <.nsi file>"
echo
exit 1
fi
cd $NSI_PATH
-makensis $NSI_FILE
+makensis $NSI_OPTION $NSI_FILE
More information about the Commits
mailing list