[geany/geany] 451d58: Cleanup data files installation

Colomban Wendling git-noreply at xxxxx
Tue Apr 15 12:43:25 UTC 2014 

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Tue, 15 Apr 2014 12:43:25 UTC
Commit:      451d58a2dd8eb0c068b5b24bbf663b4a8ef4b48e
             https://github.com/geany/geany/commit/451d58a2dd8eb0c068b5b24bbf663b4a8ef4b48e

Log Message:
-----------
Cleanup data files installation

Don't use wildcards to select files to install, nor manually perform
the installation when Automake could do it for us.

Using wildcards makes it hard to know what will really be installed,
and may results in installing files not part of the distribution.


Modified Paths:
--------------
    HACKING
    Makefile.am
    configure.ac
    data/Makefile.am

Modified: HACKING
2 files changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -452,6 +452,8 @@ For languages with a Scintilla lexer, there should be a [styling] section,
 to correspond to the styles used in highlighting_styles_FOO[] in
 highlightingmappings.h - see below.
 
+Don't forget to add the newly created filetype file to data/Makefile.am.
+
 Syntax highlighting
 ^^^^^^^^^^^^^^^^^^^
 It may be possible to use an existing Scintilla lexer in the scintilla/


Modified: Makefile.am
55 files changed, 5 insertions(+), 50 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = tagmanager scintilla src plugins icons po doc tests
+SUBDIRS = tagmanager scintilla src plugins icons po doc data tests
 
 AUTOMAKE_OPTIONS =	1.7
 
@@ -12,23 +12,6 @@ WIN32_BUILD_FILES = \
 	win32-config.h \
 	makefile.win32
 
-SYS_DATA_FILES = \
-	data/c99.tags \
-	data/php.tags \
-	data/python.tags \
-	data/pascal.tags \
-	data/html_entities.tags \
-	$(srcdir)/data/filetypes.* \
-	data/filetype_extensions.conf \
-	data/snippets.conf \
-	data/ui_toolbar.xml \
-	$(srcdir)/data/templates/* \
-	$(srcdir)/data/templates/files/* \
-	$(srcdir)/data/colorschemes/* \
-	$(top_srcdir)/data/geany.glade \
-	data/geany.css \
-	data/geany.gtkrc
-
 EXTRA_DIST = \
 	autogen.sh \
 	wscript \
@@ -45,7 +28,6 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	$(SYS_DATA_FILES) \
 	$(WIN32_BUILD_FILES)
 
 DISTCLEANFILES = \
@@ -57,37 +39,10 @@ DISTCLEANFILES = \
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir);
 
-install-data-local: install-data-only
-	@$(NORMAL_INSTALL)
-
-install-data-only:
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
-	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \
-	for file in $(srcdir)/data/*; do \
-	  if test -f $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/; \
-	  fi \
-	done
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/templates;
-	for file in $(srcdir)/data/templates/*; do \
-	  if test -f $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/templates/; \
-	  fi \
-	done
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/templates/files;
-	for file in $(srcdir)/data/templates/files/*; do \
-	  if test -f $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/templates/files/; \
-	  fi \
-	done
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/colorschemes;
-	for file in $(srcdir)/data/colorschemes/*; do \
-	  if test -f $$file; then \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/colorschemes/; \
-	  fi \
-	done
-
+# manually install some files under another name
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+	$(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2
 
 dist-hook:
 	@if test -d "$(top_srcdir)/.git"; then \


Modified: configure.ac
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -137,6 +137,7 @@ AC_CONFIG_FILES([
 		src/Makefile
 		plugins/Makefile
 		po/Makefile.in
+		data/Makefile
 		doc/Makefile
 		doc/geany.1
 		geany.spec


Modified: data/Makefile.am
116 files changed, 116 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,116 @@
+
+colorschemes = \
+	colorschemes/alt.conf
+
+filetypes = \
+	filetypes.abaqus \
+	filetypes.abc \
+	filetypes.actionscript \
+	filetypes.ada \
+	filetypes.asciidoc \
+	filetypes.asm \
+	filetypes.batch \
+	filetypes.c \
+	filetypes.caml \
+	filetypes.Clojure.conf \
+	filetypes.cmake \
+	filetypes.cobol \
+	filetypes.common \
+	filetypes.conf \
+	filetypes.cpp \
+	filetypes.cs \
+	filetypes.css \
+	filetypes.CUDA.conf \
+	filetypes.Cython.conf \
+	filetypes.d \
+	filetypes.diff \
+	filetypes.docbook \
+	filetypes.erlang \
+	filetypes.f77 \
+	filetypes.ferite \
+	filetypes.forth \
+	filetypes.fortran \
+	filetypes.freebasic \
+	filetypes.Genie.conf \
+	filetypes.glsl \
+	filetypes.Go.conf \
+	filetypes.Graphviz.conf \
+	filetypes.haskell \
+	filetypes.haxe \
+	filetypes.html \
+	filetypes.java \
+	filetypes.javascript \
+	filetypes.latex \
+	filetypes.lisp \
+	filetypes.lua \
+	filetypes.makefile \
+	filetypes.markdown \
+	filetypes.matlab \
+	filetypes.nsis \
+	filetypes.objectivec \
+	filetypes.pascal \
+	filetypes.perl \
+	filetypes.php \
+	filetypes.po \
+	filetypes.powershell \
+	filetypes.python \
+	filetypes.r \
+	filetypes.restructuredtext \
+	filetypes.ruby \
+	filetypes.rust \
+	filetypes.Scala.conf \
+	filetypes.sh \
+	filetypes.sql \
+	filetypes.tcl \
+	filetypes.txt2tags \
+	filetypes.vala \
+	filetypes.verilog \
+	filetypes.vhdl \
+	filetypes.xml \
+	filetypes.yaml
+
+tagfiles = \
+	c99.tags \
+	php.tags \
+	python.tags \
+	pascal.tags \
+	html_entities.tags
+
+template_files = \
+	templates/files/file.html \
+	templates/files/file.php \
+	templates/files/file.rb \
+	templates/files/file.tex \
+	templates/files/main.c \
+	templates/files/main.cxx \
+	templates/files/main.d \
+	templates/files/main.java \
+	templates/files/main.py \
+	templates/files/main.vala \
+	templates/files/module.erl \
+	templates/files/program.pas
+
+templates = \
+	templates/bsd \
+	templates/changelog \
+	templates/fileheader \
+	templates/function \
+	templates/gpl
+
+nobase_dist_pkgdata_DATA = \
+	$(colorschemes) \
+	$(filetypes) \
+	$(tagfiles) \
+	$(template_files) \
+	$(templates) \
+	filetype_extensions.conf \
+	snippets.conf \
+	ui_toolbar.xml \
+	geany.glade
+
+if GTK3
+nobase_dist_pkgdata_DATA += geany.css
+else
+nobase_dist_pkgdata_DATA += geany.gtkrc
+endif
+



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

More information about the Commits mailing list