Bug 1900200 - Move MOZ_DEVTOOLS from confvars.sh to moz.configure r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D212363

browser/confvars.sh

@@ -33,6 +33,3 @@ MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
 
 MOZ_PROFILE_MIGRATOR=1
-
-# Include the DevTools client, not just the server (which is the default)
-MOZ_DEVTOOLS=all

browser/moz.configure

@@ -14,6 +14,8 @@ imply_option("MOZ_NORMANDY", True)
 
 imply_option("MOZ_APP_VENDOR", "Mozilla")
 imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
+# Include the DevTools client, not just the server (which is the default)
+imply_option("MOZ_DEVTOOLS", "all")
 imply_option("BROWSER_CHROME_URL", "chrome://browser/content/browser.xhtml")
 
 with only_when(target_has_linux_kernel & compile_environment):

devtools/moz.build

@@ -4,9 +4,6 @@
 # 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/.
 
-if CONFIG["MOZ_DEVTOOLS"] and CONFIG["MOZ_DEVTOOLS"] not in ("all", "server"):
-    error("Unsupported MOZ_DEVTOOLS value: %s" % (CONFIG["MOZ_DEVTOOLS"]))
-
 if CONFIG["MOZ_DEVTOOLS"] == "all":
     DIRS += [
         "client",

old-configure.in

@@ -504,7 +504,6 @@ dnl ========================================================
 
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
-MOZ_DEVTOOLS=server
 
 dnl ========================================================
 dnl = Trademarked Branding
@@ -851,8 +850,6 @@ AC_SUBST(BIN_SUFFIX)
 AC_SUBST(WIN32_CONSOLE_EXE_LDFLAGS)
 AC_SUBST(WIN32_GUI_EXE_LDFLAGS)
 
-AC_SUBST(MOZ_DEVTOOLS)
-
 dnl Used specifically by Thunderbird
 AC_SUBST(NSS_EXTRA_SYMBOLS_FILE)
 

toolkit/moz.configure

@@ -26,6 +26,14 @@ project_flag(
     help='used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
 )
 
+project_flag(
+    env="MOZ_DEVTOOLS",
+    default="server",
+    choices=("all", "server"),
+    nargs=1,
+    help="which devtools version should be built",
+)
+
 project_flag(
     env="BROWSER_CHROME_URL",
     default="",