diff options
| author | Benjamin Drung <bdrung@ubuntu.com> | 2009-08-22 17:13:50 +0200 |
|---|---|---|
| committer | Benjamin Drung <bdrung@ubuntu.com> | 2009-08-22 17:13:50 +0200 |
| commit | 1b90b2ea10d7a0bed4a79faae0647be818f4e891 (patch) | |
| tree | 8ecce57b713a285e9f31a9920b88abfbca46ed81 | |
| parent | 933f5304f9c11084aa1f3fdec3df4a0b9a780306 (diff) | |
- rename stamp-* targets to *-stamp, merge stamp-extension-install into
xpi-install, merge xpi-clean into clean
- update src/xpi.mk
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/xpi.mk | 38 |
2 files changed, 21 insertions, 22 deletions
diff --git a/debian/changelog b/debian/changelog index 01e8b52..27fc9b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,11 @@ mozilla-devscripts (0.16) UNRELEASED; urgency=low - update src/xpi.mk - MOZ_EXTENSION_PKG is defined in either case, removing missing case handler - update src/xpi.mk + - rename stamp-* targets to *-stamp, merge stamp-extension-install into + xpi-install, merge xpi-clean into clean + - update src/xpi.mk - -- Benjamin Drung <bdrung@ubuntu.com> Sat, 22 Aug 2009 14:24:33 +0200 + -- Benjamin Drung <bdrung@ubuntu.com> Sat, 22 Aug 2009 17:11:36 +0200 mozilla-devscripts (0.15) unstable; urgency=low @@ -182,14 +182,8 @@ endif install/$(MOZ_EXTENSION_PKG):: xpi-install -# clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined -clean:: xpi-clean -ifneq (,$(MOZ_XPI_BUILD_COMMAND)) - rm -f *.xpi -endif - # ### general helper targets -stamp-unzip-%: $(XPI_FILE) +unzip-%-stamp: $(XPI_FILE) [ -d $(TEMPDIR) ] || mkdir -p $(TEMPDIR) ifneq (,$(MOZ_XPI_DOCUMENTED_LICENSE_FILES)) unzip -d $(TEMPDIR) $(XPI_DIR)$* -x $(MOZ_XPI_DOCUMENTED_LICENSE_FILES) @@ -198,34 +192,36 @@ else endif touch $@ -stamp-installlinks-%: +installlinks-%-stamp: unzip-$(XPI_BASE_FILE)-stamp dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/$*/extensions/$(call XPI_EMID,$(TEMPDIR)) touch $@ -stamp-autolinks: $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),stamp-installlinks-$(mozilla)) +autolinks-stamp: unzip-$(XPI_BASE_FILE)-stamp $(foreach mozilla,$(MOZ_XPI_MOZILLA_DIRS),installlinks-$(mozilla)-stamp) $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)),dh_link -p$(MOZ_EXTENSION_PKG) /usr/share/$(MOZ_EXTENSION_PKG) /usr/lib/mozilla/extensions/$(id)/$(call XPI_EMID,$(TEMPDIR));) touch $@ -stamp-install-%: stamp-autolinks +install-%-stamp: unzip-%-stamp dh_install -p$(MOZ_EXTENSION_PKG) $(wildcard $(TEMPDIR)/*) /usr/share/$(MOZ_EXTENSION_PKG) touch $@ -stamp-extension-install: stamp-unzip-$(XPI_BASE_FILE) stamp-install-$(XPI_BASE_FILE) - touch $@ - -stamp-xpi-depends: +xpi-depends-stamp: unzip-$(XPI_BASE_FILE)-stamp if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then grep -v ^xpi:Depends= debian/$(MOZ_EXTENSION_PKG).substvars > debian/$(MOZ_EXTENSION_PKG).substvars~; fi echo "xpi:Depends=$(XPI_DEPENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars~ mv debian/$(MOZ_EXTENSION_PKG).substvars~ debian/$(MOZ_EXTENSION_PKG).substvars touch $@ -xpi-install: stamp-extension-install stamp-xpi-depends +xpi-install: install-$(XPI_BASE_FILE)-stamp autolinks-stamp xpi-depends-stamp -xpi-clean: +# clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined +clean:: + dh_testdir dh_clean - -rm -f stamp-extension-install \ - stamp-* \ - $(NULL) - -rm -rf $(TEMPDIR) + rm -rf $(TEMPDIR) +ifeq ($(shell expr $(shell cat debian/compat) '<' 7),1) + rm -f *-stamp +endif +ifneq (,$(MOZ_XPI_BUILD_COMMAND)) + rm -f *.xpi +endif -.PHONY: xpi-install xpi-clean +.PHONY: clean xpi-install |