Updating branch refs/heads/master
to e75348c4632d28352b9c14a5c2d01acf94179e62 (commit)
from e2c9660b3a1e1816c513cd88e0808fec7c94288c (commit)
commit e75348c4632d28352b9c14a5c2d01acf94179e62
Author: Paweł Forysiuk <[email protected]>
Date: Tue Sep 4 23:22:40 2012 +0200
nsis: Make installing doc folder and Faenza icons mandatory.
Disabling them would not save much space and leave broken user experience.
win32/makedist/midori-0.3.3.nsi | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/win32/makedist/midori-0.3.3.nsi b/win32/makedist/midori-0.3.3.nsi
index 5d7a6f7..aabed20 100644
--- a/win32/makedist/midori-0.3.3.nsi
+++ b/win32/makedist/midori-0.3.3.nsi
@@ -135,27 +135,6 @@ Section "!Program Files" SEC01
CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk"
"${PRODUCT_EXE}"
!insertmacro MUI_STARTMENU_WRITE_END
-SectionEnd
-
-Section "Extensions" SEC04
- SectionIn 1
- SetOverwrite ifnewer
- SetOutPath "$INSTDIR\lib"
- File /r "${RESOURCEDIR}\lib\midori"
-SectionEnd
-
-Section "Language Files" SEC02
- SectionIn 1
- SetOutPath "$INSTDIR\share"
- File /r "${RESOURCEDIR}\share\locale"
-SectionEnd
-
-Section "FAQ" SEC06
- SectionIn 1
- SetOutPath "$INSTDIR\share\doc\midori"
- File "${RESOURCEDIR}\share\doc\midori\faq.css"
- File "${RESOURCEDIR}\share\doc\midori\faq.html"
-SectionEnd
!macro InstallIconThemeRenameSmall OPath IPath
File "/oname=16x16\${OPath}.png"
"${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png"
@@ -191,8 +170,6 @@ SectionEnd
CreateDirectory
"$INSTDIR\share\icons\${ICON_THEME}\scalable\${SectionPath}"
!macroend
-Section "${ICON_THEME} icons" SEC07
- SectionIn 1
SetOutPath "$INSTDIR\share\icons\${ICON_THEME}"
!insertmacro CreateIconThemeSections "actions"
@@ -286,6 +263,20 @@ Section "${ICON_THEME} icons" SEC07
SectionEnd
+Section "Extensions" SEC04
+ SectionIn 1
+ SetOverwrite ifnewer
+ SetOutPath "$INSTDIR\lib"
+ File /r "${RESOURCEDIR}\lib\midori"
+SectionEnd
+
+Section "Language Files" SEC02
+ SectionIn 1
+ SetOutPath "$INSTDIR\share"
+ File /r "${RESOURCEDIR}\share\locale"
+SectionEnd
+
+
Section "Desktop Shortcuts" SEC03
SectionIn 1
CreateShortCut "$DESKTOP\Midori.lnk" "${PRODUCT_EXE}"
@@ -383,8 +374,6 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Create shortcuts for Midori on the
desktop and in the Quicklaunch Bar"
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Available plugins like
'Advertisement Blocker', 'Form history filler' and 'Mouse Gestures'."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Make Midori the default browser."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "User manual of the Midori
application."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Better looking icons from the
${ICON_THEME} icon theme."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;;;;;;;;;;;;;;;;;;;;;
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
