Bug 952120 - Port bug 774572 (Define JAR_MANIFESTS in moz.build files) to DOMi, r=glandium SEA2_25_RELBRANCH
authorPhilip Chee <philip.chee@gmail.com>
Fri, 20 Dec 2013 18:11:57 +0800
branchSEA2_25_RELBRANCH
changeset 1723 5aca607c5dd69d6c697e10a40f3099e5b830851d
parent 1714 2f3aa98497902155ce87c5780e07c9749a65b1d1
child 1724 476654f41cc61f1134d2c4472a74c1760e72b004
child 1726 c9ee18bf9d0c6988574b5c51666537e747c852b1
child 1727 1c6b874b1fd9956c7081e00c08c14df54ad1e529
child 1728 5972b25d5ccbc5bb5e709cbb8ce3943925e7adbe
push id672
push userphilip.chee@gmail.com
push dateSat, 08 Feb 2014 05:18:15 +0000
reviewersglandium
bugs952120, 774572
Bug 952120 - Port bug 774572 (Define JAR_MANIFESTS in moz.build files) to DOMi, r=glandium
moz.build
resources/locale/Makefile.in
--- a/moz.build
+++ b/moz.build
@@ -5,8 +5,10 @@
 
 DIRS += [
     'base',
     'resources',
 ]
 
 XPI_NAME = 'inspector'
 export('XPI_NAME')
+
+JAR_MANIFESTS += ['jar.mn']
--- a/resources/locale/Makefile.in
+++ b/resources/locale/Makefile.in
@@ -6,17 +6,19 @@
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+EXTERNALLY_MANAGED_MAKE_FILE := 1
 STANDALONE_MAKEFILE := 1
+JAR_MANIFEST := $(srcdir)/jar.mn
 
 XPI_NAME               = inspector
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 # Let jar.mn do its happy-dance