support mozconfig

Author: fiji-flo

browser/branding/enterprise/byteshift.py

@@ -2,6 +2,8 @@
 # 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/.
 
+import buildconfig
+
 # Byte shift value applied to AutoConfig files. Must match the default of the
 # general.config.obscure_value preference, which the browser subtracts when
 # reading the file.
@@ -11,8 +13,13 @@
 def generate(output, input_path):
     """GENERATED_FILES action: write `input_path` byte shifted by OBSCURE_VALUE.
 
-    `output` is a binary file object provided by the build system.
+    `output` is a binary file object provided by the build system. If
+    --with-enterprise-console-address was given at configure time, its value
+    replaces the generic console address placeholder.
     """
     with open(input_path, "rb") as fh:
         data = fh.read()
+    address = buildconfig.substs.get("MOZ_ENTERPRISE_CONSOLE_ADDRESS")
+    if address:
+        data = data.replace(b"FIREFOX_ENTERPRISE_GENERIC", address.encode())
     output.write(bytes((byte + OBSCURE_VALUE) & 0xFF for byte in data))

browser/branding/enterprise/firefox.cfg.in

@@ -2,5 +2,6 @@
 // the AutoConfig parser; managed preferences belong on the lines below.
 // FIREFOX_ENTERPRISE_GENERIC is a placeholder: on first launch the console
 // setup dialog asks for the address and persists it in felt.json. Repacks
-// replace it with the actual console address.
+// replace it with the actual console address, and local builds can bake one
+// in with --with-enterprise-console-address.
 lockPref("enterprise.console.address", "FIREFOX_ENTERPRISE_GENERIC");

toolkit/moz.configure

@@ -4662,3 +4662,20 @@ set_define("MOZ_ENTERPRISE", enable_enterprise)
 
 # Clear the default value to avoid mozilla.com url compiled into product
 imply_option("--with-crashreporter-url", "", when="--enable-enterprise")
+
+option(
+    "--with-enterprise-console-address",
+    nargs=1,
+    when="--enable-enterprise",
+    help="Bake this enterprise console address into the AutoConfig file "
+    "instead of the generic placeholder",
+)
+
+
+@depends("--with-enterprise-console-address", when="--enable-enterprise")
+def enterprise_console_address(value):
+    if value:
+        return value[0].rstrip("/")
+
+
+set_config("MOZ_ENTERPRISE_CONSOLE_ADDRESS", enterprise_console_address)