fixup! Base Browser's .mozconfigs.

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Removed the --enable-base-browser flag and the BASE_BROWSER macro and
added --with-base-browser-version to the -dev mozconfig.

browser/config/mozconfigs/base-browser

@@ -36,8 +36,6 @@ ac_add_options --disable-system-policies
 # See bug #41131
 ac_add_options --disable-backgroundtasks
 
-ac_add_options --enable-base-browser
-
 # Disable telemetry
 ac_add_options MOZ_TELEMETRY_REPORTING=
 

browser/config/mozconfigs/base-browser-android

@@ -31,8 +31,6 @@ ac_add_options --disable-parental-controls
 ac_add_options --enable-proxy-bypass-protection
 ac_add_options --disable-system-policies
 
-ac_add_options --enable-base-browser
-
 # Disable telemetry
 ac_add_options MOZ_TELEMETRY_REPORTING=
 

moz.configure

@@ -1016,14 +1016,6 @@ def zlib_in_mozglue(system_zlib, js_shared, linker, os):
 set_config("ZLIB_IN_MOZGLUE", zlib_in_mozglue)
 set_define("ZLIB_IN_MOZGLUE", zlib_in_mozglue)
 
-option(
-    "--enable-base-browser",
-    help="Enable Base Browser"
-)
-
-set_config("BASE_BROWSER", True, when="--enable-base-browser")
-set_define("BASE_BROWSER", True, when="--enable-base-browser")
-
 
 option(
     "--with-relative-data-dir",
@@ -1044,6 +1036,37 @@ def relative_data_dir(value, target):
 set_define("RELATIVE_DATA_DIR", relative_data_dir)
 
 
+option(
+    "--with-base-browser-version",
+    nargs=1,
+    help="Set the Base Browser version, e.g., 7.0a1"
+)
+
+
+@depends("--with-base-browser-version")
+def base_browser_version(value):
+    if not value:
+        die(
+            "--with-base-browser-version is required for Base Browser and derived browsers."
+        )
+    return value[0]
+
+
+@depends("--with-base-browser-version")
+def base_browser_version_quoted(value):
+    if not value:
+        die(
+            "--with-base-browser-version is required for Base Browser and derived browsers."
+        )
+    if '"' in value or "\\" in value:
+        die("--with-base-browser-version cannot contain \" or \\.")
+    return '"{}"'.format(value[0])
+
+
+set_define("BASE_BROWSER_VERSION", base_browser_version)
+set_define("BASE_BROWSER_VERSION_QUOTED", base_browser_version_quoted)
+
+
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure

mozconfig-linux-x86_64-dev

@@ -11,3 +11,4 @@ ac_add_options --enable-default-toolkit=cairo-gtk3
 ac_add_options --disable-strip
 ac_add_options --disable-install-strip
 
+ac_add_options --with-base-browser-version=dev-build

toolkit/modules/AppConstants.jsm

@@ -354,6 +354,8 @@ this.AppConstants = Object.freeze({
   MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
   ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",
 
+  BASE_BROWSER_VERSION: "@BASE_BROWSER_VERSION@",
+
   DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",
 
   MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",