Author: loonycyborg
Date: Thu Sep 25 19:20:31 2008
New Revision: 29681
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29681&view=rev
Log:
Made NSIS installer append wesnoth version to installation directory and
registry key name.
Modified:
trunk/packaging/windows/Wesnoth.nsi.in
Modified: trunk/packaging/windows/Wesnoth.nsi.in
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/packaging/windows/Wesnoth.nsi.in?rev=29681&r1=29680&r2=29681&view=diff
==============================================================================
--- trunk/packaging/windows/Wesnoth.nsi.in (original)
+++ trunk/packaging/windows/Wesnoth.nsi.in Thu Sep 25 19:20:31 2008
@@ -1,7 +1,3 @@
-;NSIS Modern User Interface
-;Multilingual Example Script
-;Written by Joost Verburg
-
;--------------------------------
;Include Modern UI
@@ -14,13 +10,13 @@
;Name and file
Name "Battle for Wesnoth"
- OutFile "wesnoth-1.5-win32.exe"
+ OutFile "wesnoth-%version-win32.exe"
;Default installation folder
- InstallDir "$PROGRAMFILES\Battle for Wesnoth"
+ InstallDir "$PROGRAMFILES\Battle for Wesnoth %version"
;Get installation folder from registry if available
- InstallDirRegKey HKCU "Software\Battle for Wesnoth" ""
+ InstallDirRegKey HKCU "Software\Battle for Wesnoth\%version" ""
RequestExecutionLevel user
@@ -40,7 +36,7 @@
;Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
- !define MUI_LANGDLL_REGISTRY_KEY "Software\Battle for Wesnoth"
+ !define MUI_LANGDLL_REGISTRY_KEY "Software\Battle for Wesnoth\%version"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
;--------------------------------
@@ -53,7 +49,7 @@
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
- !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Battle for Wesnoth"
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Battle for
Wesnoth\%version"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
@@ -147,7 +143,7 @@
%NSIS_INSTALL_FILES
;Store installation folder
- WriteRegStr HKCU "Software\Battle for Wesnoth" "" $INSTDIR
+ WriteRegStr HKCU "Software\Battle for Wesnoth\%version" "" $INSTDIR
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -208,6 +204,7 @@
Delete "$SMPROGRAMS\$StartMenuFolder\Battle for Wesnoth.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
+ DeleteRegKey /ifempty HKCU "Software\Battle for Wesnoth\%version"
DeleteRegKey /ifempty HKCU "Software\Battle for Wesnoth"
SectionEnd
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
