Revision: 69017
http://sourceforge.net/p/brlcad/code/69017
Author: starseeker
Date: 2016-10-11 15:28:35 +0000 (Tue, 11 Oct 2016)
Log Message:
-----------
The Desktop links to programs should be independent of the Start Menu links -
the options allow enabling/disabling them independent of each other. This
needs more testing, but a similar refactor in a smaller test case indicates
this will work to allow desktop and start menu links to be handled
independently.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/NSIS.template.in
Modified: brlcad/trunk/misc/CMake/NSIS.template.in
===================================================================
--- brlcad/trunk/misc/CMake/NSIS.template.in 2016-10-11 06:48:41 UTC (rev
69016)
+++ brlcad/trunk/misc/CMake/NSIS.template.in 2016-10-11 15:28:35 UTC (rev
69017)
@@ -712,7 +712,6 @@
Push "Contact"
Push "@CPACK_NSIS_CONTACT@"
Call ConditionalAddToRegisty
- !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP
"NSIS.InstallOptions.ini" "Field 5" "State"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
@@ -729,10 +728,6 @@
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
"$INSTDIR\Uninstall.exe"
- ${If} $INSTALL_DESKTOP == 1
- Call installdesktopicons
- ${EndIf}
-
;Read a value from an InstallOptions INI file
!insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH
"NSIS.InstallOptions.ini" "Field 2" "State"
!insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS
"NSIS.InstallOptions.ini" "Field 3" "State"
@@ -751,9 +746,6 @@
Push "AddToPathCurrentUser"
Push "$ADD_TO_PATH_CURRENT_USER"
Call ConditionalAddToRegisty
- Push "InstallToDesktop"
- Push "$INSTALL_DESKTOP"
- Call ConditionalAddToRegisty
!insertmacro MUI_STARTMENU_WRITE_END
@@ -761,6 +753,18 @@
SectionEnd
+Section "-Desktop shortcuts"
+ ;Create Desktop shortcuts
+ !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP
"NSIS.InstallOptions.ini" "Field 5" "State"
+ ${If} $INSTALL_DESKTOP == 1
+ Call installdesktopicons
+ ${EndIf}
+ ; Write special uninstall registry entries
+ Push "InstallToDesktop"
+ Push "$INSTALL_DESKTOP"
+ Call ConditionalAddToRegisty
+SectionEnd
+
Section "-Add to path"
Push $INSTDIR\bin
StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
