From 1654ec935e6da4a52729ce289ee7b744954fb260 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 6 Oct 2015 17:42:00 -0500 Subject: [PATCH] Bug 1203159 - Add resource:// mapping in all DevTools directories. r=glandium,ochameau Add resource mapping jar.mn for DevTools. The DevToolsModules template method is modified to install the files in their new flattened add-on location. --- devtools/shared/jar.mn | 10 ++++++++++ devtools/shared/moz.build | 2 ++ devtools/templates.mozbuild | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 devtools/shared/jar.mn diff --git a/devtools/shared/jar.mn b/devtools/shared/jar.mn new file mode 100644 index 00000000000..4d0823550c5 --- /dev/null +++ b/devtools/shared/jar.mn @@ -0,0 +1,10 @@ +# 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/. + +devtools.jar: +% resource devtools %modules/devtools/ +# The typical approach would be to list all the resource files in this manifest +# for installation. Instead of doing this, use the DevToolsModules syntax via +# moz.build files to do the installation so that we can enforce correct paths +# based on source tree location. diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build index f852e0cb2ce..b0f329915b0 100644 --- a/devtools/shared/moz.build +++ b/devtools/shared/moz.build @@ -32,6 +32,8 @@ BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini'] MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini'] XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini'] +JAR_MANIFESTS += ['jar.mn'] + DevToolsModules( 'async-storage.js', 'async-utils.js', diff --git a/devtools/templates.mozbuild b/devtools/templates.mozbuild index 3d604768175..b12aa99a1ab 100644 --- a/devtools/templates.mozbuild +++ b/devtools/templates.mozbuild @@ -25,7 +25,11 @@ def DevToolsModules(*modules): error('DevToolsModules must be used from the same directory as ' + 'the files to be installed.') - base = EXTRA_JS_MODULES + # jar.mn manifest files are typically used to install files to chrome + # locations. Instead of doing this, use this DevToolsModules syntax via + # moz.build files to do the installation so that we can enforce correct + # paths based on source tree location. + base = FINAL_TARGET_FILES.chrome.devtools.modules for dir in RELATIVEDIR.split('/'): base = base[dir] base += [m for m in modules]