Mercurial > nagslang

changeset 674:03fc9cf0f556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
We have icons now, so I suppose is needed.
author Neil Muller <drnlmuller@gmail.com>
date Sun, 08 Sep 2013 18:47:10 +0200
parents 62b9eac8e236
children 224608ca8447
files packaging/nagslang.nsi setup.py
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packaging/nagslang.nsi	Sun Sep 08 18:15:26 2013 +0200
+++ b/packaging/nagslang.nsi	Sun Sep 08 18:47:10 2013 +0200
@@ -28,6 +28,8 @@
 
   !define COMBINED_LICENSE "../LICENSE.txt"
   !define WS_PY2EXE_ZIP "nagslang-${WS_VERSION}.zip"
+  !define WS_ICON "../data/icons/werewolf-sonata.ico"
+  !define WS_WINDOWS_ICON "data\icons\werewolf-sonata.ico"
   !define VCREDIST "vcredist_x86.exe"
   !define VCREDIST_KEY "{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}"
   !define UNINSTALLER "Uninstaller.exe"
@@ -47,6 +49,7 @@
 
 ; Other Stuff
 
+  Icon "${WS_ICON}"
   SetCompress off ; all the big stuff is already compressed
 
 ; Installer Sections
@@ -83,6 +86,7 @@
   WriteUninstaller "$INSTDIR\${UNINSTALLER}"
 
   File "${DIST_FOLDER}\${WS_PY2EXE_ZIP}"
+  File "${WS_ICON}"
 
   ZipDLL::extractall "$INSTDIR\${WS_PY2EXE_ZIP}" "$INSTDIR"
   Delete "$INSTDIR\${WS_PY2EXE_ZIP}"
@@ -94,7 +98,7 @@
   #   keyboard_shortcut description
 
   CreateShortCut "$SMPROGRAMS\Werewolf Sonata\Werewolf Sonata ${WS_VERSION}.lnk" "$INSTDIR\${WS_UNPACK}\nagslang.exe" \
-     "" "" "" SW_SHOWNORMAL \
+     "" "$INSTDIR\${WS_UNPACK}\${WS_WINDOWS_ICON}" "" SW_SHOWNORMAL \
      "" "Werewolf Sonata"
 
   CreateShortCut "$SMPROGRAMS\Werewolf Sonata\Uninstall Werewolf Sonata ${WS_VERSION}.lnk" "$INSTDIR\${UNINSTALLER}" \
@@ -104,10 +108,13 @@
 SectionEnd
 
 UninstallText "This will uninstall Werewolf Sonata ${WS_VERSION}."
+UninstallIcon "${WS_ICON}"
 
 Section "Uninstall"
   ; Delete files not deleted during install
 
+  Delete "$INSTDIR\${WS_ICON}"
+
   ; Remove py2exe folder
   RMDir /r /REBOOTOK "$INSTDIR\${WS_UNPACK}"
 
--- a/setup.py	Sun Sep 08 18:15:26 2013 +0200
+++ b/setup.py	Sun Sep 08 18:47:10 2013 +0200
@@ -84,6 +84,7 @@
     # py2exe
     windows=[{
         'script': 'scripts/nagslang',
+        'icon_resources': [(0, "data/icons/werewolf-sonata.ico")],
     }],
     app=['scripts/nagslang'],
     options={