gh-145219: Emscripten bld configurable directory & only clean Emscripten

Two small changes to the Emscripten build script:
1. Make clean only delete the parts of cross-build that are emscripten specific
2. Make the cross-build name configurable

Author: hoodmane

Tools/wasm/emscripten/__main__.py

@@ -23,14 +23,24 @@
 EMSCRIPTEN_DIR = Path(__file__).parent
 CHECKOUT = EMSCRIPTEN_DIR.parent.parent.parent
 
-CROSS_BUILD_DIR = CHECKOUT / "cross-build"
-NATIVE_BUILD_DIR = CROSS_BUILD_DIR / "build"
+DEFAULT_CROSS_BUILD_DIR = CHECKOUT / "cross-build"
 HOST_TRIPLE = "wasm32-emscripten"
 
-DOWNLOAD_DIR = CROSS_BUILD_DIR / HOST_TRIPLE / "build"
-HOST_BUILD_DIR = CROSS_BUILD_DIR / HOST_TRIPLE / "build"
-HOST_DIR = HOST_BUILD_DIR / "python"
-PREFIX_DIR = CROSS_BUILD_DIR / HOST_TRIPLE / "prefix"
+
+def get_build_paths(cross_build_dir=None):
+    """Compute all build paths from the given cross-build directory."""
+    if cross_build_dir is None:
+        cross_build_dir = DEFAULT_CROSS_BUILD_DIR
+    cross_build_dir = Path(cross_build_dir)
+    host_triple_dir = cross_build_dir / HOST_TRIPLE
+    return {
+        "cross_build_dir": cross_build_dir,
+        "native_build_dir": cross_build_dir / "build",
+        "host_triple_dir": host_triple_dir,
+        "host_build_dir": host_triple_dir / "build",
+        "host_dir": host_triple_dir / "build" / "python",
+        "prefix_dir": host_triple_dir / "prefix",
+    }
 
 LOCAL_SETUP = CHECKOUT / "Modules" / "Setup.local"
 LOCAL_SETUP_MARKER = b"# Generated by Tools/wasm/emscripten.py\n"
@@ -66,12 +76,17 @@ def updated_env(updates={}):
     return environment
 
 
-def subdir(working_dir, *, clean_ok=False):
-    """Decorator to change to a working directory."""
+def subdir(path_key, *, clean_ok=False):
+    """Decorator to change to a working directory.
+
+    path_key is a key into context.build_paths, used to resolve the working
+    directory at call time.
+    """
 
     def decorator(func):
         @functools.wraps(func)
         def wrapper(context):
+            working_dir = context.build_paths[path_key]
             try:
                 tput_output = subprocess.check_output(
                     ["tput", "cols"], encoding="utf-8"
@@ -128,20 +143,21 @@ def build_platform():
     return sysconfig.get_config_var("BUILD_GNU_TYPE")
 
 
-def build_python_path():
+def build_python_path(context):
     """The path to the build Python binary."""
-    binary = NATIVE_BUILD_DIR / "python"
+    native_build_dir = context.build_paths["native_build_dir"]
+    binary = native_build_dir / "python"
     if not binary.is_file():
         binary = binary.with_suffix(".exe")
         if not binary.is_file():
             raise FileNotFoundError(
-                f"Unable to find `python(.exe)` in {NATIVE_BUILD_DIR}"
+                f"Unable to find `python(.exe)` in {native_build_dir}"
             )
 
     return binary
 
 
-@subdir(NATIVE_BUILD_DIR, clean_ok=True)
+@subdir("native_build_dir", clean_ok=True)
 def configure_build_python(context, working_dir):
     """Configure the build/host Python."""
     if LOCAL_SETUP.exists():
@@ -157,12 +173,12 @@ def configure_build_python(context, working_dir):
     call(configure, quiet=context.quiet)
 
 
-@subdir(NATIVE_BUILD_DIR)
+@subdir("native_build_dir")
 def make_build_python(context, working_dir):
     """Make/build the build Python."""
     call(["make", "--jobs", str(cpu_count()), "all"], quiet=context.quiet)
 
-    binary = build_python_path()
+    binary = build_python_path(context)
     cmd = [
         binary,
         "-c",
@@ -192,7 +208,7 @@ def download_and_unpack(working_dir: Path, url: str, expected_shasum: str):
         shutil.unpack_archive(tmp_file.name, working_dir)
 
 
-@subdir(HOST_BUILD_DIR, clean_ok=True)
+@subdir("host_build_dir", clean_ok=True)
 def make_emscripten_libffi(context, working_dir):
     ver = "3.4.6"
     libffi_dir = working_dir / f"libffi-{ver}"
@@ -204,13 +220,13 @@ def make_emscripten_libffi(context, working_dir):
     )
     call(
         [EMSCRIPTEN_DIR / "make_libffi.sh"],
-        env=updated_env({"PREFIX": PREFIX_DIR}),
+        env=updated_env({"PREFIX": context.build_paths["prefix_dir"]}, context.emsdk_cache),
         cwd=libffi_dir,
         quiet=context.quiet,
     )
 
 
-@subdir(HOST_BUILD_DIR, clean_ok=True)
+@subdir("host_build_dir", clean_ok=True)
 def make_mpdec(context, working_dir):
     ver = "4.0.1"
     mpdec_dir = working_dir / f"mpdecimal-{ver}"
@@ -226,7 +242,7 @@ def make_mpdec(context, working_dir):
             mpdec_dir / "configure",
             "CFLAGS=-fPIC",
             "--prefix",
-            PREFIX_DIR,
+            context.build_paths["prefix_dir"],
             "--disable-shared",
         ],
         cwd=mpdec_dir,
