Merge remote-tracking branch 'origin/master' into polysat

scripts/mk_nuget_task.py

@@ -88,10 +88,7 @@ def mk_targets(source_root):
 def mk_icon(source_root):
     mk_dir("out/content")
     shutil.copy(f"{source_root}/resources/icon.jpg", "out/content/icon.jpg")
-
-def mk_readme(source_root):
-    mk_dir("out/content")
-    shutil.copy(f"{source_root}/src/api/dotnet/README.md", "out/README.md")
+#   shutil.copy(f"{source_root}/src/api/dotnet/README.md", "out/content/README.md")
 
 
     
@@ -149,7 +146,6 @@ class Env:
         unpack(self.packages, self.symbols, self.arch)
         mk_targets(self.source_root)
         mk_icon(self.source_root)
-#       mk_readme(self.source_root)
         create_nuget_spec(self.version, self.repo, self.branch, self.commit, self.symbols, self.arch)
         
 def main():

scripts/mk_util.py

@@ -2994,9 +2994,19 @@ def cp_z3py_to_build():
         for f in files:
             if f.endswith('.pyc'):
                 rmf(os.path.join(root, f))
+    # We do not want a second copy of the compiled files in the system-wide cache,
+    # so we disable it temporarily. This is an issue with recent versions of MacOS
+    # where XCode's Python has a cache, but the build scripts don't have access to
+    # it (e.g. during OPAM package installation).
+    have_cache = hasattr(sys, 'pycache_prefix') and sys.pycache_prefix is not None
+    if have_cache:
+        pycache_prefix_before = sys.pycache_prefix
+        sys.pycache_prefix = None
     # Compile Z3Py files
     if compileall.compile_dir(z3py_src, force=1) != 1:
         raise MKException("failed to compile Z3Py sources")
+    if have_cache:
+        sys.pycache_prefix = pycache_prefix_before
     if is_verbose:
         print("Generated python bytecode")
     # Copy sources to build

scripts/nightly.yaml

@@ -233,6 +233,8 @@ stages:
         symbolServerType: TeamServices
         detailedLog: true
 
+
+
 - stage: Package
   jobs:
   - job: NuGet64