# HG changeset patch # User Neil Muller # Date 1378658830 -7200 # Node ID 03fc9cf0f556ffd18b3f2e52d2aee932aff98df8 # Parent 62b9eac8e236afc2854e04ff996d86eb94a8b599 We have icons now, so I suppose is needed. diff -r 62b9eac8e236 -r 03fc9cf0f556 packaging/nagslang.nsi --- 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}" diff -r 62b9eac8e236 -r 03fc9cf0f556 setup.py --- 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={