Author: loonycyborg
Date: Mon Sep 29 18:25:44 2008
New Revision: 29769
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29769&view=rev
Log:
Made use of MultiUser.nsh NSIS header to make mixed-mode
per-machine/per-user installer thus fixing bug #12360
Modified:
trunk/packaging/windows/Wesnoth.nsi.in (contents, props changed)
Modified: trunk/packaging/windows/Wesnoth.nsi.in
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/packaging/windows/Wesnoth.nsi.in?rev=29769&r1=29768&r2=29769&view=diff
==============================================================================
--- trunk/packaging/windows/Wesnoth.nsi.in (original)
+++ trunk/packaging/windows/Wesnoth.nsi.in Mon Sep 29 18:25:44 2008
@@ -1,12 +1,13 @@
-;--------------------------------
-;Include Modern UI
-
- !include "MUI.nsh"
+ SetCompressor /SOLID lzma
+
+ !define MULTIUSER_EXECUTIONLEVEL Highest
+ !define MULTIUSER_MUI
+ !define MULTIUSER_INSTALLMODE_COMMANDLINE
+ !include "MultiUser.nsh"
+ !include "MUI2.nsh"
;--------------------------------
;General
-
- SetCompressor /SOLID lzma
;Name and file
Name "Battle for Wesnoth"
@@ -17,8 +18,6 @@
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\Battle for Wesnoth\%version" ""
-
- RequestExecutionLevel user
;--------------------------------
;Variables
@@ -45,6 +44,7 @@
!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "COPYING"
!insertmacro MUI_PAGE_COMPONENTS
+ !insertmacro MULTIUSER_PAGE_INSTALLMODE
!insertmacro MUI_PAGE_DIRECTORY
;Start Menu Folder Page Configuration
@@ -129,6 +129,7 @@
;because this will make your installer start faster.
!insertmacro MUI_RESERVEFILE_LANGDLL
+ ReserveFile "${NSISDIR}\Plugins\*.dll"
;--------------------------------
;Installer Sections
@@ -168,6 +169,7 @@
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
+ !insertmacro MULTIUSER_INIT
FunctionEnd
@@ -214,6 +216,7 @@
Function un.onInit
+ !insertmacro MULTIUSER_UNINIT
!insertmacro MUI_UNGETLANGUAGE
FunctionEnd
Propchange: trunk/packaging/windows/Wesnoth.nsi.in
------------------------------------------------------------------------------
svn:executable = *
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
