Fix lib path for macOS

Author: oitel

scripts/nuget_patch/fake_whl_helper.py

@@ -29,6 +29,14 @@ def make_fake_whl(dll_path : Path):
     shutil.rmtree(whl_dir)
 
 def patch_whl(out_dir,libs_dir):
+    def copy_libs(src_wheel):
+        temp_dir = Path("patched_whl")
+        shutil.unpack_archive(src_wheel, temp_dir, "zip")
+        shutil.copytree(Path(temp_dir) / "dummy.libs", Path(out_dir), dirs_exist_ok=True)
+        if SYSTEM == "Darwin":
+            shutil.copytree(Path(temp_dir) / "dummy.dylibs", Path(out_dir), dirs_exist_ok=True)
+        shutil.rmtree(temp_dir)
+
     # use mangling tool on whl file
     # store result dlls in `content/dummy.libs/`
     try:
@@ -53,6 +61,9 @@ def patch_whl(out_dir,libs_dir):
                     "dummy-1.0-py3-none-any.whl"
                 ]
             )
+            repaired_files = list(Path("wheelhouse").glob("dummy-*.whl"))
+            copy_libs(repaired_files[0])
+            shutil.rmtree("wheelhouse")
         elif SYSTEM == "Linux":
             sys.path.append(libs_dir) # to find SO files
             # see also: https://github.com/mayeut/pep600_compliance
@@ -65,28 +76,17 @@ def patch_whl(out_dir,libs_dir):
                     "dummy-1.0-py3-none-any.whl"
                 ]
             )
+            repaired_files = list(Path("wheelhouse").glob("dummy-*.whl"))
+            copy_libs(repaired_files[0])
+            shutil.rmtree("wheelhouse")
         elif SYSTEM == "Darwin":
             subprocess.check_call(
                 ["delocate-wheel", "-v", "dummy-1.0-py3-none-any.whl"]
             )
-            # The commands below seem to assume that the new wheel is in the `wheelhouse` directory, move it to match that.
-            os.mkdir("wheelhouse")
-            os.rename("dummy-1.0-py3-none-any.whl", "wheelhouse/dummy-1.0-py3-none-any.whl")
+            copy_libs("dummy-1.0-py3-none-any.whl")
     except subprocess.CalledProcessError as e:
         print(e)
         sys.exit(e.returncode)
 
-    try:
-        # not needed anymore
-        os.remove("dummy-1.0-py3-none-any.whl")
-    except OSError:
-        pass # On MacOS we move the original file, so this will not exist.
-
-    repaired_files = []
-    for repaired_wheel_file in Path(".").glob("wheelhouse/dummy-*.whl"):
-        repaired_files.append(repaired_wheel_file)
-    shutil.unpack_archive(repaired_files[0],"patched_whl","zip")
-    shutil.copytree(Path("patched_whl") / "dummy.libs/",Path(out_dir))
-    #clean
-    shutil.rmtree("wheelhouse")
-    shutil.rmtree("patched_whl")
+    # clean
+    os.remove("dummy-1.0-py3-none-any.whl")