From 1563ca8769e6deda70933de6ae4ea512738341d8 Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Fri, 6 Apr 2018 12:10:10 +0200 Subject: [PATCH] Bug 1448077 - Move devtools-startup preferences file to dedicated /preferences folder;r=jryans Changing the name for consistency purposes (see RFC https://github.com/devtools-html/rfcs/issues/43) MozReview-Commit-ID: EahEwoR9eBF --HG-- rename : devtools/startup/devtools-startup-prefs.js => devtools/startup/preferences/devtools-startup.js extra : rebase_source : 5aeb6fa4d1264de91097bf29f9aace844e84ee04 --- .eslintignore | 2 +- browser/installer/package-manifest.in | 2 +- devtools/docs/preferences.md | 4 ++-- devtools/startup/moz.build | 4 ++-- .../devtools-startup.js} | 0 devtools/startup/preferences/moz.build | 9 +++++++++ 6 files changed, 15 insertions(+), 6 deletions(-) rename devtools/startup/{devtools-startup-prefs.js => preferences/devtools-startup.js} (100%) create mode 100644 devtools/startup/preferences/moz.build diff --git a/.eslintignore b/.eslintignore index 74aea2254817..9665a4647df3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -153,7 +153,7 @@ devtools/client/debugger/new/** # Ignore devtools preferences files devtools/client/preferences/** -devtools/startup/devtools-startup-prefs.js +devtools/startup/preferences/devtools-startup.js # Ignore devtools third-party libs devtools/shared/jsbeautify/* diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 16cf166f98c5..7f61bb7af092 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -425,7 +425,7 @@ ; [DevTools Startup Files] @RESPATH@/browser/chrome/devtools-startup@JAREXT@ @RESPATH@/browser/chrome/devtools-startup.manifest -@RESPATH@/browser/@PREF_DIR@/devtools-startup-prefs.js +@RESPATH@/browser/@PREF_DIR@/devtools-startup.js ; DevTools @RESPATH@/browser/chrome/devtools@JAREXT@ diff --git a/devtools/docs/preferences.md b/devtools/docs/preferences.md index 2c580b303432..0fa0322174d1 100644 --- a/devtools/docs/preferences.md +++ b/devtools/docs/preferences.md @@ -72,12 +72,12 @@ To create a new preference, it should be assigned a default value. Default prefe defined in preferences files such as: - devtools/client/preferences/devtools.js - devtools/client/preferences/debugger.js -- devtools/startup/devtools-startup-prefs.js +- devtools/startup/preferences/devtools-startup.js Most new preferences should go in devtools/client/preferences/devtools.js. Debugger specific preferences should go in devtools/client/preferences/debugger.js. Finally if a preference needs to be available very early during the Firefox startup sequence, it should -go in devtools/startup/devtools-startup-prefs.js. +go in devtools/startup/preferences/devtools-startup.js. ### Projects using Launchpad diff --git a/devtools/startup/moz.build b/devtools/startup/moz.build index 2fc701978f2f..c3b701950cc4 100644 --- a/devtools/startup/moz.build +++ b/devtools/startup/moz.build @@ -6,8 +6,8 @@ JAR_MANIFESTS += ['jar.mn'] -JS_PREFERENCE_PP_FILES += [ - 'devtools-startup-prefs.js', +DIRS += [ + 'preferences', ] # Register the startup components only for 'all' builds. diff --git a/devtools/startup/devtools-startup-prefs.js b/devtools/startup/preferences/devtools-startup.js similarity index 100% rename from devtools/startup/devtools-startup-prefs.js rename to devtools/startup/preferences/devtools-startup.js diff --git a/devtools/startup/preferences/moz.build b/devtools/startup/preferences/moz.build new file mode 100644 index 000000000000..e76962642e78 --- /dev/null +++ b/devtools/startup/preferences/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/. + +JS_PREFERENCE_PP_FILES += [ + 'devtools-startup.js' +]