Bug 1448077 - Move devtools-startup preferences file to dedicated /preferences folder;r=jryans

juliandescottes · juliandescottes · commit 1563ca8769e6 · 2018-04-06T12:10:10.000+02:00
Changing the name for consistency purposes (see RFC firefox-devtools/rfcs#43) MozReview-Commit-ID: EahEwoR9eBF --HG-- rename : devtools/startup/devtools-startup-prefs.js => devtools/startup/preferences/devtools-startup.js extra : rebase_source : 5aeb6fa4d1264de91097bf29f9aace844e84ee04
diff --git 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
@@ -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
@@ -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
@@ -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/preferences/devtools-startup.js b/devtools/startup/preferences/devtools-startup.js
diff --git a/devtools/startup/preferences/moz.build 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'
+]

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`JAR_MANIFESTS += ['jar.mn']`
`8`	`8`
`9`		`-JS_PREFERENCE_PP_FILES += [`
`10`		`- 'devtools-startup-prefs.js',`
	`9`	`+DIRS += [`
	`10`	`+ 'preferences',`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`# Register the startup components only for 'all' builds.`