diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-18 22:21:39 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-18 22:21:39 +0000 |
| commit | d789041268eb664763d945339958cbd3c4ce8a76 (patch) | |
| tree | 77f0b311532b40023c8667e1fd3676c0eb488ae0 /packaging | |
| parent | Packaging: Re-enable the option to select between "Full", "Optimal" and "Mini... (diff) | |
| download | inkscape-d789041268eb664763d945339958cbd3c4ce8a76.tar.gz inkscape-d789041268eb664763d945339958cbd3c4ce8a76.zip | |
Packaging: Add option not to create a shortcut in the start menu and order installation components slightlymore intuitive
(bzr r15244.1.14)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/win32/inkscape.nsi | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 6aa9c9ed0..9f2c00727 100755 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -410,8 +410,21 @@ Section "$(Alluser)" SecAlluser ; Then offer the user the option to make it glob !endif SectionEnd ; SecAllUser }}} +Section /o "$(DeletePrefs)" SecPrefs ; Delete user preferences before installation {{{ +!ifndef DUMMYINSTALL + !insertmacro delprefs +!endif +SectionEnd ; SecPrefs }}} + SectionGroup "$(Shortcuts)" SecShortcuts ; Create shortcuts for the user {{{ +Section "$(Startmenu)" SecStartMenu ; Start menu shortcut {{{ + SectionIn 1 2 3 +!ifndef DUMMYINSTALL + CreateShortcut $SMPROGRAMS\Inkscape.lnk $INSTDIR\inkscape.exe +!endif +SectionEnd ; SecStartMenu }}} + Section "$(Desktop)" SecDesktop ; Desktop shortcut {{{ SectionIn 1 2 3 !ifndef DUMMYINSTALL @@ -468,12 +481,6 @@ SectionEnd ; SecContextMenu }}} SectionGroupEnd ; SecShortcuts }}} -Section /o "$(DeletePrefs)" SecPrefs ; Delete user preferences before installation {{{ -!ifndef DUMMYINSTALL - !insertmacro delprefs -!endif -SectionEnd ; SecPrefs }}} - Section "$(Python)" SecPython ; Python distribution {{{ SectionIn 1 2 !ifndef DUMMYINSTALL @@ -603,9 +610,6 @@ Section -FinalizeInstallation ; Hidden, mandatory section to finalize installati WriteRegStr SHCTX "${INSTDIR_KEY}" askMultiUser $askMultiUser WriteRegStr SHCTX "${INSTDIR_KEY}" User $User - ; start menu entries - CreateShortcut $SMPROGRAMS\Inkscape.lnk $INSTDIR\inkscape.exe - ; uninstall settings ; WriteUninstaller $INSTDIR\uninst.exe WriteRegExpandStr SHCTX "${UNINST_KEY}" UninstallString ${UNINST_EXE} @@ -658,6 +662,7 @@ SectionEnd ; -FinalizeInstallation }}} !insertmacro MUI_DESCRIPTION_TEXT ${SecGTK} "$(GTKFilesDesc)" !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "$(ShortcutsDesc)" !insertmacro MUI_DESCRIPTION_TEXT ${SecAlluser} "$(AlluserDesc)" + !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} "$(StartmenuDesc)" !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(DesktopDesc)" !insertmacro MUI_DESCRIPTION_TEXT ${SecQuickLaunch} "$(QuicklaunchDesc)" !insertmacro MUI_DESCRIPTION_TEXT ${SecSVGWriter} "$(SVGWriterDesc)" |