From a9a49e72cd762c5151c743e35d242ea728c88e49 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 10 Mar 2016 14:36:44 -0500 Subject: [PATCH] build: Use git.mk, make git status clean Having a clean `git status` is really important for not missing files one wants to `git add`. --- .gitignore | 132 +++++++++------ Makefile-daemon.am | 5 +- Makefile-man.am | 2 + Makefile-tests.am | 4 + Makefile.am | 4 + api-doc/Makefile.am | 4 +- buildutil/.gitignore | 6 + git.mk | 348 +++++++++++++++++++++++++++++++++++++++ tests/compose/.gitignore | 2 + 9 files changed, 451 insertions(+), 56 deletions(-) create mode 100644 buildutil/.gitignore create mode 100644 git.mk create mode 100644 tests/compose/.gitignore diff --git a/.gitignore b/.gitignore index e6b24987..5a633da2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,56 +1,80 @@ -# Standard C/Automake goo -.deps -.libs -*.typelib -*.la *.lo *.o -*.pyc -*.stamp -*~ -Makefile -Makefile.in -aclocal.m4 -autom4te.cache -compile -config.guess -config.h -config.h.in -config.log -config.status -config.sub -configure -depcomp -gtk-doc.make -INSTALL -install-sh -libtool -ltmain.sh -missing -stamp-h1 -ylwrap -py-compile -config -m4 -po -ABOUT-NLS -_build - -*.gir -*.typelib - -rpm-ostree -rpm-ostree-relabeling-helper -rpm-ostree-autobuilder - -rpm-ostree-*.tar.xz -rpm-ostree-*.rpm - -rpm-ostree.1 - -rpm-ostreed -rpm-ostreed.1 -org.projectatomic.rpmostree1.service -rpm-ostreed.service -rpm-ostreed-generated.c -rpm-ostreed-generated.h +.deps +.dirstamp +.libs +/*.bak +/*.gcda +/*.gcno +/*.orig +/*.rej +/*.tab.c +/*~ +/.*.sw[nop] +/.dirstamp +/.gitignore +/GPATH +/GRTAGS +/GSYMS +/GTAGS +/ID +/Makefile +/Makefile.in +/RpmOstree-1.0.gir +/RpmOstree-1.0.typelib +/TAGS +/aclocal.m4 +/autom4te.cache +/build-aux/ +/config.cache +/config.h +/config.h.in +/config.log +/config.lt +/config.status +/config.status.lineno +/configure +/configure.lineno +/dbus-run-session +/gtk-doc.make +/libglnx.la +/librpmostree-1.la +/librpmostreed.la +/librpmostreepriv.la +/libtool +/rpm-ostree +/rpm-ostree.1 +/rpm-ostreed +/rpm-ostreed-generated-org.projectatomic.rpmostree1.OS.xml +/rpm-ostreed-generated-org.projectatomic.rpmostree1.Sysroot.xml +/rpm-ostreed-generated-org.projectatomic.rpmostree1.Transaction.xml +/rpm-ostreed-generated.c +/rpm-ostreed-generated.h +/so_locations +/src/daemon/org.projectatomic.rpmostree1.service +/src/daemon/rpm-ostreed.service +/src/lib/rpm-ostree-1.pc +/stamp-h1 +/tags +/test-suite.log +/tests/compose/test-repo-local.repo +/tests/compose/test-repo.repo +/tests/compose/yum/empty +/tests/compose/yum/empty-1.0-1.src.rpm +/tests/compose/yum/repodata/*.bz2 +/tests/compose/yum/repodata/3d1eab7b43ca776ea1c6003925f7f8c8c03762bb65752f8e4a1bdc9af3f0eb8e-primary.xml.gz +/tests/compose/yum/repodata/72300e78e6937f5d6b661633f4209b32c0991078fa42c7fb513a8b461d9c80da-filelists.xml.gz +/tests/compose/yum/repodata/c809bb30c6f1bc814ef8867577973e44650e8a7d2cb03aa44975c3c68a3aff41-other.xml.gz +/tests/compose/yum/repodata/repomd.xml +/tests/jsonutil +/tests/jsonutil.log +/tests/jsonutil.test +/tests/jsonutil.trs +/tests/setup-session.sh +/tests/test-basic.sh.test +/tests/test-compose-no-selinux-tag.sh.test +/tests/test-compose.sh.test +/tests/test-ucontainer.sh.log +/tests/test-ucontainer.sh.test +/tests/test-ucontainer.sh.trs +_libs diff --git a/Makefile-daemon.am b/Makefile-daemon.am index d634d027..6b21d907 100644 --- a/Makefile-daemon.am +++ b/Makefile-daemon.am @@ -13,7 +13,10 @@ rpm-ostreed-generated.c: Makefile.am $(top_srcdir)/src/daemon/org.projectatomic. $(top_srcdir)/src/daemon/org.projectatomic.rpmostree1.xml \ $(NULL) BUILT_SOURCES += $(dbus_built_sources) -CLEANFILES += rpm-ostreed-generated* +CLEANFILES += rpm-ostreed-generated-org.projectatomic.rpmostree1.OS.xml \ + rpm-ostreed-generated-org.projectatomic.rpmostree1.Sysroot.xml \ + rpm-ostreed-generated-org.projectatomic.rpmostree1.Transaction.xml \ + $(NULL) noinst_LTLIBRARIES += librpmostreed.la nodist_librpmostreed_la_SOURCES = $(dbus_built_sources) diff --git a/Makefile-man.am b/Makefile-man.am index 9ab5e6db..0b952156 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -30,3 +30,5 @@ XSLTPROC_FLAGS_MAN = \ rpm-ostree.1: man/rpm-ostree.xml Makefile $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS_MAN) $< + +CLEANFILES += rpm-ostree.1 diff --git a/Makefile-tests.am b/Makefile-tests.am index 47877906..d3acaecb 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -27,6 +27,10 @@ tests/compose/test-repo.repo: tests/compose/test-repo.repo.in tests/compose/yum/ tests/compose/test-repo-local.repo: tests/compose/test-repo.repo.in tests/compose/yum/repodata/repomd.xml cat $< | sed -e "s|%WHERE%|$(shell pwd)|" > $@ +CLEANFILES += tests/compose/test-repo-local.repo \ + tests/compose/yum/empty-1.0-1.src.rpm \ + $(NULL) + tests_jsonutil_CPPFLAGS = -I $(srcdir)/src/libpriv tests_jsonutil_CFLAGS = $(PKGDEP_RPMOSTREE_CFLAGS) tests_jsonutil_LDADD = $(PKGDEP_RPMOSTREE_LIBS) librpmostreepriv.la diff --git a/Makefile.am b/Makefile.am index d7926c62..1a2bce0d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,8 @@ AM_CFLAGS += $(WARN_CFLAGS) EXTRA_DIST += autogen.sh COPYING +GITIGNOREFILES += build-aux/ gtk-doc.make config.h.in aclocal.m4 + SED_SUBST = sed \ -e 's,[@]libexecdir[@],$(libexecdir),g' \ $(NULL) @@ -54,3 +56,5 @@ include Makefile-daemon.am include Makefile-rpm-ostree.am include Makefile-tests.am include Makefile-man.am + +-include $(top_srcdir)/git.mk diff --git a/api-doc/Makefile.am b/api-doc/Makefile.am index 49614ac4..084dd766 100644 --- a/api-doc/Makefile.am +++ b/api-doc/Makefile.am @@ -107,5 +107,7 @@ BUILT_SOURCES = $(DOC_MAIN_SGML_FILE) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make -CLEANFILES += $(BUILT_SOURCES) +CLEANFILES += $(BUILT_SOURCES) rpmostree-overrides.txt version.xml EXTRA_DIST += $(DOC_MAIN_SGML_FILE).in + +-include $(top_srcdir)/git.mk diff --git a/buildutil/.gitignore b/buildutil/.gitignore new file mode 100644 index 00000000..3467f7ab --- /dev/null +++ b/buildutil/.gitignore @@ -0,0 +1,6 @@ +gtk-doc.m4 +libtool.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lt~obsolete.m4 diff --git a/git.mk b/git.mk new file mode 100644 index 00000000..0a731159 --- /dev/null +++ b/git.mk @@ -0,0 +1,348 @@ +# git.mk, a small Makefile to autogenerate .gitignore files +# for autotools-based projects. +# +# 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: +GIT_MK_URL = https://raw.githubusercontent.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, appdata, +# appstream. +# +# 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 \ + ylwrap \ + ; 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" + +git-mk-update: + wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk + +.PHONY: git-all git-mk-install git-mk-update + + + +############################################################################### +# 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" \ + $(REPORT_FILES) \ + $(DOC_MODULE).pdf \ + 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; \ + if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \ + echo "/$(DOC_MODULE).types"; \ + fi; \ + if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \ + echo "/$(DOC_MODULE)-sections.txt"; \ + fi; \ + if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + for x in \ + $(SETUP_FILES) \ + $(DOC_MODULE).types \ + ; do echo "/$$x"; done; \ + fi; \ + 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 "x$(appdata_XML)" = x; then :; else \ + for x in \ + $(appdata_XML:.xml=.valid) \ + ; do echo "/$$x"; done; \ + fi; \ + if test "x$(appstream_XML)" = x; then :; else \ + for x in \ + $(appstream_XML:.xml=.valid) \ + ; 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/stamp-po \ + 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$(LTCXXCOMPILE)" = 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) \ + $(TESTS:=.test) \ + "*.gcda" \ + "*.gcno" \ + $(DISTCLEANFILES) \ + $(am__CONFIG_DISTCLEAN_FILES) \ + $(CONFIG_CLEAN_FILES) \ + TAGS ID GTAGS GRTAGS GSYMS GPATH tags \ + "*.tab.c" \ + $(MAINTAINERCLEANFILES) \ + $(BUILT_SOURCES) \ + $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ + $(filter %_vala.stamp,$(DIST_COMMON)) \ + $(filter %.vapi,$(DIST_COMMON)) \ + $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \ + Makefile \ + Makefile.in \ + "*.orig" \ + "*.rej" \ + "*.bak" \ + "*~" \ + ".*.sw[nop]" \ + ".dirstamp" \ + ; do echo "/$$x"; done; \ + for x in \ + "*.$(OBJEXT)" \ + $(DEPDIR) \ + ; 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/tests/compose/.gitignore b/tests/compose/.gitignore new file mode 100644 index 00000000..53c86454 --- /dev/null +++ b/tests/compose/.gitignore @@ -0,0 +1,2 @@ +packages/ +x86_64/