Bug 1957021 - Remove references to old_configure_assignments r=glandium

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

build/moz.configure/init.configure

@@ -62,8 +62,6 @@ set_config("TOPSRCDIR", build_environment.topsrcdir)
 set_config("TOPOBJDIR", build_environment.topobjdir)
 set_config("DIST", build_environment.dist)
 
-add_old_configure_assignment("_topsrcdir", build_environment.topsrcdir)
-
 option(env="MOZ_AUTOMATION", help="Enable options for automated builds")
 set_config("MOZ_AUTOMATION", depends_if("MOZ_AUTOMATION")(lambda x: True))
 
@@ -995,7 +993,6 @@ def build_project(project):
 
 set_config("MOZ_BUILD_APP", build_project)
 set_define("MOZ_BUILD_APP", build_project)
-add_old_configure_assignment("MOZ_BUILD_APP", build_project)
 
 
 option(env="MOZILLA_OFFICIAL", help="Build an official release")
@@ -1178,7 +1175,6 @@ set_define("MOZILLA_UAVERSION", depends(milestone)(lambda m: '"%s"' % m.uaversio
 set_config("MOZ_APP_VERSION", milestone.app_version)
 set_config("MOZ_APP_VERSION_DISPLAY", milestone.app_version_display)
 set_config("MOZ_APP_MAXVERSION", moz_app_maxversion)
-add_old_configure_assignment("MOZ_APP_VERSION", milestone.app_version)
 
 
 # The app update channel is 'default' when not supplied. The value is used in

build/moz.configure/old.configure

@@ -48,11 +48,11 @@ def old_configure(old_configure, build_project):
     return old_configure
 
 
-@depends(prepare_mozconfig, old_configure_assignments)
+@depends(prepare_mozconfig)
 @imports(_from="__builtin__", _import="open")
 @imports(_from="__builtin__", _import="print")
 @imports(_from="mozbuild.shellutil", _import="quote")
-def prepare_configure(mozconfig, old_configure_assignments):
+def prepare_configure(mozconfig):
     assignments = {}
 
     with open("old-configure.vars", "w") as out:
@@ -73,10 +73,6 @@ def prepare_configure(mozconfig, old_configure_assignments):
 
             inject("# end of mozconfig values")
 
-        for k, v in old_configure_assignments:
-            inject("%s=%s" % (k, quote(v)))
-            assignments[k] = v
-
     return namespace(assignments=assignments)
 
 

build/moz.configure/util.configure

@@ -584,32 +584,3 @@ def confvar(
 @imports(_from="mozbuild.configure.constants", _import="RaiseErrorOnUse")
 def obsolete_config(name, *, replacement):
     set_config(name, RaiseErrorOnUse(f"{name} is obsolete. Use {replacement} instead."))
-
-
-# Hacks related to old-configure
-# ==============================
-
-
-@dependable
-def old_configure_assignments():
-    return []
-
-
-@template
-def add_old_configure_assignment(var, value, when=None):
-    var = dependable(var)
-    value = dependable(value)
-
-    @depends(old_configure_assignments, var, value, when=when)
-    @imports(_from="mozbuild.shellutil", _import="quote")
-    def add_assignment(assignments, var, value):
-        if var is None or value is None:
-            return
-        if value is True:
-            assignments.append((var, "1"))
-        elif value is False:
-            assignments.append((var, ""))
-        else:
-            if isinstance(value, (list, tuple)):
-                value = quote(*value)
-            assignments.append((var, str(value)))

js/moz.configure

@@ -44,7 +44,6 @@ include("../build/moz.configure/bindgen.configure", when="--enable-compile-envir
 
 set_config("JS_STANDALONE", js_standalone)
 set_define("JS_STANDALONE", js_standalone)
-add_old_configure_assignment("JS_STANDALONE", js_standalone)
 option(
     "--enable-js-shell", default=js_standalone, help="{Build|Do not build} the JS shell"
 )

moz.configure

@@ -142,9 +142,6 @@ def moz_debug(debug):
 
 set_config("MOZ_DEBUG", moz_debug)
 set_define("MOZ_DEBUG", moz_debug)
-# Override any value MOZ_DEBUG may have from the environment when passing it
-# down to old-configure.
-add_old_configure_assignment("MOZ_DEBUG", depends("--enable-debug")(lambda x: bool(x)))
 
 
 set_config(

toolkit/moz.configure

@@ -94,9 +94,6 @@ option(
     help="Set distribution-specific id",
 )
 set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
-add_old_configure_assignment(
-    "MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0])
-)
 
 
 @depends("MOZ_APP_VENDOR", build_project)
@@ -3208,8 +3205,6 @@ with only_when("--enable-official-branding"):
     set_config("MOZ_OFFICIAL_BRANDING", True)
     set_define("MOZ_OFFICIAL_BRANDING", True)
 
-    add_old_configure_assignment("MOZ_OFFICIAL_BRANDING", True)
-
 
 confvar(
     "MOZ_BRANDING_DIRECTORY",
@@ -3261,7 +3256,6 @@ def moz_branding_directory(
 
 
 set_config("MOZ_BRANDING_DIRECTORY", moz_branding_directory)
-add_old_configure_assignment("MOZ_BRANDING_DIRECTORY", moz_branding_directory)
 
 
 @depends(moz_branding_directory, build_project)