[hitori] Updated repository for git

From: Philip Withnall <pwithnall src gnome org>
To: svn-commits-list gnome org
Subject: [hitori] Updated repository for git
Date: Tue, 21 Apr 2009 02:37:17 -0400 (EDT)
commit 9cb503bf1faf56fa988261933c6522f32c9278cf
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Apr 21 07:35:57 2009 +0100

    Updated repository for git
    
    .gitignore files are now generated by pango's git.mk, the ChangeLog is now
    generated on dist, a DOAP file has been added to give cgit a module
    description, and the old .bzrignore file has been deleted.
---
 .bzrignore                              |   56 ----------
 ChangeLog => ChangeLog.pre-0-2-2        |    0
 Makefile.am                             |   46 ++++++++-
 data/Makefile.am                        |    2 +
 data/icons/16x16/Makefile.am            |    2 +
 data/icons/22x22/Makefile.am            |    2 +
 data/icons/32x32/Makefile.am            |    2 +
 data/icons/48x48/Makefile.am            |    2 +
 data/icons/Makefile.am                  |    2 +
 git.mk                                  |  178 +++++++++++++++++++++++++++++++
 help/{ChangeLog => ChangeLog.pre-0-2-2} |    0
 help/Makefile.am                        |    5 +
 hitori.doap                             |   16 +++
 po/{ChangeLog => ChangeLog.pre-0-2-2}   |    0
 src/Makefile.am                         |    2 +
 15 files changed, 256 insertions(+), 59 deletions(-)

diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index d6d9389..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1,56 +0,0 @@
-.anjuta
-autom4te.cache
-.tm_project2.cache
-Makefile
-Makefile.in
-POTFILES
-en_GB.gmo
-hitori.pot
-stamp-it
-.deps
-.libs
-src/hitori
-config.h
-config.log
-config.status
-libtool
-stamp-h1
-intltool-extract
-intltool-merge
-intltool-update
-hitori-0.1.tar.gz
-aclocal.m4
-configure
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-po/Makefile.in.in
-config.guess
-config.sub
-ltmain.sh
-mkinstalldirs
-INSTALL
-depcomp
-install-sh
-missing
-src/generator.gcda
-src/interface.gcda
-src/main.gcda
-src/rules.gcda
-src/generator.gcno
-src/interface.gcno
-src/main.gcno
-src/rules.gcno
-src/rules.c.gcov
-help/hitori-C.omf
-help/en_GB/hitori.xml
-help/en_GB/legal.xml
-help/en_GB/*.mo
-help/hitori-C.omf
-help/hitori-en_GB.omf
-data/hitori.desktop
-po/.intltool-merge-cache
-meta
-config.status.lineno
-po/messages.mo
-gnome-doc-utils.make
diff --git a/ChangeLog b/ChangeLog.pre-0-2-2
similarity index 100%
rename from ChangeLog
rename to ChangeLog.pre-0-2-2
diff --git a/Makefile.am b/Makefile.am
index 501359e..6705e41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,13 +11,32 @@ EXTRA_DIST =			\
 	COPYING-DOCS		\
 	AUTHORS			\
 	INSTALL			\
-	NEWS
+	NEWS			\
+	ChangeLog.pre-0-2-2	\
+	po/ChangeLog.pre-0-2-2	\
+	MAINTAINERS		\
+	hitori.doap
 
 DISTCLEANFILES = \
 	intltool-extract	\
 	intltool-merge		\
-	intltool-update		\
-	gnome-doc-utils.make
+	intltool-update
+
+MAINTAINERCLEANFILES = \
+	INSTALL			\
+	aclocal.m4		\
+	compile			\
+	config.guess		\
+	config.h.in		\
+	config.sub		\
+	depcomp			\
+	install-sh		\
+	ltmain.sh		\
+	missing			\
+	mkinstalldirs		\
+	gnome-doc-utils.make	\
+	ChangeLog \
+	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 
@@ -29,3 +48,24 @@ dist-hook:
 		fi \
 	done
 
+# ChangeLog generation
+CHANGELOG_START = V_0_2_2^
+
+ChangeLog: $(srcdir)/ChangeLog
+$(srcdir)/ChangeLog:
+	@echo Creating $@
+	@if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run \
+	   git log $(CHANGELOG_START).. --stat) | fmt --split-only > $  tmp \
+	  && mv -f $  tmp $@ \
+	  || ($(RM) $  tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git-log is required to generate this file >> $@); \
+	fi
+.PHONY: $(srcdir)/ChangeLog
+
+-include $(top_srcdir)/git.mk
diff --git a/data/Makefile.am b/data/Makefile.am
index 60a5bd9..be769c6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,3 +28,5 @@ EXTRA_DIST = \
 	$(ui_DATA)	\
 	$(desktop_in_files)
 CLEANFILES = $(desktop_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 07fb85f..3461729 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/16x16/apps
 icon_DATA = hitori.png
 
 EXTRA_DIST = hitori.svg $(icon_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 9064401..d1c7b23 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/22x22/apps
 icon_DATA = hitori.png
 
 EXTRA_DIST = hitori.svg $(icon_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index ca854da..278282f 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/32x32/apps
 icon_DATA = hitori.png
 
 EXTRA_DIST = hitori.svg $(icon_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index b069133..9daa76e 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -2,3 +2,5 @@ icondir = $(datadir)/icons/hicolor/48x48/apps
 icon_DATA = hitori.png
 
 EXTRA_DIST = hitori.svg $(icon_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 7c2f1af..da9f9a8 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1 +1,3 @@
 SUBDIRS = 16x16 22x22 32x32 48x48
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..9cfce1c
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,178 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# 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.
+#
+# 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.
+#
+# 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 stat" shows untracked files still), send
+# me the output of "git stat" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# 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, intltool.
+#
+#
+# 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.
+#
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; find $(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
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	@echo Generating $@; \
+	GTKDOCGITIGNOREFILES=; \
+	test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
+	GTKDOCGITIGNOREFILES=" \
+		$(DOC_MODULE)-decl-list.txt \
+		$(DOC_MODULE)-decl.txt \
+		tmpl/$(DOC_MODULE)-unused.sgml \
+		tmpl/*.bak \
+		xml html \
+		"; \
+	GNOMEDOCUTILSGITIGNOREFILES=; \
+	test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
+	GNOMEDOCUTILSGITIGNOREFILES=" \
+		$(_DOC_C_DOCS) \
+		$(_DOC_LC_DOCS) \
+		$(_DOC_OMF_ALL) \
+		$(_DOC_DSK_ALL) \
+		$(_DOC_HTML_ALL) \
+		$(_DOC_POFILES) \
+		*/.xml2po.mo \
+		*/*.omf.out \
+		"; \
+	INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
+	INTLTOOLGITIGNOREFILES=" \
+		po/Makefile.in.in \
+		po/Makefile.in \
+		po/Makefile \
+		po/*.gmo \
+		po/*.mo \
+		po/POTFILES \
+		po/stamp-it \
+		po/.intltool-merge-cache \
+		intltool-extract.in \
+		intltool-merge.in \
+		intltool-update.in \
+		"; \
+	AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
+	AUTOCONFGITIGNOREFILES=" \
+		autom4te.cache \
+		configure \
+		config.h \
+		stamp-h1 \
+		libtool \
+		config.lt \
+		"; \
+	for x in \
+		.gitignore \
+		$$GTKDOCGITIGNOREFILES \
+		$$GNOMEDOCUTILSGITIGNOREFILES \
+		$$INTLTOOLGITIGNOREFILES \
+		$$AUTOCONFGITIGNOREFILES \
+		$(GITIGNOREFILES) \
+		$(CLEANFILES) \
+		$(PROGRAMS) \
+		$(EXTRA_PROGRAMS) \
+		$(LTLIBRARIES) \
+		so_locations \
+		.libs _libs \
+		$(MOSTLYCLEANFILES) \
+		"*.$(OBJEXT)" \
+		"*.lo" \
+		$(DISTCLEANFILES) \
+		$(am__CONFIG_DISTCLEAN_FILES) \
+		$(CONFIG_CLEAN_FILES) \
+		TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+		"*.tab.c" \
+		$(MAINTAINERCLEANFILES) \
+		$(BUILT_SOURCES) \
+		$(DEPDIR) \
+		Makefile \
+		Makefile.in \
+		"*.orig" \
+		"*.rej" \
+		"*.bak" \
+		"*~" \
+		".*.swp" \
+	; do echo /$$x; done | \
+	sed "s ^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LANG=C sort | uniq > $  tmp && \
+	mv $  tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse
+gitignore-recurse:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+		  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
+		done; \
+	fi;
+maintainer-clean-local: gitignore-clean
+gitignore-clean:
+	rm -f $(srcdir)/.gitignore
+.PHONY: gitignore-clean gitignore-recurse
+
diff --git a/help/ChangeLog b/help/ChangeLog.pre-0-2-2
similarity index 100%
rename from help/ChangeLog
rename to help/ChangeLog.pre-0-2-2
diff --git a/help/Makefile.am b/help/Makefile.am
index 3035a7b..8a8505d 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -8,3 +8,8 @@ DOC_H_DOCS = C/hitori.xml
 DOC_INCLUDES = legal.xml
 DOC_FIGURES = figures/hitori_main_window.png
 DOC_LINGUAS = de en_GB sv
+
+EXTRA_DIST = ChangeLog.pre-0-2-2
+GITIGNOREFILES = hitori-docs.h
+
+-include $(top_srcdir)/git.mk
diff --git a/hitori.doap b/hitori.doap
new file mode 100644
index 0000000..9442f31
--- /dev/null
+++ b/hitori.doap
@@ -0,0 +1,16 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+	 xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";
+	 xmlns:foaf="http://xmlns.com/foaf/0.1/";
+	 xmlns:gnome="http://api.gnome.org/doap-extensions#";
+	 xmlns="http://usefulinc.com/ns/doap#";>
+	<name xml:lang="en">hitori</name>
+	<shortdesc xml:lang="en">GTK+ application to generate and let you play games of Hitori</shortdesc>
+	<homepage rdf:resource="http://live.gnome.org/Hitori"; />
+	<maintainer>
+		<foaf:Person>
+			<foaf:name>Philip Withnall</foaf:name>
+			<foaf:mbox rdf:resource="philip tecnocode co uk" />
+			<gnome:userid>pwithnall</gnome:userid>
+		</foaf:Person>
+	</maintainer>
+</Project>
diff --git a/po/ChangeLog b/po/ChangeLog.pre-0-2-2
similarity index 100%
rename from po/ChangeLog
rename to po/ChangeLog.pre-0-2-2
diff --git a/src/Makefile.am b/src/Makefile.am
index 53619e0..66f86f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,3 +28,5 @@ hitori_SOURCES = \
 
 hitori_LDFLAGS = 
 hitori_LDADD = $(GENERAL_LIBS)
+
+-include $(top_srcdir)/git.mk
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]