diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-18 21:47:18 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2016-10-18 21:47:18 +0000 |
| commit | 7906a417c479ffb13b903996a4277254684d12da (patch) | |
| tree | 2feed4ac62eec02dd11498f5081dd7cc75612594 /packaging | |
| parent | Packaging: Make all available languages accessible in NSIS installer (diff) | |
| download | inkscape-7906a417c479ffb13b903996a4277254684d12da.tar.gz inkscape-7906a417c479ffb13b903996a4277254684d12da.zip | |
Packaging: Re-enable the option to select between "Full", "Optimal" and "Minimal" translations in NSIS installer
By default pre-select "Optimal" which disables all translations but the one selected by the user for the installer.
(bzr r15244.1.13)
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/win32/inkscape.nsi | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 59be4ae35..6aa9c9ed0 100755 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -23,7 +23,7 @@ ; Define this to make it build quickly, not including any of the files or code in the sections, ; for quick testing of features of the installer and development thereof. -!define DUMMYINSTALL +;!define DUMMYINSTALL ; Installer code {{{1 @@ -86,9 +86,9 @@ LicenseForceSelection off !insertmacro MUI_PAGE_LICENSE ..\..\Copying ; Components page {{{6 !insertmacro MUI_PAGE_COMPONENTS -; InstType "$(Full)" -; InstType "$(Optimal)" -; InstType "$(Minimal)" +InstType "$(Full)" +InstType "$(Optimal)" +InstType "$(Minimal)" ;Directory page {{{6 !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page {{{6 @@ -413,12 +413,14 @@ SectionEnd ; SecAllUser }}} SectionGroup "$(Shortcuts)" SecShortcuts ; Create shortcuts for the user {{{ Section "$(Desktop)" SecDesktop ; Desktop shortcut {{{ + SectionIn 1 2 3 !ifndef DUMMYINSTALL CreateShortCut $DESKTOP\Inkscape.lnk $INSTDIR\inkscape.exe !endif SectionEnd ; SecDesktop }}} Section "$(Quicklaunch)" SecQuickLaunch ; Quick Launch shortcut {{{ + SectionIn 1 2 3 !ifndef DUMMYINSTALL ${IfThen} $QUICKLAUNCH != $TEMP ${|} CreateShortCut $QUICKLAUNCH\Inkscape.lnk $INSTDIR\inkscape.exe ${|} !endif @@ -534,7 +536,7 @@ SectionGroupEnd ; SecAddfiles }}} SectionGroup "$(Languages)" SecLanguages ; Languages sections {{{ !macro Language SecName lng ; A macro to create each section {{{ Section /o "$(lng_${lng}) (${lng})" Sec${SecName} - ;SectionIn 1 2 3 + SectionIn 1 ; flags will be adjusted below, see LanguageAutoSelect in .onInit !ifndef DUMMYINSTALL DetailPrint "Installing translations and translated content for ${SecName} (${lng}) locale..." ; locale folders (/locale, /share/locale /lib/locale) @@ -680,9 +682,8 @@ Function .onInit ; initialise the installer {{{2 !macro LanguageAutoSelect LocaleName LocaleID ${If} $LANGUAGE = ${LocaleID} - SectionGetFlags ${Sec${LocaleName}} $0 - IntOp $0 $0 | ${SF_SELECTED} - SectionSetFlags ${Sec${LocaleName}} $0 + SectionSetInstTypes ${Sec${LocaleName}} 3 ; this equals binary "011" (which flags the default for sections 1 and 2 but not 3) + ; and is equivalent to "SectionIn 1 2" ${EndIf} !macroend @@ -691,6 +692,9 @@ Function .onInit ; initialise the installer {{{2 !insertmacro INSTALLER_TRANSLATIONS LanguageAutoSelect ; End of language detection }}} + ; ser the second InstType ("Optimal") as default + SetCurInstType 1 + !insertmacro UNINSTALL.LOG_PREPARE_INSTALL ; prepare advanced uninstallation log script ;Extract InstallOptions INI files |