aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLittleboy2011-04-28 05:16:19 -0400
committerLittleboy2011-04-28 05:16:31 -0400
commitd69334776545977a14e54a9b467f8da4e0d3438e (patch)
tree0d8b9970928ac2ce62dbde881440d178d7c0d5f7
parent8a02cf47320a9c2e8b6601ed61ee4d8264f4de09 (diff)
downloadscummvm-rg350-d69334776545977a14e54a9b467f8da4e0d3438e.tar.gz
scummvm-rg350-d69334776545977a14e54a9b467f8da4e0d3438e.tar.bz2
scummvm-rg350-d69334776545977a14e54a9b467f8da4e0d3438e.zip
DISTS: Update NSIS installer shortcut creation
- Fix missing CreateDirectory directive to create the base shortcut folder - Add Readme to the list of shortcuts
-rw-r--r--dists/nsis/scummvm.nsi6
-rw-r--r--dists/nsis/scummvm.nsi.in6
2 files changed, 8 insertions, 4 deletions
diff --git a/dists/nsis/scummvm.nsi b/dists/nsis/scummvm.nsi
index a83cd251e0..a1e8ef46ff 100644
--- a/dists/nsis/scummvm.nsi
+++ b/dists/nsis/scummvm.nsi
@@ -237,7 +237,9 @@ Section -post SecMainPost
SetOutPath $INSTDIR
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
- CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\$(^Name).exe" "" "$INSTDIR\$(^Name).exe" 0 ; Create shortcut with icon
+ CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\$(^Name).exe
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk" $INSTDIR\README.txt
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -255,7 +257,7 @@ SectionEnd
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
-!ifdef _DEBUG
+!ifdef _DEBUG && NSIS_CONFIG_LOG
LogSet on ; Will write a log file to the install folder (when using the special NSIS logging build)
!endif
FunctionEnd
diff --git a/dists/nsis/scummvm.nsi.in b/dists/nsis/scummvm.nsi.in
index eca619c312..9f92d27c3d 100644
--- a/dists/nsis/scummvm.nsi.in
+++ b/dists/nsis/scummvm.nsi.in
@@ -237,7 +237,9 @@ Section -post SecMainPost
SetOutPath $INSTDIR
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
- CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" "$INSTDIR\$(^Name).exe" "" "$INSTDIR\$(^Name).exe" 0 ; Create shortcut with icon
+ CreateDirectory "$SMPROGRAMS\$StartMenuGroup"
+ CreateShortCut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\$(^Name).exe
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Readme.lnk" $INSTDIR\README.txt
CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
@@ -255,7 +257,7 @@ SectionEnd
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
-!ifdef _DEBUG
+!ifdef _DEBUG && NSIS_CONFIG_LOG
LogSet on ; Will write a log file to the install folder (when using the special NSIS logging build)
!endif
FunctionEnd