@@ -239,14 +255,15 @@ def make_mpdec(context, working_dir):
     )
 
 
-@subdir(HOST_DIR, clean_ok=True)
+@subdir("host_dir", clean_ok=True)
 def configure_emscripten_python(context, working_dir):
     """Configure the emscripten/host build."""
+    paths = context.build_paths
     config_site = os.fsdecode(EMSCRIPTEN_DIR / "config.site-wasm32-emscripten")
 
     emscripten_build_dir = working_dir.relative_to(CHECKOUT)
 
-    python_build_dir = NATIVE_BUILD_DIR / "build"
+    python_build_dir = paths["native_build_dir"] / "build"
     lib_dirs = list(python_build_dir.glob("lib.*"))
     assert len(lib_dirs) == 1, (
         f"Expected a single lib.* directory in {python_build_dir}"
@@ -272,13 +289,13 @@ def configure_emscripten_python(context, working_dir):
             capture_output=True,
         )
         host_runner = res.stdout.strip()
-    pkg_config_path_dir = (PREFIX_DIR / "lib/pkgconfig/").resolve()
+    pkg_config_path_dir = (paths["prefix_dir"] / "lib/pkgconfig/").resolve()
     env_additions = {
         "CONFIG_SITE": config_site,
         "HOSTRUNNER": host_runner,
         "EM_PKG_CONFIG_PATH": str(pkg_config_path_dir),
     }
-    build_python = os.fsdecode(build_python_path())
+    build_python = os.fsdecode(build_python_path(context))
     configure = [
         "emconfigure",
         os.path.relpath(CHECKOUT / "configure", working_dir),
@@ -292,7 +309,7 @@ def configure_emscripten_python(context, working_dir):
         "--disable-ipv6",
         "--enable-big-digits=30",
         "--enable-wasm-dynamic-linking",
-        f"--prefix={PREFIX_DIR}",
+        f"--prefix={paths['prefix_dir']}",
     ]
     if pydebug:
         configure.append("--with-pydebug")
@@ -353,7 +370,7 @@ def configure_emscripten_python(context, working_dir):
     sys.stdout.flush()
 
 
-@subdir(HOST_DIR)
+@subdir("host_dir")
 def make_emscripten_python(context, working_dir):
     """Run `make` for the emscripten/host build."""
     call(
@@ -382,9 +399,10 @@ def build_all(context):
 
 def clean_contents(context):
     """Delete all files created by this script."""
-    if CROSS_BUILD_DIR.exists():
-        print(f"🧹 Deleting {CROSS_BUILD_DIR} ...")
-        shutil.rmtree(CROSS_BUILD_DIR)
+    host_triple_dir = context.build_paths["host_triple_dir"]
+    if host_triple_dir.exists():
+        print(f"🧹 Deleting {host_triple_dir} ...")
+        shutil.rmtree(host_triple_dir)
 
     if LOCAL_SETUP.exists():
         with LOCAL_SETUP.open("rb") as file:
@@ -439,6 +457,22 @@ def main():
             dest="quiet",
             help="Redirect output from subprocesses to a log file",
         )
+        subcommand.add_argument(
+            "--cross-build-dir",
+            action="store",
+            default=None,
+            dest="cross_build_dir",
+            help="Path to the cross-build directory "
+            f"(default: {DEFAULT_CROSS_BUILD_DIR})",
+        )
+        subcommand.add_argument(
+            "--emsdk-cache",
+            action="store",
+            default=None,
+            dest="emsdk_cache",
+            help="Path to emsdk cache directory. If provided, validates that "
+            "the required emscripten version is installed.",
+        )
     for subcommand in configure_build, configure_host:
         subcommand.add_argument(
             "--clean",
@@ -463,6 +497,12 @@ def main():
 
     context = parser.parse_args()
 
+    context.build_paths = get_build_paths(context.cross_build_dir)
+
+    if context.emsdk_cache:
+        validate_emsdk_version(context.emsdk_cache)
+        context.emsdk_cache = Path(context.emsdk_cache).absolute()
+
     dispatch = {
         "make-libffi": make_emscripten_libffi,
         "make-mpdec": make_mpdec,