summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Drung <bdrung@ubuntu.com>2009-10-06 19:17:25 +0200
committerBenjamin Drung <bdrung@ubuntu.com>2009-10-06 19:17:25 +0200
commitd366930b3bbd883bbb00c56f30fbcdd27c766844 (patch)
tree42f20d0e6019593e4d5f7893be073bf33696e578
parent06e74ac9929f2c7e6e425ac862e04fb5db303036 (diff)
- rename MOZ_EXT_NAME to MOZ_XPI_EXT_NAME
- update src/xpi.mk.in
-rw-r--r--debian/changelog4
-rw-r--r--src/xpi.mk.in19
2 files changed, 17 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 4666399..be63f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ mozilla-devscripts (0.17) UNRELEASED; urgency=low
- add src/xpi-data-Ubuntu.mk
- update debian/control
- update src/Makefile
+ - rename MOZ_EXT_NAME to MOZ_XPI_EXT_NAME
+ - update src/xpi.mk.in
- -- Benjamin Drung <bdrung@ubuntu.com> Tue, 06 Oct 2009 19:02:27 +0200
+ -- Benjamin Drung <bdrung@ubuntu.com> Tue, 06 Oct 2009 19:17:17 +0200
mozilla-devscripts (0.16) unstable; urgency=low
diff --git a/src/xpi.mk.in b/src/xpi.mk.in
index 9e8219e..858d18b 100644
--- a/src/xpi.mk.in
+++ b/src/xpi.mk.in
@@ -60,7 +60,7 @@
# license files in debian/copyright appropriately. If not defined
# the common license file names are guessed.
#
-# MOZ_EXT_NAME (OPTIONAL):
+# MOZ_XPI_EXT_NAME (OPTIONAL):
# defines the name of the extension (without any prefixes like
# mozilla- or xul-ext-). If not defined MOZ_EXTENSION_PKG with
# stripped prefixes is used. This value is used to determine
@@ -77,6 +77,10 @@
# default is already empty; if you still need this variable,
# migrate your code to MOZ_XPI_MOZILLA_EXTRA_DIRS
#
+# MOZ_EXT_NAME /deprecated/ (OPTIONAL):
+# this variable is deprecated and will go away; it was renamed
+# to MOZ_XPI_EXT_NAME
+#
MOZ_XPI_DISTRO ?= @DISTRO@
@@ -108,13 +112,18 @@ MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi
XPI_RECOMMENDS = $(strip $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \
$(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package)))))
-MOZ_EXT_NAME ?= $(shell echo $(MOZ_EXTENSION_PKG) | sed "s/^firefox-//;s/^iceweasel-//;s/^mozilla-//;s/^xul-ext-//")
+# support for deprecated MOZ_EXT_NAME
+ifneq $(,$(MOZ_EXT_NAME))
+MOZ_XPI_EXT_NAME := $(MOZ_EXT_NAME)
+endif
+
+MOZ_XPI_EXT_NAME ?= $(shell echo $(MOZ_EXTENSION_PKG) | sed "s/^firefox-//;s/^iceweasel-//;s/^mozilla-//;s/^xul-ext-//")
-ifeq ($(MOZ_EXT_NAME),$(strip $(shell grep ^Source: debian/control | sed "s/^Source://")))
-ADDITIONAL_PROVIDES := $(MOZ_EXT_NAME)
+ifeq ($(MOZ_XPI_EXT_NAME),$(strip $(shell grep ^Source: debian/control | sed "s/^Source://")))
+ADDITIONAL_PROVIDES := $(MOZ_XPI_EXT_NAME)
endif
strip_version = $(sort $(foreach package,$(1),$(shell echo $(package) | sed "s/-[0-9.]*$$//")))
-XPI_PROVIDES = $(sort $(filter-out $(MOZ_EXTENSION_PKG),$(ADDITIONAL_PROVIDES) $(addsuffix -$(MOZ_EXT_NAME),xul-ext $(call strip_version,$(XPI_RECOMMENDS)))))
+XPI_PROVIDES = $(sort $(filter-out $(MOZ_EXTENSION_PKG),$(ADDITIONAL_PROVIDES) $(addsuffix -$(MOZ_XPI_EXT_NAME),xul-ext $(call strip_version,$(XPI_RECOMMENDS)))))
TEMPDIR := temp-xpi-unpacked