Bug 1128037 - Use jar manifests for shumway and pdf.js. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 30 Apr 2015 16:11:37 +0900
changeset 242327 22be845b13b6306264f8ea0f14df508a922866e7
parent 242326 07c6eccd05c2de8e17e30256661ddc0d301c09c5
child 242328 d1c2ecd59fc068a796748adec4eee215137aedc7
push id28689
push usercbook@mozilla.com
push dateTue, 05 May 2015 10:05:09 +0000
treeherderautoland@754579ec0e68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1128037
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1128037 - Use jar manifests for shumway and pdf.js. r=gps
browser/extensions/Makefile.in
browser/extensions/moz.build
browser/extensions/pdfjs/jar.mn
browser/extensions/pdfjs/moz.build
browser/extensions/shumway/jar.mn
browser/extensions/shumway/moz.build
mobile/android/extensions/Makefile.in
mobile/android/extensions/moz.build
deleted file mode 100644
--- a/browser/extensions/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 $(topsrcdir)/config/rules.mk
-
-exclude_files = \
-  test \
-  README.mozilla \
-  $(NULL)
-
-$(FINAL_TARGET)/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
-	printf 'manifest pdfjs/chrome.manifest' > $@
-
-libs:: $(FINAL_TARGET)/chrome/pdfjs.manifest
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(srcdir)/pdfjs \
-          $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
-          $(FINAL_TARGET)/chrome
-	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest chrome/pdfjs.manifest')
-
-ifdef NIGHTLY_BUILD
-$(FINAL_TARGET)/chrome/shumway.manifest: $(GLOBAL_DEPS)
-	printf 'manifest shumway/chrome.manifest' > $@
-
-libs:: $(FINAL_TARGET)/chrome/shumway.manifest
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(srcdir)/shumway \
-          $(foreach exclude,$(exclude_files), -X $(srcdir)/shumway/$(exclude)) \
-          $(FINAL_TARGET)/chrome
-	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest 'manifest chrome/shumway.manifest')
-endif
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -1,7 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-BROWSER_CHROME_MANIFESTS += ['pdfjs/test/browser.ini']
+DIRS += [
+    'pdfjs',
+    'shumway',
+]
new file mode 100644
--- /dev/null
+++ b/browser/extensions/pdfjs/jar.mn
@@ -0,0 +1,3 @@
+pdfjs.jar:
+% resource pdf.js %content/
+ content/	(content/*)
new file mode 100644
--- /dev/null
+++ b/browser/extensions/pdfjs/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
+JAR_MANIFESTS += ['jar.mn']
new file mode 100644
--- /dev/null
+++ b/browser/extensions/shumway/jar.mn
@@ -0,0 +1,5 @@
+shumway.jar:
+% content shumway %chrome/
+% resource shumway %content/
+ chrome/	(chrome/*)
+ content/	(content/*)
new file mode 100644
--- /dev/null
+++ b/browser/extensions/shumway/moz.build
@@ -0,0 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/mobile/android/extensions/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 $(topsrcdir)/config/rules.mk
-
-SHUMWAY_BROWSER_EXTENSION = $(topsrcdir)/browser/extensions/shumway
-
-exclude_files = \
-  test \
-  $(NULL)
-
-ifdef NIGHTLY_BUILD
-$(FINAL_TARGET)/chrome/shumway.manifest: $(GLOBAL_DEPS)
-	$(call py_action,buildlist,$@ "manifest shumway/chrome.manifest")
-
-libs:: $(SHUMWAY_BROWSER_EXTENSION) $(GLOBAL_DEPS)
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(SHUMWAY_BROWSER_EXTENSION) \
-          $(foreach exclude,$(exclude_files), -X $(SHUMWAY_BROWSER_EXTENSION)/$(exclude)) \
-          $(FINAL_TARGET)/chrome
-
-libs:: $(FINAL_TARGET)/chrome/shumway.manifest
-	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest "manifest chrome/shumway.manifest")
-endif
-
-
--- a/mobile/android/extensions/moz.build
+++ b/mobile/android/extensions/moz.build
@@ -1,6 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
+JAR_MANIFESTS += ['../../../browser/extensions/shumway/jar.mn']