Bug 897275 - Move css-logic.js to toolkit. r=jwalker

--HG--
rename : browser/devtools/styleinspector/css-logic.js => toolkit/devtools/styleinspector/css-logic.js
extra : rebase_source : 6d7cbdea4ec7bfed78083ec62c125b6d6c0bab4f
This commit is contained in:
Dave Camp 2013-07-24 10:57:04 -07:00
parent 0edb7edfa2
commit d35f324ce4
5 changed files with 26 additions and 1 deletions

View File

@ -51,6 +51,7 @@ var BuiltinProvider = {
"devtools": "resource:///modules/devtools", "devtools": "resource:///modules/devtools",
"devtools/server": "resource://gre/modules/devtools/server", "devtools/server": "resource://gre/modules/devtools/server",
"devtools/toolkit/webconsole": "resource://gre/modules/devtools/toolkit/webconsole", "devtools/toolkit/webconsole": "resource://gre/modules/devtools/toolkit/webconsole",
"devtools/styleinspector/css-logic": "resource://gre/modules/devtools/styleinspector/css-logic",
// Allow access to xpcshell test items from the loader. // Allow access to xpcshell test items from the loader.
"xpcshell-test": "resource://test" "xpcshell-test": "resource://test"
@ -85,6 +86,8 @@ var SrcdirProvider = {
let toolkitURI = this.fileURI(OS.Path.join(srcdir, "toolkit", "devtools")); let toolkitURI = this.fileURI(OS.Path.join(srcdir, "toolkit", "devtools"));
let serverURI = this.fileURI(OS.Path.join(srcdir, "toolkit", "devtools", "server")); let serverURI = this.fileURI(OS.Path.join(srcdir, "toolkit", "devtools", "server"));
let webconsoleURI = this.fileURI(OS.Path.join(srcdir, "toolkit", "devtools", "webconsole")); let webconsoleURI = this.fileURI(OS.Path.join(srcdir, "toolkit", "devtools", "webconsole"));
let cssLogicURI = this.fileURI(OS.Path.join(toolkitURI, "styleinspector", "css-logic"));
let mainURI = this.fileURI(OS.Path.join(srcdir, "browser", "devtools", "main.js")); let mainURI = this.fileURI(OS.Path.join(srcdir, "browser", "devtools", "main.js"));
this.loader = new loader.Loader({ this.loader = new loader.Loader({
modules: { modules: {
@ -95,6 +98,7 @@ var SrcdirProvider = {
"devtools/server": serverURI, "devtools/server": serverURI,
"devtools/toolkit/webconsole": webconsoleURI, "devtools/toolkit/webconsole": webconsoleURI,
"devtools": devtoolsURI, "devtools": devtoolsURI,
"devtools/styleinspector/css-logic": cssLogicURI,
"main": mainURI "main": mainURI
}, },
globals: loaderGlobals globals: loaderGlobals

View File

@ -10,5 +10,6 @@ PARALLEL_DIRS += [
'gcli', 'gcli',
'sourcemap', 'sourcemap',
'webconsole', 'webconsole',
'apps' 'apps',
'styleinspector'
] ]

View File

@ -0,0 +1,15 @@
# 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/.
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
libs::
$(INSTALL) $(IFLAGS1) $(srcdir)/*.js $(FINAL_TARGET)/modules/devtools/styleinspector

View File

@ -0,0 +1,5 @@
# -*- 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/.