Bug 1219723 - Package gcli with the same layout than in the source tree. r=jryans

This commit is contained in:
Alexandre Poirot 2015-11-02 08:18:58 -08:00
parent 7d5ace2d6e
commit f2849470f8
14 changed files with 162 additions and 129 deletions

View File

@ -87,9 +87,7 @@ BuiltinProvider.prototype = {
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"devtools": "resource://devtools",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"devtools/client": "resource://devtools/client",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"gcli": "resource://devtools/gcli",
"gcli": "resource://devtools/shared/gcli/source/lib/gcli",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
"promise": "resource://gre/modules/Promise-backend.js",
// ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠

View File

@ -1,24 +0,0 @@
/*
* Copyright 2012, Mozilla Foundation and contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
"use strict";
this.EXPORTED_SYMBOLS = [ "gcli", "Requisition" ];
var {require} = Components.utils.import("resource://devtools/shared/Loader.jsm", {});
this.gcli = require('gcli/index');
this.Requisition = require('gcli/cli').Requisition;

View File

@ -6,105 +6,18 @@
DIRS += [
'commands',
'source/lib/gcli',
'source/lib/gcli/connectors',
'source/lib/gcli/converters',
'source/lib/gcli/commands',
'source/lib/gcli/fields',
'source/lib/gcli/languages',
'source/lib/gcli/mozui',
'source/lib/gcli/types',
'source/lib/gcli/ui',
'source/lib/gcli/util',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.commands += [
'source/lib/gcli/commands/clear.js',
'source/lib/gcli/commands/commands.js',
'source/lib/gcli/commands/connect.js',
'source/lib/gcli/commands/context.js',
'source/lib/gcli/commands/exec.js',
'source/lib/gcli/commands/global.js',
'source/lib/gcli/commands/help.js',
'source/lib/gcli/commands/intro.js',
'source/lib/gcli/commands/lang.js',
'source/lib/gcli/commands/mocks.js',
'source/lib/gcli/commands/pref.js',
'source/lib/gcli/commands/preflist.js',
'source/lib/gcli/commands/test.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.connectors += [
'source/lib/gcli/connectors/connectors.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.converters += [
'source/lib/gcli/converters/basic.js',
'source/lib/gcli/converters/converters.js',
'source/lib/gcli/converters/html.js',
'source/lib/gcli/converters/terminal.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.fields += [
'source/lib/gcli/fields/delegate.js',
'source/lib/gcli/fields/fields.js',
'source/lib/gcli/fields/selection.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.languages += [
'source/lib/gcli/languages/command.html',
'source/lib/gcli/languages/command.js',
'source/lib/gcli/languages/javascript.js',
'source/lib/gcli/languages/languages.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.mozui += [
'source/lib/gcli/mozui/completer.js',
'source/lib/gcli/mozui/inputter.js',
'source/lib/gcli/mozui/tooltip.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.types += [
'source/lib/gcli/types/array.js',
'source/lib/gcli/types/boolean.js',
'source/lib/gcli/types/command.js',
'source/lib/gcli/types/date.js',
'source/lib/gcli/types/delegate.js',
'source/lib/gcli/types/file.js',
'source/lib/gcli/types/fileparser.js',
'source/lib/gcli/types/javascript.js',
'source/lib/gcli/types/node.js',
'source/lib/gcli/types/number.js',
'source/lib/gcli/types/resource.js',
'source/lib/gcli/types/selection.js',
'source/lib/gcli/types/setting.js',
'source/lib/gcli/types/string.js',
'source/lib/gcli/types/types.js',
'source/lib/gcli/types/union.js',
'source/lib/gcli/types/url.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.ui += [
'source/lib/gcli/ui/focus.js',
'source/lib/gcli/ui/history.js',
'source/lib/gcli/ui/intro.js',
'source/lib/gcli/ui/menu.css',
'source/lib/gcli/ui/menu.html',
'source/lib/gcli/ui/menu.js',
'source/lib/gcli/ui/view.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli.util += [
'source/lib/gcli/util/domtemplate.js',
'source/lib/gcli/util/fileparser.js',
'source/lib/gcli/util/filesystem.js',
'source/lib/gcli/util/host.js',
'source/lib/gcli/util/l10n.js',
'source/lib/gcli/util/legacy.js',
'source/lib/gcli/util/prism.js',
'source/lib/gcli/util/spell.js',
'source/lib/gcli/util/util.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.gcli += [
'source/lib/gcli/cli.js',
'source/lib/gcli/index.js',
'source/lib/gcli/l10n.js',
'source/lib/gcli/settings.js',
'source/lib/gcli/system.js',
]
FINAL_TARGET_FILES.chrome.devtools.modules.devtools.shared.gcli += [
'gcli.jsm',
'Templater.jsm',
]
DevToolsModules(
'Templater.jsm'
)

View File

@ -0,0 +1,21 @@
# -*- 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/.
DevToolsModules(
'clear.js',
'commands.js',
'connect.js',
'context.js',
'exec.js',
'global.js',
'help.js',
'intro.js',
'lang.js',
'mocks.js',
'pref.js',
'preflist.js',
'test.js',
)

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/.
DevToolsModules(
'connectors.js',
)

View File

@ -0,0 +1,12 @@
# -*- 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/.
DevToolsModules(
'basic.js',
'converters.js',
'html.js',
'terminal.js',
)

View File

@ -0,0 +1,11 @@
# -*- 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/.
DevToolsModules(
'delegate.js',
'fields.js',
'selection.js',
)

View File

@ -0,0 +1,12 @@
# -*- 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/.
DevToolsModules(
'command.html',
'command.js',
'javascript.js',
'languages.js',
)

View File

@ -0,0 +1,13 @@
# -*- 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/.
DevToolsModules(
'cli.js',
'index.js',
'l10n.js',
'settings.js',
'system.js',
)

View File

@ -0,0 +1,11 @@
# -*- 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/.
DevToolsModules(
'completer.js',
'inputter.js',
'tooltip.js',
)

View File

@ -0,0 +1,25 @@
# -*- 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/.
DevToolsModules(
'array.js',
'boolean.js',
'command.js',
'date.js',
'delegate.js',
'file.js',
'fileparser.js',
'javascript.js',
'node.js',
'number.js',
'resource.js',
'selection.js',
'setting.js',
'string.js',
'types.js',
'union.js',
'url.js',
)

View File

@ -0,0 +1,15 @@
# -*- 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/.
DevToolsModules(
'focus.js',
'history.js',
'intro.js',
'menu.css',
'menu.html',
'menu.js',
'view.js',
)

View File

@ -0,0 +1,17 @@
# -*- 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/.
DevToolsModules(
'domtemplate.js',
'fileparser.js',
'filesystem.js',
'host.js',
'l10n.js',
'legacy.js',
'prism.js',
'spell.js',
'util.js',
)

View File

@ -43,8 +43,8 @@
srcdir.load();
is(builtin.loader.mapping.length,
srcdir.loader.mapping.length + 2,
"The built-in loader has 2 additional mappings.");
srcdir.loader.mapping.length + 1,
"The built-in loader has one additional mappings.");
Services.prefs.clearUserPref(SRCDIR_PREF);
</script>