Bug 1219147 - Move resource chrome.manifest line for webapprt to jar.mn. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 28 Oct 2015 16:20:30 +0900
changeset 271162 a4b4bd83536e1c556dc225cb2a79e2aea7854cc7
parent 271161 7542f43c6a5fca79b9881debaca934cc732e5753
child 271163 f3a831ebbcfa847c89a0b3220074dfb81e516ba8
push id86
push usercbook@mozilla.com
push dateWed, 04 Nov 2015 14:00:24 +0000
reviewersmshal
bugs1219147
milestone45.0a1
Bug 1219147 - Move resource chrome.manifest line for webapprt to jar.mn. r=mshal This allows FasterMake to produce this line properly.
webapprt/Makefile.in
webapprt/jar.mn
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -1,16 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Include config.mk explicitly so we can override FINAL_TARGET.
-include $(topsrcdir)/config/config.mk
-
+# Include rules.mk explicitly so we can use FINAL_TARGET. Also, the dependencies
+# for webapprt.ini need to be set after PP_TARGETS are expanded in rules.mk.
 include $(topsrcdir)/config/rules.mk
 
-libs:: $(call mkdir_deps,$(FINAL_TARGET))
-	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'resource webapprt ./')
-
 MOZ_APP_BUILDID := $(shell cat $(DEPTH)/config/buildid)
 DEFINES += -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID)
 
 $(FINAL_TARGET)/webapprt.ini: $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
--- a/webapprt/jar.mn
+++ b/webapprt/jar.mn
@@ -10,8 +10,12 @@ webapprt.jar:
   content/getUserMediaDialog.js         (content/getUserMediaDialog.js)
   content/mochitest-shared.js           (content/mochitest-shared.js)
   content/mochitest.js                  (content/mochitest.js)
   content/mochitest.xul                 (content/mochitest.xul)
 * content/downloads/downloads.xul       (content/downloads/downloads.xul)
   content/downloads/downloads.js        (content/downloads/downloads.js)
   content/downloads/downloads.css       (content/downloads/downloads.css)
   content/downloads/download.xml        (content/downloads/download.xml)
+
+# Trick to put the resource line in dist/bin/webapprt/chrome.manifest
+[.] chrome.jar:
+% resource webapprt ./