Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Mon, 21 Mar 2016 22:01:05 UTC Commit: e1a9929e9cfdad375938018d5ab7b1228e7d6c5b https://github.com/geany/geany/commit/e1a9929e9cfdad375938018d5ab7b1228e7d6c...

Log Message: ----------- Windows installer: install data files into new locations

This adapts the paths in the installer for the tags and filedefs files as changed in #485. Also simply include everything in share/ when including a GTK3 runtime environment instead of a fixed list of subdirectories, share/glib-2.0 doesn't exist anymore when using MSYS2 packages.

Modified Paths: -------------- geany.nsi.in

Modified: geany.nsi.in 25 lines changed, 8 insertions(+), 17 deletions(-) =================================================================== @@ -135,7 +135,7 @@ Section "!Program Files" SEC01

SetOutPath "$INSTDIR\data" File "${RESOURCEDIR}\data\GPL-2" - File "${RESOURCEDIR}\data\file*" + File "${RESOURCEDIR}\data\filetype_extensions.conf" File "${RESOURCEDIR}\data\geany.glade" !if ${GTK_VERSION} >= 3 File "${RESOURCEDIR}\data\geany.css" @@ -145,6 +145,9 @@ Section "!Program Files" SEC01 File "${RESOURCEDIR}\data\snippets.conf" File "${RESOURCEDIR}\data\ui_toolbar.xml"

+ SetOutPath "$INSTDIR\data\filedefs" + File /r "${RESOURCEDIR}\data\filedefs*" + SetOutPath "$INSTDIR\data\templates" File /r "${RESOURCEDIR}\data\templates*"

@@ -205,13 +208,9 @@ SectionEnd

Section "Autocompletion Tags" SEC05 SectionIn 1 - SetOutPath "$INSTDIR\data" SetOverwrite ifnewer - File "${RESOURCEDIR}\data\php.tags" - File "${RESOURCEDIR}\data\pascal.tags" - File "${RESOURCEDIR}\data\python.tags" - File "${RESOURCEDIR}\data\html_entities.tags" - File "${RESOURCEDIR}\data\c99.tags" + SetOutPath "$INSTDIR\data\filedefs" + File /r "${RESOURCEDIR}\data\filedefs*" SectionEnd

; Include GTK runtime library but only if desired from command line @@ -227,16 +226,8 @@ Section "GTK ${GTK_VERSION} Runtime Environment" SEC06 File /r "gtk\etc*" SetOutPath "$INSTDIR\lib" File /r "gtk\lib*" - SetOutPath "$INSTDIR\share\themes" - File /r "gtk\share\themes*" -!if ${GTK_VERSION} >= 3 - SetOutPath "$INSTDIR\share\icons" - File /r "gtk\share\icons*" - SetOutPath "$INSTDIR\share\glib-2.0" - File /r "gtk\share\glib-2.0*" - SetOutPath "$INSTDIR\share\gtk-3.0" - File /r "gtk\share\gtk-3.0*" -!endif + SetOutPath "$INSTDIR\share" + File /r "gtk\share*" SectionEnd !endif

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).