Bug#632895: mozilla-devscripts: add a MOZ_XPI_CLEAN_COMMAND to xpi.mk

[Ximin Luo]

Package: mozilla-devscripts
Version: 0.26
Severity: wishlist
Tags: patch

the full potential of a custom build command can't be fully realised with a way
to have a custom clean command too.

patch supplied, hopefully it's satisfactory


-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages mozilla-devscripts depends on:
ii  dpkg-dev                     1.16.0.3    Debian package development tools
ii  fakeroot                     1.16-1      tool for simulating superuser priv
ii  perl                         5.12.3-7+b1 Larry Wall's Practical Extraction 
ii  python                       2.6.6-14    interactive high-level object-orie
ii  python-librdf                1.0.13.1-2  Python language bindings for the R
ii  python2.6                    2.6.7-1     An interactive high-level object-o
ii  python2.7                    2.7.1-8     An interactive high-level object-o
ii  quilt                        0.48-7      Tool to work with series of patche
ii  unzip                        6.0-4       De-archiver for .zip files
ii  wget                         1.12-3.1    retrieves files from the web
ii  zip                          3.0-4       Archiver for .zip files

mozilla-devscripts recommends no packages.

Versions of packages mozilla-devscripts suggests:
ii  cvs                     2:1.12.13+real-5 Concurrent Versions System
ii  git                     1:1.7.5.4-1      fast, scalable, distributed revisi
ii  mercurial               1.8.3-1          scalable distributed version contr

-- no debconf information
-------------- next part --------------
--- /usr/share/mozilla-devscripts/xpi.mk	2011-06-15 22:49:22.000000000 +0100
+++ /usr/share/mozilla-devscripts/xpi.mk	2011-07-06 21:23:36.300681895 +0100
@@ -37,9 +37,13 @@
 #                if defined the given command will be run _before_ the extension
 #                gets packaged up the standard .xpi way. Thus, the build command
 #                should produce an .xpi in top level directory. Note: If this
-#                command is specified, all .xpi files in the top level directory
-#                will be removed during |clean|. If the .xpi file will not be
-#                build from source, you have to set this variable to nothing.
+#                command is specified, MOZ_XPI_CLEAN_COMMAND (see below) will be
+#                run during |clean|. If the .xpi file will not be build from
+#                source, you have to set this variable to nothing.
+#
+#        MOZ_XPI_CLEAN_COMMAND (OPTIONAL):
+#                only has an effect if MOZ_XPI_BUILD_COMMAND (see above) is set.
+#                It defaults to `rm -f *.xpi`.
 #
 #        MOZ_XPI_MOZILLA_EXTRA_DIRS (OPTIONAL):
 #                defines extra directories to link the extension in. Usually
@@ -86,6 +90,7 @@
 MOZ_EXTENSION_PKG ?= $(strip $(shell grep ^Package: debian/control | head -n 1 | sed "s/^Package://"))
 
 MOZ_XPI_BUILD_COMMAND ?= xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi
+MOZ_XPI_CLEAN_COMMAND ?= rm -f *.xpi
 
 ifneq (,$(MOZ_XPI_FILE))
 xpi_file = $(wildcard $(MOZ_XPI_FILE))
@@ -131,7 +136,7 @@
 clean::
 	dh_testdir
 	dh_clean
-	rm -f *.xpi
+	$(MOZ_XPI_CLEAN_COMMAND)
 endif
 
 .PHONY: clean xpi-install