summaryrefslogtreecommitdiff
path: root/src/xpi.mk
diff options
context:
space:
mode:
Diffstat (limited to 'src/xpi.mk')
-rw-r--r--src/xpi.mk55
1 files changed, 3 insertions, 52 deletions
diff --git a/src/xpi.mk b/src/xpi.mk
index 56f50b7..dbf01a3 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -88,51 +88,12 @@
# to MOZ_XPI_EXT_NAME
#
-_xpi_makefile_path ?= /usr/share/mozilla-devscripts
-
--include $(_xpi_makefile_path)/xpi-config.mk
-
-MOZ_XPI_DISTRO ?= all
-
-# xpi-data-*.mk must define packages_*, *_sol, and *_eol
-include $(_xpi_makefile_path)/xpi-data-$(MOZ_XPI_DISTRO).mk
-
-# data for XPI_RECOMMENDS/CHECK_VERSION magic - targetApplication min-/maxVersions
-# call parameters_
-# 1- target app id
-# 2- maxVersion | minVersion
-TARGET_VERSION = $(shell xpath -q -e '//em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/em:$(2)/text() | //em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/@em:$(2) | //RDF:Description[@em:id="$(1)"]/em:$(2)/text() | //RDF:Description[@em:id="$(1)"]/@em:$(2)' $(install_dir)/install.rdf | sed -e 's/.*"\(.*\)"/\1/')
-
-# call parameters_
-# 1- target app id
-# 2- package name
-CHECK_VERSION = $(shell \
- moz-version -cs "$($(2)_eol)" ge $(call TARGET_VERSION,$(1),minVersion) && \
- moz-version -cs "$($(2)_sol)" le $(call TARGET_VERSION,$(1),maxVersion) && \
- echo $(2))
-
MOZ_EXTENSION_PKG ?= $(strip $(shell grep ^Package: debian/control | head -n 1 | sed "s/^Package://"))
MOZ_XPI_ARCH := $(strip $(shell egrep '^Package:|^Architecture:' debian/control | grep -A1 '^Package:[ \t]*$(MOZ_EXTENSION_PKG)[ \t]*$$' | grep ^Architecture: | sed -e 's/Architecture://'))
MOZ_XPI_BUILD_COMMAND ?= xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi
-XPI_RECOMMENDS = $(strip $(foreach id,$(XPI_TARGET_EMIDs), \
- $(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package)))))
-
-# 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_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_XPI_EXT_NAME),xul-ext $(call strip_version,$(XPI_RECOMMENDS)))))
-
ifneq (,$(MOZ_XPI_FILE))
XPI_FILE = $(wildcard $(MOZ_XPI_FILE))
else
@@ -211,21 +172,13 @@ autolinks-stamp: $(patsubst %,install-%-stamp,$(XPI_BASE_FILE)) $(foreach mozill
$(foreach id,$(XPI_TARGET_EMIDs),dh_link -p$(MOZ_EXTENSION_PKG) /usr/$(lib_share_dir)/$(MOZ_EXTENSION_PKG) /usr/lib/mozilla/extensions/$(id)/$(XPI_EMID);)
touch $@
-xpi-recommends-stamp: $(patsubst %,install-%-stamp,$(XPI_BASE_FILE))
- if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Recommends=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi
- echo "xpi:Recommends=$(XPI_RECOMMENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars
+xpi-install: $(patsubst %,install-%-stamp,$(XPI_BASE_FILE)) autolinks-stamp
+ dh_xul-ext -p$(MOZ_EXTENSION_PKG)
ifneq ($(shell grep '$${xpi:Depends}' debian/control),)
@echo 'xpi.mk: $${xpi:Depends} is deprecated, please use $${xpi:Recommends} instead.'
if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Depends=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi
- echo "xpi:Depends=$(XPI_RECOMMENDS)" | sed "s/ / | /g" >> debian/$(MOZ_EXTENSION_PKG).substvars
+ grep '^xpi:Recommends=' debian/$(MOZ_EXTENSION_PKG).substvars | sed "s/^xpi:Recommends=/xpi:Depends=/g" >> debian/$(MOZ_EXTENSION_PKG).substvars
endif
- if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Provides=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi
- echo "xpi:Provides=$(XPI_PROVIDES)" | sed "s/ /, /g" >> debian/$(MOZ_EXTENSION_PKG).substvars
- if test -f debian/$(MOZ_EXTENSION_PKG).substvars; then sed -i '/^xpi:Enhances=/d' debian/$(MOZ_EXTENSION_PKG).substvars; fi
- echo "xpi:Enhances=$(sort $(XPI_RECOMMENDS))" | sed "s/ /, /g" >> debian/$(MOZ_EXTENSION_PKG).substvars
- touch $@
-
-xpi-install: $(patsubst %,install-%-stamp,$(XPI_BASE_FILE)) autolinks-stamp xpi-recommends-stamp
# clean build and remove all .xpi in top-level if a MOZ_XPI_BUILD_COMMAND is defined
clean::
@@ -244,7 +197,5 @@ print-vars:
@echo "XPI_EMID: $(XPI_EMID)"
@echo "RDF_RESOURCES: $(RDF_RESOURCES)"
@echo "XPI_TARGET_EMIDs: $(XPI_TARGET_EMIDs)"
- @echo "XPI_RECOMMENDS: $(XPI_RECOMMENDS)"
- @echo "packages: $(foreach id,$(XPI_TARGET_EMIDs),$(packages_$(id)))"
.PHONY: clean xpi-install print-vars