Attachment 90203 Details for Bug 67858 – Use git.mk to auto-generate the .gitignore file

[patch] Use git.mk to auto-generate the .gitignore file

0001-build-Use-git.mk-to-auto-generate-the-.gitignore-fil.patch (text/plain), 14.12 KB, created by Philip Withnall on 2013-12-04 00:36:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Withnall

Created: 2013-12-04 00:36:06 UTC

Size: 14.12 KB

patch

obsolete

>From a9cbefc98821a2a91b3d23e65e4bb7e9036e6116 Mon Sep 17 00:00:00 2001
>From: Philip Withnall <philip@tecnocode.co.uk>
>Date: Wed, 7 Aug 2013 11:04:32 +0200
>Subject: [PATCH 1/3] build: Use git.mk to auto-generate the .gitignore file
>
>---
> .gitignore                   | 110 ---------------
> data/Makefile.am             |   2 +
> demo/Makefile.am             |   2 +
> docs/Makefile.am             |   1 +
> git.mk                       | 311 +++++++++++++++++++++++++++++++++++++++++++
> src/geoip-server/Makefile.am |   1 +
> 6 files changed, 317 insertions(+), 110 deletions(-)
> delete mode 100644 .gitignore
> create mode 100644 git.mk
>
>diff --git a/.gitignore b/.gitignore
>deleted file mode 100644
>index bab7b25..0000000
>--- a/.gitignore
>+++ /dev/null
>@@ -1,110 +0,0 @@
>-/*.bak
>-/*.lo
>-/*.o
>-/*.orig
>-/*.rej
>-/*.tab.c
>-/*~
>-/.*.sw[nop]
>-/.deps
>-/.dirstamp
>-/.libs
>-/.version
>-/ABOUT-NLS
>-/GPATH
>-/GRTAGS
>-/GSYMS
>-/GTAGS
>-/ID
>-/Makefile
>-/Makefile.in
>-/TAGS
>-/_libs
>-/aclocal.m4
>-/autom4te.cache
>-/build-aux/ar-lib
>-/build-aux/compile
>-/build-aux/config.guess
>-/build-aux/config.rpath
>-/build-aux/config.sub
>-/build-aux/depcomp
>-/build-aux/install-sh
>-/build-aux/ltmain.sh
>-/build-aux/missing
>-/build-aux/mkinstalldirs
>-/config.cache
>-/config.h
>-/config.h.in
>-/config.log
>-/config.lt
>-/config.status
>-/config.status.lineno
>-/configure
>-/configure.lineno
>-/data/Makefile
>-/data/Makefile.in
>-/data/org.freedesktop.GeoClue2.conf
>-/data/org.freedesktop.GeoClue2.service
>-/demo/.deps/
>-/demo/.libs/
>-/demo/Makefile
>-/demo/Makefile.in
>-/demo/where-am-i
>-/demo/*.o
>-/intltool-extract
>-/intltool-extract.in
>-/intltool-merge
>-/intltool-merge.in
>-/intltool-update
>-/intltool-update.in
>-/libtool
>-/m4/intltool.m4
>-/m4/libtool.m4
>-/m4/ltoptions.m4
>-/m4/ltsugar.m4
>-/m4/ltversion.m4
>-/m4/lt~obsolete.m4
>-/po/*.gmo
>-/po/*.mo
>-/po/.intltool-merge-cache
>-/po/Makefile
>-/po/Makefile.in
>-/po/Makefile.in.in
>-/po/Makevars.template
>-/po/POTFILES
>-/po/Rules-quot
>-/po/boldquot.sed
>-/po/en@boldquot.header
>-/po/en@quot.header
>-/po/geoclue.pot
>-/po/gnome-boxes.pot
>-/po/insert-header.sin
>-/po/quot.sed
>-/po/remove-potcdate.sin
>-/po/stamp-it
>-/src/.deps
>-/src/.libs/
>-/src/Geoclue-1.0.gir
>-/src/Geoclue-1.0.typelib
>-/src/geoclue
>-/src/geoclue-2.0.pc
>-/src/geoclue-interface.c
>-/src/geoclue-interface.h
>-/src/geoip-server/.deps/
>-/src/geoip-server/Makefile
>-/src/geoip-server/Makefile.in
>-/src/geoip-server/geoip-lookup
>-/src/geoip-server/geoip-lookup.o
>-/src/geoip-server/geoip-update
>-/src/geoip-server/geoip-update.o
>-/src/geoip-server/test-geoipformat
>-/src/geoip-server/test-geoipformat.o
>-/src/libgeoclue-1.0.la
>-/src/libgeoclue_1_0_la-geoclue-interface.lo
>-/src/*.o
>-/src/Makefile
>-/src/Makefile.in
>-/src/geocue
>-/so_locations
>-/stamp-h1
>-/tags
>diff --git a/data/Makefile.am b/data/Makefile.am
>index af3cecd..93981de 100644
>--- a/data/Makefile.am
>+++ b/data/Makefile.am
>@@ -14,3 +14,5 @@ dbusservice_DATA = org.freedesktop.GeoClue2.conf \
> DISTCLEANFILES = $(service_DATA)
> EXTRA_DIST = $(service_in_files) \
> 	     org.freedesktop.GeoClue2.Agent.conf
>+
>+-include $(top_srcdir)/git.mk
>diff --git a/demo/Makefile.am b/demo/Makefile.am
>index e253d47..10027e8 100644
>--- a/demo/Makefile.am
>+++ b/demo/Makefile.am
>@@ -35,3 +35,5 @@ agent_CFLAGS = $(DEMO_AGENT_CFLAGS)   		   \
> agent_LDADD = $(DEMO_AGENT_LIBS)
> 
> endif # BUILD_DEMO_AGENT
>+
>+-include $(top_srcdir)/git.mk
>diff --git a/docs/Makefile.am b/docs/Makefile.am
>index f1c666c..9b6d15f 100644
>--- a/docs/Makefile.am
>+++ b/docs/Makefile.am
>@@ -68,3 +68,4 @@ CLEANFILES +=						\
> # Version information for marking the documentation
> EXTRA_DIST += version.xml.in
> 
>+-include $(top_srcdir)/git.mk
>diff --git a/git.mk b/git.mk
>new file mode 100644
>index 0000000..18c07f6
>--- /dev/null
>+++ b/git.mk
>@@ -0,0 +1,311 @@
>+# git.mk
>+#
>+# Copyright 2009, Red Hat, Inc.
>+# Copyright 2010,2011,2012,2013 Behdad Esfahbod
>+# Written by Behdad Esfahbod
>+#
>+# Copying and distribution of this file, with or without modification,
>+# is permitted in any medium without royalty provided the copyright
>+# notice and this notice are preserved.
>+#
>+# The latest version of this file can be downloaded from:
>+#   https://raw.github.com/behdad/git.mk/master/git.mk
>+# Bugs, etc, should be reported upstream at:
>+#   https://github.com/behdad/git.mk
>+#
>+# To use in your project, import this file in your git repo's toplevel,
>+# then do "make -f git.mk".  This modifies all Makefile.am files in
>+# your project to -include git.mk.  Remember to add that line to new
>+# Makefile.am files you create in your project, or just rerun the
>+# "make -f git.mk".
>+#
>+# This enables automatic .gitignore generation.  If you need to ignore
>+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
>+# But think twice before doing that.  If a file has to be in .gitignore,
>+# chances are very high that it's a generated file and should be in one
>+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
>+#
>+# The only case that you need to manually add a file to GITIGNOREFILES is
>+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
>+# or maintainer-clean-local make targets.
>+#
>+# Note that for files like editor backup, etc, there are better places to
>+# ignore them.  See "man gitignore".
>+#
>+# If "make maintainer-clean" removes the files but they are not recognized
>+# by this script (that is, if "git status" shows untracked files still), send
>+# me the output of "git status" as well as your Makefile.am and Makefile for
>+# the directories involved and I'll diagnose.
>+#
>+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
>+# Makefile.am.sample in the git.mk git repo.
>+#
>+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
>+# not tarballs.  It serves no useful purpose in tarballs and clutters the
>+# build dir.
>+#
>+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
>+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
>+#
>+# This makefile provides the following targets:
>+#
>+# - all: "make all" will build all gitignore files.
>+# - gitignore: makes all gitignore files in the current dir and subdirs.
>+# - .gitignore: make gitignore file for the current dir.
>+# - gitignore-recurse: makes all gitignore files in the subdirs.
>+#
>+# KNOWN ISSUES:
>+#
>+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
>+#   submodule doesn't find us.  If you have configure.{in,ac} files in
>+#   subdirs, add a proxy git.mk file in those dirs that simply does:
>+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
>+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
>+#   example.
>+#
>+
>+
>+
>+###############################################################################
>+# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
>+###############################################################################
>+
>+#
>+# Most autotools-using modules should be fine including this variable in their
>+# toplevel MAINTAINERCLEANFILES:
>+GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
>+	$(srcdir)/aclocal.m4 \
>+	$(srcdir)/autoscan.log \
>+	$(srcdir)/configure.scan \
>+	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
>+	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
>+	 for x in \
>+		ar-lib \
>+		compile \
>+		config.guess \
>+		config.sub \
>+		depcomp \
>+		install-sh \
>+		ltmain.sh \
>+		missing \
>+		mkinstalldirs \
>+		test-driver \
>+	 ; do echo "$$AUX_DIR/$$x"; done` \
>+	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
>+	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
>+#
>+# All modules should also be fine including the following variable, which
>+# removes automake-generated Makefile.in files:
>+GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
>+	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
>+	while read f; do \
>+	  case $$f in Makefile|*/Makefile) \
>+	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
>+	done`
>+#
>+# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
>+# though it's harmless to include regardless.
>+GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
>+	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
>+	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
>+		for x in \
>+			libtool.m4 \
>+			ltoptions.m4 \
>+			ltsugar.m4 \
>+			ltversion.m4 \
>+			lt~obsolete.m4 \
>+		; do echo "$$MACRO_DIR/$$x"; done; \
>+	 fi`
>+
>+
>+
>+###############################################################################
>+# Default rule is to install ourselves in all Makefile.am files:
>+###############################################################################
>+
>+git-all: git-mk-install
>+
>+git-mk-install:
>+	@echo "Installing git makefile"
>+	@any_failed=; \
>+		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
>+		if grep 'include .*/git.mk' $$x >/dev/null; then \
>+			echo "$$x already includes git.mk"; \
>+		else \
>+			failed=; \
>+			echo "Updating $$x"; \
>+			{ cat $$x; \
>+			  echo ''; \
>+			  echo '-include $$(top_srcdir)/git.mk'; \
>+			} > $$x.tmp || failed=1; \
>+			if test x$$failed = x; then \
>+				mv $$x.tmp $$x || failed=1; \
>+			fi; \
>+			if test x$$failed = x; then : else \
>+				echo "Failed updating $$x"; >&2 \
>+				any_failed=1; \
>+			fi; \
>+	fi; done; test -z "$$any_failed"
>+
>+.PHONY: git-all git-mk-install
>+
>+
>+
>+###############################################################################
>+# Actual .gitignore generation:
>+###############################################################################
>+
>+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
>+	@echo "git.mk: Generating $@"
>+	@{ \
>+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
>+			for x in \
>+				$(DOC_MODULE)-decl-list.txt \
>+				$(DOC_MODULE)-decl.txt \
>+				tmpl/$(DOC_MODULE)-unused.sgml \
>+				"tmpl/*.bak" \
>+				xml html \
>+			; do echo "/$$x"; done; \
>+			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
>+			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
>+		fi; \
>+		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
>+			for lc in $(DOC_LINGUAS); do \
>+				for x in \
>+					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
>+					$(DOC_PAGES) \
>+					$(DOC_INCLUDES) \
>+				; do echo "/$$lc/$$x"; done; \
>+			done; \
>+			for x in \
>+				$(_DOC_OMF_ALL) \
>+				$(_DOC_DSK_ALL) \
>+				$(_DOC_HTML_ALL) \
>+				$(_DOC_MOFILES) \
>+				$(DOC_H_FILE) \
>+				"*/.xml2po.mo" \
>+				"*/*.omf.out" \
>+			; do echo /$$x; done; \
>+		fi; \
>+		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
>+			for lc in $(HELP_LINGUAS); do \
>+				for x in \
>+					$(HELP_FILES) \
>+					"$$lc.stamp" \
>+					"$$lc.mo" \
>+				; do echo "/$$lc/$$x"; done; \
>+			done; \
>+		fi; \
>+		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
>+			for x in \
>+				$(gsettings_SCHEMAS:.xml=.valid) \
>+				$(gsettings__enum_file) \
>+			; do echo "/$$x"; done; \
>+		fi; \
>+		if test -f $(srcdir)/po/Makefile.in.in; then \
>+			for x in \
>+				po/Makefile.in.in \
>+				po/Makefile.in.in~ \
>+				po/Makefile.in \
>+				po/Makefile \
>+				po/Makevars.template \
>+				po/POTFILES \
>+				po/Rules-quot \
>+				po/stamp-it \
>+				po/.intltool-merge-cache \
>+				"po/*.gmo" \
>+				"po/*.header" \
>+				"po/*.mo" \
>+				"po/*.sed" \
>+				"po/*.sin" \
>+				po/$(GETTEXT_PACKAGE).pot \
>+				intltool-extract.in \
>+				intltool-merge.in \
>+				intltool-update.in \
>+			; do echo "/$$x"; done; \
>+		fi; \
>+		if test -f $(srcdir)/configure; then \
>+			for x in \
>+				autom4te.cache \
>+				configure \
>+				config.h \
>+				stamp-h1 \
>+				libtool \
>+				config.lt \
>+			; do echo "/$$x"; done; \
>+		fi; \
>+		if test "x$(DEJATOOL)" = x; then :; else \
>+			for x in \
>+				$(DEJATOOL) \
>+			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
>+			echo /site.exp; \
>+		fi; \
>+		if test "x$(am__dirstamp)" = x; then :; else \
>+			echo "$(am__dirstamp)"; \
>+		fi; \
>+		if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
>+			for x in \
>+				"*.lo" \
>+				".libs" "_libs" \
>+			; do echo "$$x"; done; \
>+		fi; \
>+		for x in \
>+			.gitignore \
>+			$(GITIGNOREFILES) \
>+			$(CLEANFILES) \
>+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
>+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
>+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
>+			so_locations \
>+			$(MOSTLYCLEANFILES) \
>+			$(TEST_LOGS) \
>+			$(TEST_LOGS:.log=.trs) \
>+			$(TEST_SUITE_LOG) \
>+			"*.$(OBJEXT)" \
>+			$(DISTCLEANFILES) \
>+			$(am__CONFIG_DISTCLEAN_FILES) \
>+			$(CONFIG_CLEAN_FILES) \
>+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
>+			"*.tab.c" \
>+			$(MAINTAINERCLEANFILES) \
>+			$(BUILT_SOURCES) \
>+			$(DEPDIR) \
>+			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
>+			$(filter %_vala.stamp,$(DIST_COMMON)) \
>+			$(filter %.vapi,$(DIST_COMMON)) \
>+			$(filter %$(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \
>+			Makefile \
>+			Makefile.in \
>+			"*.orig" \
>+			"*.rej" \
>+			"*.bak" \
>+			"*~" \
>+			".*.sw[nop]" \
>+			".dirstamp" \
>+		; do echo "/$$x"; done; \
>+	} | \
>+	sed "s@^/`echo "$(srcdir)" | sed 's/$.$/[\1]/g'`/@/@" | \
>+	sed 's@/[.]/@/@g' | \
>+	LC_ALL=C sort | uniq > $@.tmp && \
>+	mv $@.tmp $@;
>+
>+all: $(srcdir)/.gitignore gitignore-recurse-maybe
>+gitignore: $(srcdir)/.gitignore gitignore-recurse
>+
>+gitignore-recurse-maybe:
>+	@for subdir in $(DIST_SUBDIRS); do \
>+	  case " $(SUBDIRS) " in \
>+	    *" $$subdir "*) :;; \
>+	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
>+	  esac; \
>+	done
>+gitignore-recurse:
>+	@for subdir in $(DIST_SUBDIRS); do \
>+	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
>+	done
>+
>+maintainer-clean: gitignore-clean
>+gitignore-clean:
>+	-rm -f $(srcdir)/.gitignore
>+
>+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
>diff --git a/src/geoip-server/Makefile.am b/src/geoip-server/Makefile.am
>index 1a98003..34b2971 100644
>--- a/src/geoip-server/Makefile.am
>+++ b/src/geoip-server/Makefile.am
>@@ -27,3 +27,4 @@ EXTRA_DIST = API-Documentation.txt
> 
> MAINTAINERCLEANFILES = Makefile.in
> 
>+-include $(top_srcdir)/git.mk
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 67858: 83770 | 83771 | 83772 | 83773 | 83774 | 83775 | 90203 | 90204 | 90205

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.