From 97845ad1dc5d6115b14ff3f4ea23b45c2bcb3331 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 20 May 2009 18:08:59 +0000 Subject: [PATCH] Initial part of new configuration system. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3398 --- scripts/dosbox-installer.nsi | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/scripts/dosbox-installer.nsi b/scripts/dosbox-installer.nsi index 206d4768..8c4b9ff8 100644 --- a/scripts/dosbox-installer.nsi +++ b/scripts/dosbox-installer.nsi @@ -2,10 +2,10 @@ !define VER_MINOR 72 !define APP_NAME "DOSBox ${VER_MAYOR}.${VER_MINOR} Installer" !define COMP_NAME "DOSBox Team" -!define COPYRIGHT "Copyright © 2002-2008 DOSBox Team" +!define COPYRIGHT "Copyright © 2002-2009 DOSBox Team" !define DESCRIPTION "DOSBox Installer" -VIProductVersion "${VER_MAYOR}.${VER_MINOR}.0.0" +VIProductVersion "${VER_MAYOR}.73.0.0" VIAddVersionKey "ProductName" "${APP_NAME}" VIAddVersionKey "CompanyName" "${COMP_NAME}" VIAddVersionKey "FileDescription" "${DESCRIPTION}" @@ -32,10 +32,13 @@ LicenseText "DOSBox v${VER_MAYOR}.${VER_MINOR} License" "Next >" ; Else vista enables compatibility mode RequestExecutionLevel admin +; Shortcuts in all users ComponentText "Select components for DOSBox" ; The stuff to install Section "!Core files" Core +SetShellVarContext all + ; Set output path to the installation directory. ClearErrors SetOutPath $INSTDIR @@ -44,7 +47,6 @@ Section "!Core files" Core ; Put file there - CreateDirectory "$INSTDIR\capture" CreateDirectory "$INSTDIR\zmbv" File /oname=README.txt README File /oname=COPYING.txt COPYING @@ -53,7 +55,6 @@ Section "!Core files" Core File /oname=AUTHORS.txt AUTHORS File /oname=INSTALL.txt INSTALL File DOSBox.exe - File dosbox.conf File SDL.dll File SDL_net.dll File /oname=zmbv\zmbv.dll zmbv.dll @@ -62,12 +63,14 @@ Section "!Core files" Core CreateDirectory "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}" CreateDirectory "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Video" + CreateDirectory "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Configuration" CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox.lnk" "$INSTDIR\DOSBox.exe" "-conf $\"$INSTDIR\dosbox.conf$\"" "$INSTDIR\DOSBox.exe" 0 - CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox (noconsole).lnk" "$INSTDIR\DOSBox.exe" "-noconsole -conf $\"$INSTDIR\dosbox.conf$\"" "$INSTDIR\DOSBox.exe" 0 + CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox.lnk" "$INSTDIR\DOSBox.exe" "" "$INSTDIR\DOSBox.exe" 0 + CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox (noconsole).lnk" "$INSTDIR\DOSBox.exe" "-noconsole" "$INSTDIR\DOSBox.exe" 0 CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\README.lnk" "$INSTDIR\README.txt" - CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox.conf.lnk" "notepad.exe" "$INSTDIR\dosbox.conf" - CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Capture folder.lnk" "$INSTDIR\capture" + CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Configuration\Edit Configuration.lnk" "$INSTDIR\DOSBox.exe" "-editconf notepad.exe" + CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Configuration\Reset Configuration.lnk" "$INSTDIR\DOSBox.exe" "-eraseconf" + CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Capture folder.lnk" "$INSTDIR\DOSBox.exe" "-opencaptures explorer.exe" CreateShortCut "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Video\Video instructions.lnk" "$INSTDIR\zmbv\README.txt" ;change outpath so the working directory gets set to zmbv SetOutPath "$INSTDIR\zmbv" @@ -97,8 +100,9 @@ end_section: SectionEnd ; end the section Section "Desktop Shortcut" SecDesktop +SetShellVarContext all -CreateShortCut "$DESKTOP\DOSBox ${VER_MAYOR}.${VER_MINOR}.lnk" "$INSTDIR\DOSBox.exe" "-conf $\"$INSTDIR\dosbox.conf$\"" "$INSTDIR\DOSBox.exe" 0 +CreateShortCut "$DESKTOP\DOSBox ${VER_MAYOR}.${VER_MINOR}.lnk" "$INSTDIR\DOSBox.exe" "" "$INSTDIR\DOSBox.exe" 0 SectionEnd ; end the section @@ -106,6 +110,10 @@ CreateShortCut "$DESKTOP\DOSBox ${VER_MAYOR}.${VER_MINOR}.lnk" "$INSTDIR\DOSBox. UninstallText "This will uninstall DOSBox v${VER_MAYOR}.${VER_MINOR}. Hit next to continue." Section "Uninstall" + +; Shortcuts in all users +SetShellVarContext all + Delete "$DESKTOP\DOSBox ${VER_MAYOR}.${VER_MINOR}.lnk" ; remove registry keys ; remove files @@ -116,7 +124,6 @@ Section "Uninstall" Delete $INSTDIR\AUTHORS.txt Delete $INSTDIR\INSTALL.txt Delete $INSTDIR\DOSBox.exe - Delete $INSTDIR\dosbox.conf Delete $INSTDIR\SDL.dll Delete $INSTDIR\SDL_net.dll Delete $INSTDIR\zmbv\zmbv.dll @@ -134,14 +141,15 @@ Section "Uninstall" Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\README.lnk" Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox.lnk" Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox (noconsole).lnk" - Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\DOSBox.conf.lnk" + Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Configuration\Edit Configuration.lnk" + Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Configuration\Reset Configuration.lnk" Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Capture folder.lnk" Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Video\Install movie codec.lnk" Delete "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Video\Video instructions.lnk" ; remove directories used. RMDir "$INSTDIR\zmbv" - RMDir "$INSTDIR\capture" RMDir "$INSTDIR" + RMDir "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Configuration" RMDir "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}\Video" RMDir "$SMPROGRAMS\DOSBox-${VER_MAYOR}.${VER_MINOR}" SectionEnd