unix: tweak archive retrieval again

Hopefully this is the final time.

With this change, we can now build a working distribution for macOS!
The differences of the PYTHON.json are minimal.

Author: indygreg

cpython-unix/build.py

@@ -651,7 +651,7 @@ def build_cpython(
         dest_path = BUILD / basename
 
         with dest_path.open("wb") as fh:
-            fh.write(build_env.get_output_archive())
+            fh.write(build_env.get_output_archive("python"))
 
 
 def main():

pythonbuild/buildenv.py

@@ -155,13 +155,11 @@ def get_tools_archive(self, dest, name):
         with dest.open("wb") as fh:
             create_tar_from_directory(fh, self.td / "out" / "tools")
 
-    def get_output_archive(self, path=None, as_tar=False):
-        p = self.td / "out"
-        if path:
-            p = p / path
+    def get_output_archive(self, path, as_tar=False):
+        p = self.td / "out" / path
 
         data = io.BytesIO()
-        create_tar_from_directory(data, p)
+        create_tar_from_directory(data, p, path_prefix=p.parts[-1])
 
         data.seek(0)
 

pythonbuild/utils.py

@@ -147,14 +147,16 @@ def download_entry(key: str, dest_path: pathlib.Path, local_name=None) -> pathli
     return local_path
 
 
-def create_tar_from_directory(fh, base_path: pathlib.Path):
+def create_tar_from_directory(fh, base_path: pathlib.Path, path_prefix=None):
     with tarfile.open(name="", mode="w", fileobj=fh, dereference=True) as tf:
         for root, dirs, files in os.walk(base_path):
             dirs.sort()
 
             for f in sorted(files):
                 full = base_path / root / f
                 rel = full.relative_to(base_path)
+                if path_prefix:
+                    rel = pathlib.Path(path_prefix) / rel
                 tf.add(full, rel)