From db2b2dcc551d426d4ab0b9c4ce74f1d209b06f44 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Thu, 6 Aug 2009 03:31:11 +0200 Subject: - make MOZ_EXTENSION_PKG optional; if this variable is unset, the first binary package listed in debian/control will be used - update src/xpi.mk --- debian/changelog | 5 ++++- src/xpi.mk | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a776f2..cf122ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,8 +44,11 @@ mozilla-devscripts (0.14) UNRELEASED; urgency=low - implement start/end of life for comparing possible alternate binary dependency - update src/xpi.mk + - make MOZ_EXTENSION_PKG optional; if this variable is unset, the first + binary package listed in debian/control will be used + - update src/xpi.mk - -- Benjamin Drung Wed, 05 Aug 2009 01:01:31 +0200 + -- Benjamin Drung Thu, 06 Aug 2009 03:26:18 +0200 mozilla-devscripts (0.13) unstable; urgency=low diff --git a/src/xpi.mk b/src/xpi.mk index 820605e..cfe2aaf 100644 --- a/src/xpi.mk +++ b/src/xpi.mk @@ -24,8 +24,10 @@ # Usage: include this file in your cdbs debian/rules file and define the # following variables: # -# MOZ_EXTENSION_PKG (MANDATORY): -# define the binary package name used to ship this xpi +# MOZ_EXTENSION_PKG (OPTIONAL): +# if defined the given binary package name is used to ship this +# xpi; otherwise the first binary package listed in debian/control +# is used # # MOZ_XPI_FILE (OPTIONAL): # if defined the given .xpi file is used; otherwise we try to @@ -135,6 +137,8 @@ MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi; XPI_DEPENDS = $(sort $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \ $(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package))))) +MOZ_EXTENSION_PKG ?= $(strip $(shell grep ^Package: debian/control | head -n 1 | sed "s/^Package://")) + TEMPDIR := temp-xpi-unpacked ifneq (,$(MOZ_XPI_FILE)) -- cgit v1.2.3