Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 12 Oct 2014 14:40:12 UTC Commit: 9caa0046bd9956cdc36a36dd3e6b63a747e1f3ea https://github.com/geany/geany/commit/9caa0046bd9956cdc36a36dd3e6b63a747e1f3...
Log Message: ----------- Prepare Windows installer for embedded GTK 2.24
Modified Paths: -------------- geany.nsi
Modified: geany.nsi 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -175,8 +175,8 @@ Section "Language Files" SEC03 SetOutPath "$INSTDIR\share\locale" File /r "${RESOURCEDIR}\share\locale*" !ifdef INCLUDE_GTK - SetOutPath "$INSTDIR\share" - File /r "gtk\share*" + SetOutPath "$INSTDIR\share\locale" + File /r "gtk\share\locale*" !endif SectionEnd
@@ -204,7 +204,7 @@ SectionEnd
; Include GTK runtime library but only if desired from command line !ifdef INCLUDE_GTK -Section "GTK 2.16 Runtime Environment" SEC06 +Section "GTK 2.24 Runtime Environment" SEC06 SectionIn 1 SetOverwrite ifnewer SetOutPath "$INSTDIR\bin" @@ -213,6 +213,8 @@ Section "GTK 2.16 Runtime Environment" SEC06 File /r "gtk\etc*" SetOutPath "$INSTDIR\lib" File /r "gtk\lib*" + SetOutPath "$INSTDIR\share\themes" + File /r "gtk\share\themes*" SectionEnd !endif
@@ -323,7 +325,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format." !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols." !ifdef INCLUDE_GTK -!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.16 or higher), you can skip it." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.24 or higher), you can skip it." !endif !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'" !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar"
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).