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.
This commit is contained in:
Enrico Tröger 2016-03-21 23:01:05 +01:00
parent 801698dded
commit e1a9929e9c

View File

@ -135,7 +135,7 @@ Section "!Program Files" SEC01
SetOutPath "$INSTDIR\data" SetOutPath "$INSTDIR\data"
File "${RESOURCEDIR}\data\GPL-2" File "${RESOURCEDIR}\data\GPL-2"
File "${RESOURCEDIR}\data\file*" File "${RESOURCEDIR}\data\filetype_extensions.conf"
File "${RESOURCEDIR}\data\geany.glade" File "${RESOURCEDIR}\data\geany.glade"
!if ${GTK_VERSION} >= 3 !if ${GTK_VERSION} >= 3
File "${RESOURCEDIR}\data\geany.css" File "${RESOURCEDIR}\data\geany.css"
@ -145,6 +145,9 @@ Section "!Program Files" SEC01
File "${RESOURCEDIR}\data\snippets.conf" File "${RESOURCEDIR}\data\snippets.conf"
File "${RESOURCEDIR}\data\ui_toolbar.xml" File "${RESOURCEDIR}\data\ui_toolbar.xml"
SetOutPath "$INSTDIR\data\filedefs"
File /r "${RESOURCEDIR}\data\filedefs\*"
SetOutPath "$INSTDIR\data\templates" SetOutPath "$INSTDIR\data\templates"
File /r "${RESOURCEDIR}\data\templates\*" File /r "${RESOURCEDIR}\data\templates\*"
@ -205,13 +208,9 @@ SectionEnd
Section "Autocompletion Tags" SEC05 Section "Autocompletion Tags" SEC05
SectionIn 1 SectionIn 1
SetOutPath "$INSTDIR\data"
SetOverwrite ifnewer SetOverwrite ifnewer
File "${RESOURCEDIR}\data\php.tags" SetOutPath "$INSTDIR\data\filedefs"
File "${RESOURCEDIR}\data\pascal.tags" File /r "${RESOURCEDIR}\data\filedefs\*"
File "${RESOURCEDIR}\data\python.tags"
File "${RESOURCEDIR}\data\html_entities.tags"
File "${RESOURCEDIR}\data\c99.tags"
SectionEnd SectionEnd
; Include GTK runtime library but only if desired from command line ; 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\*" File /r "gtk\etc\*"
SetOutPath "$INSTDIR\lib" SetOutPath "$INSTDIR\lib"
File /r "gtk\lib\*" File /r "gtk\lib\*"
SetOutPath "$INSTDIR\share\themes" SetOutPath "$INSTDIR\share"
File /r "gtk\share\themes\*" File /r "gtk\share\*"
!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
SectionEnd SectionEnd
!endif !endif