diff options
| author | Benjamin Drung <bdrung@ubuntu.com> | 2009-12-02 18:06:40 +0100 |
|---|---|---|
| committer | Benjamin Drung <bdrung@ubuntu.com> | 2009-12-02 18:06:40 +0100 |
| commit | 709e24032fd9dcce0ef34b331f41b441923d8814 (patch) | |
| tree | 72a8109bb646a28ffba7cfe06e99775a64dbcfc4 /src | |
| parent | 61757cd02f584f0b9982221f9d1af8e2979bad1e (diff) | |
- combine xpath commands to one command
- update src/xpi.mk
Diffstat (limited to 'src')
| -rw-r--r-- | src/xpi.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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 |