adapt paths to new distribution

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
Z3Prover · Jan 30, 2024 · 9bd8e35 · 9bd8e35
1 parent f7ed4ad
commit 9bd8e35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
@@ -78,8 +78,15 @@ def unpack(packages, symbols, arch):
                 if symbols:
                     files += ["Microsoft.Z3.pdb", "Microsoft.Z3.xml"]
                 for b in files:
-                    zip_ref.extract(f"{package_dir}/bin/{b}", f"{tmp}")
-                    replace(f"{tmp}/{package_dir}/bin/{b}", f"out/lib/netstandard2.0/{b}")
+                    file = f"{package_dir}/bin/{b}"
+                    if os.path.exists(file):
+                        zip_ref.extract(file, f"{tmp}")
+                        replace(f"{tmp}/{package_dir}/bin/{b}", f"out/lib/netstandard2.0/{b}")
+                    file = os.path.join(file,"netstandard2.0")
+                    if os.path.exists(file):
+                        zip_ref.extract(file, f"{tmp}")
+                        replace(f"{tmp}/{package_dir}/bin/netstandard2.0/{b}", f"out/lib/netstandard2.0/{b}")
+
 
 def mk_targets(source_root):
     mk_dir("out/build")

diff --git a/scripts/mk_win_dist_cmake.py b/scripts/mk_win_dist_cmake.py
@@ -369,9 +369,9 @@ def cp_dotnet(arch):
     if is_verbose():
         print("copy dotnet")
     build_dir = get_build_dir(arch)
-    dist_dir = get_build_dist_path(arch)
+    dist_dir = get_bin_dist_path(arch)
     shutil.copytree(os.path.join(build_dir, "Microsoft.Z3"),
-                    os.path.join(dist_dir, "Microsoft.Z3"),
+                    dist_dir,
                     dirs_exist_ok=True)
 
 def cp_pdb(arch):