windows: move compressing of archive into build.py

This way the invoking script needs to know less about filenames, etc.

Author: indygreg

build-windows.py

@@ -3,7 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-import datetime
 import os
 import pathlib
 import subprocess
@@ -38,30 +37,14 @@ def bootstrap():
 
 
 def run():
-    from pythonbuild.downloads import DOWNLOADS
-    from pythonbuild.utils import compress_python_archive
-
-    now = datetime.datetime.utcnow()
-
     env = dict(os.environ)
     env["PYTHONUNBUFFERED"] = "1"
 
-    arch = "x86" if os.environ.get("Platform") == "x86" else "amd64"
-
     args = [str(PYTHON), "build.py"]
     args.extend(sys.argv[1:])
 
     subprocess.run(args, cwd=str(WINDOWS_DIR), env=env, check=True, bufsize=0)
 
-    source_path = BUILD / ("cpython-windows-%s.tar" % arch)
-
-    compress_python_archive(
-        source_path,
-        DIST,
-        "cpython-%s-windows-%s-%s"
-        % (DOWNLOADS["cpython-3.7"]["version"], arch, now.strftime("%Y%m%dT%H%M")),
-    )
-
 
 if __name__ == "__main__":
     try:

cpython-windows/build.py

@@ -5,6 +5,7 @@
 
 import argparse
 import concurrent.futures
+import datetime
 import json
 import os
 import pathlib
@@ -21,10 +22,12 @@
     create_tar_from_directory,
     download_entry,
     extract_tar_to_directory,
+    compress_python_archive,
 )
 
 ROOT = pathlib.Path(os.path.abspath(__file__)).parent.parent
 BUILD = ROOT / "build"
+DIST = ROOT / "dist"
 SUPPORT = ROOT / "cpython-windows"
 
 LOG_PREFIX = [None]
@@ -1513,6 +1516,8 @@ def build_cpython(arch: str, pgo=False, build_mode="static"):
         with dest_path.open("wb") as fh:
             create_tar_from_directory(fh, td / "out")
 
+        return dest_path
+
 
 def fetch_strawberry_perl() -> pathlib.Path:
     strawberryperl_zip = download_entry("strawberryperl", BUILD)
@@ -1536,6 +1541,8 @@ def main():
 
     args = parser.parse_args()
 
+    now = datetime.datetime.utcnow()
+
     log_path = BUILD / "build.log"
 
     with log_path.open("wb") as log_fh:
@@ -1551,7 +1558,14 @@ def main():
             build_openssl(perl_path, arch)
 
         LOG_PREFIX[0] = "cpython"
-        build_cpython(arch, build_mode=args.build_mode)
+        tar_path = build_cpython(arch, build_mode=args.build_mode)
+
+        compress_python_archive(
+            tar_path,
+            DIST,
+            "cpython-%s-windows-%s-%s"
+            % (DOWNLOADS["cpython-3.7"]["version"], arch, now.strftime("%Y%m%dT%H%M")),
+        )
 
 
 if __name__ == "__main__":