summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--src/xpi.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 630bbac..7e567e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ mozilla-devscripts (0.19) UNRELEASED; urgency=low
- get rid of temp directory; extract xpi file directly into installation
directory
- update src/xpi.mk
+ - combine xpath commands to one command
+ - update src/xpi.mk
- -- Benjamin Drung <bdrung@ubuntu.com> Wed, 02 Dec 2009 12:13:19 +0100
+ -- Benjamin Drung <bdrung@ubuntu.com> Wed, 02 Dec 2009 18:06:28 +0100
mozilla-devscripts (0.18) unstable; urgency=low
diff --git a/src/xpi.mk b/src/xpi.mk
index 5592693..86ce770 100644
--- a/src/xpi.mk
+++ b/src/xpi.mk
@@ -138,16 +138,14 @@ XPI_BASE_FILE = $(notdir $(XPI_FILE))
ifneq (,$(MOZ_XPI_EMID))
XPI_EMID = $(MOZ_XPI_EMID)
else
-XPI_EMID = $(sort $(shell xpath -q -e '/node()/Description/em:id/text() | //RDF:Description[@RDF:about="urn:mozilla:install-manifest"]/em:id/text()' $(install_dir)/install.rdf 2>/dev/null) \
- $(shell xpath -q -e '/node()/Description/@em:id | //RDF:Description[@RDF:about="urn:mozilla:install-manifest"]/@em:id' $(install_dir)/install.rdf 2>/dev/null | sed -e 's/.*"\(.*\)"/\1/'))
+XPI_EMID = $(shell xpath -q -e '/node()/Description/em:id/text() | /node()/Description/@em:id | //RDF:Description[@RDF:about="urn:mozilla:install-manifest"]/em:id/text() | //RDF:Description[@RDF:about="urn:mozilla:install-manifest"]/@em:id' $(install_dir)/install.rdf 2>/dev/null | sed -e 's/.*"\(.*\)"/\1/')
endif
ifeq (,$(MOZ_XPI_DISABLE_AUTOLINKS))
RDF_RESOURCES = $(shell xpath -q -e '//em:targetApplication/@RDF:resource' $(install_dir)/install.rdf 2>/dev/null | sed -e 's/.*="\(.*\)"/\1/')
XPI_TARGET_EMIDs = \
- $(shell xpath -q -e '//em:targetApplication//@em:id' $(install_dir)/install.rdf 2>/dev/null | sed -e 's/.*"\(.*\)"/\1/') \
- $(shell xpath -q -e '//em:targetApplication//em:id/text()' $(install_dir)/install.rdf 2>/dev/null) \
+ $(shell xpath -q -e '//em:targetApplication//em:id/text() | //em:targetApplication//@em:id' $(install_dir)/install.rdf 2>/dev/null | sed -e 's/.*"\(.*\)"/\1/') \
$(foreach resource,$(RDF_RESOURCES),$(shell xpath -q -e '//RDF:Description[@RDF:about="$(resource)"]/@em:id' $(install_dir)/install.rdf 2>/dev/null | sed -e 's/.*"\(.*\)"/\1/'))
endif