Bug 1128037 - Use jar manifests for shumway and pdf.js. r=gps

This commit is contained in:
Mike Hommey 2015-04-30 16:11:37 +09:00
parent bd61b51f2d
commit 41cbd04878
8 changed files with 29 additions and 60 deletions

View File

@ -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

View File

@ -4,4 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
BROWSER_CHROME_MANIFESTS += ['pdfjs/test/browser.ini'] DIRS += [
'pdfjs',
'shumway',
]

View File

@ -0,0 +1,3 @@
pdfjs.jar:
% resource pdf.js %content/
content/ (content/*)

View File

@ -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']

View File

@ -0,0 +1,5 @@
shumway.jar:
% content shumway %chrome/
% resource shumway %content/
chrome/ (chrome/*)
content/ (content/*)

View File

@ -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']

View File

@ -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

View File

@ -4,3 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
JAR_MANIFESTS += ['../../../browser/extensions/shumway/jar.mn']