X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=debian%2Ftg2quilt.mk;h=744b853a4e41a156748e41e6135851c38641eabc;hp=4cd27553df33359075b1af26687b0cd58f386ebd;hb=82f304a9d9a72111fde3127b15537f67df1d6612;hpb=04fa1a90a7bae10acfe2eb7c03a088f49186be3c diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk index 4cd2755..744b853 100644 --- a/debian/tg2quilt.mk +++ b/debian/tg2quilt.mk @@ -10,6 +10,10 @@ # include /usr/share/quilt/quilt.make # -include /usr/share/topgit/tg2quilt.mk # +# The leading dash is necessary for make not to die when the file is not +# installed. TopGit is not a build dependency (and does not need to be), and +# if the package is not installed, debian/rules can still be used normally. +# # The snippet exports the following targets. These targets only perform the # describe behaviour when invoked from a TopGit repository (`tg summary -t` # returns a non-empty set); used outside, they simply output informational @@ -27,13 +31,18 @@ # target, and invokes tg-rmdir # # tg-rmdir: tries to remove debian/patches, but only if there are no -# non-TopGit files under the directory. +# non-TopGit files under the directory, the repository has +# no uncommitted changes, and there are not quilt patches +# applied. # The heuristic is to find files that do not contain a line # matchines /^tg:/, minus the series file. If any such files # are found, an error occurs. Otherwise, the directory is # removed. This means that edits to the series file are # likely to vanish. # +# tg-cleanexport: recreates the debian/patches directory from scratch, using +# tg-rmdir and tg-export. +# # tg-forceclean: cleans the source tree, just like the debian/rules clean # target, and forcefully removes the debian/patches # directory in doing so. Yes, *force*-fully. WHAM! @@ -42,7 +51,7 @@ # that tg-export is automatically invoked before quilt gets a chance to patch # or unpatch the tree. # -# The PATCHES_DIR variable can be set before including the file to override +# The QUILT_PATCH_DIR variable can be set before including the file to override # the default debian/patches location. # # More information, particularly for people working on TopGit-using packages, @@ -55,13 +64,21 @@ ifeq ($(shell tg summary -t),) # This is not a TopGit branch, so just blubber a bit. - tg-export tg-clean tg-forceclean tg-rmdir: + tg-export tg-clean tg-forceclean tg-rmdir tg-cleanexport: @echo "E: The $@ target only works from a TopGit repository." >&2 else # We are in a TopGit branch, so let the fun begin. -PATCHES_DIR ?= $(QUILT_PATCH_DIR) +ifdef PATCHES_DIR + DUMMY := $(warning W: The $$PATCHES_DIR variable is deprecated, please use $$QUILT_PATCH_DIR instead.) + DUMMY := $(warning W: Sleeping for 10 seconds so you can read this!) + DUMMY := $(shell sleep 10) + QUILT_PATCH_DIR := $(PATCHES_DIR) +endif + +QUILT_PATCH_DIR ?= debian/patches +QUILT_STAMPFN ?= patch # Hook tg-export into quilt's make(1) snippet such that it gets executed # before quilt patches or unpatches. @@ -80,13 +97,13 @@ tg-export: __TG_COMMA := , tg-export: __TG_EMPTY := tg-export: __TG_SPACE := $(__TG_EMPTY) $(__TG_EMPTY) -ifeq ($(wildcard $(PATCHES_DIR)/series),) +ifeq ($(wildcard $(QUILT_PATCH_DIR)/series),) # The series file does not exist, so we proceed normally # tg-export will not work if the target dir already exists, so try to remove # it by calling tg-rmdir tg-export: tg-rmdir - tg export -b $(subst $(__TG_SPACE),$(__TG_COMMA),$(TG_BRANCHES)) --quilt $(PATCHES_DIR) + tg export -b $(subst $(__TG_SPACE),$(__TG_COMMA),$(TG_BRANCHES)) --quilt $(QUILT_PATCH_DIR) else # The series file already exists, so assume there is nothing to do. tg-export: @@ -95,26 +112,40 @@ else @echo "I: (you can ignore this message during a \`tg-clean\` run.)" >&2 endif -ifeq ($(wildcard $(PATCHES_DIR)),) +ifeq ($(wildcard $(QUILT_PATCH_DIR)),) # No patch directory, so nothing to do: tg-rmdir: @true else # There is a patch directory, let's try to clean it out: - tg-rmdir: __TG_FILES := $(shell find $(PATCHES_DIR) -type f -a -not -path \*/series \ + tg-rmdir: __TG_FILES := $(shell find $(QUILT_PATCH_DIR) -type f -a -not -path \*/series \ | xargs grep -l '^tg:') tg-rmdir: + QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a 2>/dev/null || : + @if quilt applied >/dev/null 2>&1; then \ + echo "E: there are applied quilt patches." >&2; \ + echo "E: please unapply (pop) all patches and try again." >&2; \ + false; \ + fi + @git update-index -q --ignore-submodules --refresh + @if git diff-index --quiet --cached HEAD --ignore-submodules -- > /dev/null || git diff-files --quiet --ignore-submodules > /dev/null; then \ + echo "E: there are uncommitted changes in the working directory." >&2; \ + echo "E: please commit or revert all changes." >&2; \ + false; \ + fi # remove all files whose contents matches /^tg:/ - test -n "$(__TG_FILES)" && rm $(__TG_FILES) || : - # remove the series file - test -f $(PATCHES_DIR)/series && rm $(PATCHES_DIR)/series || : + rm -f $(__TG_FILES) + # remove the series file + rm -f $(QUILT_PATCH_DIR)/series + # remove dpkg v3 file + rm -f $(QUILT_PATCH_DIR)/.dpkg-source-applied # try to remove directories - find $(PATCHES_DIR) -type d | tac | xargs rmdir 2>/dev/null || : + find $(QUILT_PATCH_DIR) -depth -type d -empty -execdir rmdir {} + # fail if the directory could not be removed and still exists - @test ! -d $(PATCHES_DIR) || { \ - echo "E: $(PATCHES_DIR) contains non-TopGit-generated files:" >&2; \ - find $(PATCHES_DIR) -type f -printf 'E: %P\n' >&2; \ + @test ! -d $(QUILT_PATCH_DIR) || { \ + echo "E: $(QUILT_PATCH_DIR) contains non-TopGit-generated files:" >&2; \ + find $(QUILT_PATCH_DIR) -type f -printf 'E: %P\n' >&2; \ false; \ } endif @@ -124,10 +155,14 @@ tg-clean: clean $(MAKE) --no-print-directory -f debian/rules tg-rmdir tg-forceclean: clean - test -d $(PATCHES_DIR) && rm -r $(PATCHES_DIR) || : + test -d $(QUILT_PATCH_DIR) && rm -r $(QUILT_PATCH_DIR) || : + +tg-cleanexport: tg-rmdir + $(MAKE) --no-print-directory -f debian/rules tg-export endif -.PHONY: tg-clean tg-export tg-forceclean tg-rmdir +.PHONY: tg-clean tg-export tg-forceclean tg-rmdir tg-cleanexport # vim:ft=make:ts=8:noet +# -*- Makefile -*-, you silly Emacs! (shamelessly stolen from quilt)