Bug 1298012 - move l10n.js from devtools/client/shared to devtools/shared;r=bgrins draft
authorJulian Descottes <jdescottes@mozilla.com>
Thu, 25 Aug 2016 17:26:53 +0200
changeset 405515 f3320539fb5d01fc88cd9ecd8fedc27fcdbeac1f
parent 405510 3c21b3195b05b66a99b751f16cc4822ed44e8958
child 405516 7f8b3c533db01750017944907a4124184676470b
push id27510
push userjdescottes@mozilla.com
push dateThu, 25 Aug 2016 15:40:36 +0000
reviewersbgrins
bugs1298012
milestone51.0a1
Bug 1298012 - move l10n.js from devtools/client/shared to devtools/shared;r=bgrins MozReview-Commit-ID: 1HX0g7AoJwt
devtools/client/shared/l10n.js
devtools/client/shared/moz.build
devtools/client/shared/vendor/NODE_PROPERTIES_UPGRADING
devtools/client/shared/vendor/SPRINTF_JS_UPGRADING
devtools/client/shared/vendor/moz.build
devtools/client/shared/vendor/node-properties.js
devtools/client/shared/vendor/sprintf.js
devtools/shared/l10n.js
devtools/shared/moz.build
devtools/shared/node-properties/UPGRADING.md
devtools/shared/node-properties/moz.build
devtools/shared/node-properties/node-properties.js
devtools/shared/sprintfjs/UPGRADING.md
devtools/shared/sprintfjs/moz.build
devtools/shared/sprintfjs/sprintf.js
--- a/devtools/client/shared/moz.build
+++ b/devtools/client/shared/moz.build
@@ -31,17 +31,16 @@ DevToolsModules(
     'file-watcher-worker.js',
     'file-watcher.js',
     'frame-script-utils.js',
     'getjson.js',
     'inplace-editor.js',
     'Jsbeautify.jsm',
     'key-shortcuts.js',
     'keycodes.js',
-    'l10n.js',
     'node-attribute-parser.js',
     'options-view.js',
     'output-parser.js',
     'poller.js',
     'prefs.js',
     'scroll.js',
     'source-utils.js',
     'SplitView.jsm',
--- a/devtools/client/shared/vendor/moz.build
+++ b/devtools/client/shared/vendor/moz.build
@@ -2,27 +2,25 @@
 # 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/.
 modules = []
 modules += [
     'immutable.js',
     'jsol.js',
-    'node-properties.js',
 ]
 
 # react-dev is used if either debug mode is enabled,
 # so include it for both
 if CONFIG['DEBUG_JS_MODULES'] or CONFIG['MOZ_DEBUG']:
     modules += ['react-dev.js']
 
 modules += [
     'react-dom.js',
     'react-proxy.js',
     'react-redux.js',
     'react.js',
     'redux.js',
     'seamless-immutable.js',
-    'sprintf.js',
 ]
 
 DevToolsModules(*modules)
rename from devtools/client/shared/l10n.js
rename to devtools/shared/l10n.js
--- a/devtools/client/shared/l10n.js
+++ b/devtools/shared/l10n.js
@@ -1,15 +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/. */
 "use strict";
 
-const parsePropertiesFile = require("devtools/client/shared/vendor/node-properties");
-const { sprintf } = require("devtools/client/shared/vendor/sprintf");
+const parsePropertiesFile = require("devtools/shared/node-properties/node-properties");
+const { sprintf } = require("devtools/shared/sprintfjs/sprintf");
 
 /**
  * Localization convenience methods.
  *
  * @param string stringBundleName
  *        The desired string bundle's name.
  */
 function LocalizationHelper(stringBundleName) {
--- a/devtools/shared/moz.build
+++ b/devtools/shared/moz.build
@@ -13,22 +13,24 @@ DIRS += [
     'discovery',
     'fronts',
     'gcli',
     'heapsnapshot',
     'inspector',
     'jsbeautify',
     'layout',
     'locales',
+    'node-properties',
     'performance',
     'platform',
     'pretty-fast',
     'qrcode',
     'security',
     'sourcemap',
+    'sprintfjs',
     'shims',
     'specs',
     'touch',
     'transport',
     'webconsole',
     'worker',
 ]
 
@@ -51,16 +53,17 @@ DevToolsModules(
     'defer.js',
     'deprecated-sync-thenables.js',
     'DevToolsUtils.js',
     'dom-node-constants.js',
     'dom-node-filter-constants.js',
     'event-emitter.js',
     'flags.js',
     'indentation.js',
+    'l10n.js',
     'loader-plugin-raw.jsm',
     'Loader.jsm',
     'Parser.jsm',
     'path.js',
     'protocol.js',
     'system.js',
     'task.js',
     'ThreadSafeDevToolsUtils.js',
rename from devtools/client/shared/vendor/NODE_PROPERTIES_UPGRADING
rename to devtools/shared/node-properties/UPGRADING.md
new file mode 100644
--- /dev/null
+++ b/devtools/shared/node-properties/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; 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(
+    'node-properties.js'
+)
rename from devtools/client/shared/vendor/node-properties.js
rename to devtools/shared/node-properties/node-properties.js
rename from devtools/client/shared/vendor/SPRINTF_JS_UPGRADING
rename to devtools/shared/sprintfjs/UPGRADING.md
new file mode 100644
--- /dev/null
+++ b/devtools/shared/sprintfjs/moz.build
@@ -0,0 +1,9 @@
+# -*- Mode: python; 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(
+    'sprintf.js'
+)
rename from devtools/client/shared/vendor/sprintf.js
rename to devtools/shared/sprintfjs/sprintf.js