Merge branch 'master' into sls

scripts/mk_project.py

@@ -8,7 +8,7 @@
 from mk_util import *
 
 def init_version():
-    set_version(4, 13, 3, 0) # express a default build version or pick up ci build version
+    set_version(4, 13, 4, 0) # express a default build version or pick up ci build version
     
 # Z3 Project definition
 def init_project_def():

scripts/mk_util.py

@@ -2500,7 +2500,7 @@ def mk_config():
     config = open(os.path.join(BUILD_DIR, 'config.mk'), 'w')
     global CXX, CC, GMP, GUARD_CF, STATIC_BIN, GIT_HASH, CPPFLAGS, CXXFLAGS, LDFLAGS, EXAMP_DEBUG_FLAG, FPMATH_FLAGS, LOG_SYNC, SINGLE_THREADED, IS_ARCH_ARM64
     if IS_WINDOWS:
-        CXXFLAGS = '/nologo /Zi /D WIN32 /D _WINDOWS /EHsc /GS /Gd /std:c++20'
+        CXXFLAGS = '/nologo /Zi /D WIN32 /D _WINDOWS /EHsc /GS /Gd /std:c++20 -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR'
         config.write(
             'CC=cl\n'
             'CXX=cl\n'

scripts/nightly.yaml

@@ -1,7 +1,7 @@
 variables:
   Major: '4'
   Minor: '13'
-  Patch: '3'
+  Patch: '4'
   ReleaseVersion: $(Major).$(Minor).$(Patch)
   AssemblyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildId)
   NightlyVersion: $(AssemblyVersion)-$(Build.buildId)
@@ -12,7 +12,7 @@ stages:
   - job: MacBuild
     displayName: "Mac Build"
     pool:
-      vmImage: "macOS-latest"
+      vmImage: "macOS-13"
     steps:
     - task: PythonScript@0
       displayName: Build
@@ -41,9 +41,9 @@ stages:
   - job: MacBuildArm64
     displayName: "Mac ARM64 Build"
     pool:
-      vmImage: "macOS-latest"
+      vmImage: "macOS-13"
     steps:
-    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64 --os=osx-11.0
+    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
     - task: PublishPipelineArtifact@1

scripts/release.yml

@@ -6,7 +6,7 @@
 trigger: none
 
 variables:
-  ReleaseVersion: '4.13.3'
+  ReleaseVersion: '4.13.4'
 
 stages:
 
@@ -17,7 +17,7 @@ stages:
   - job: MacBuild
     displayName: "Mac Build"
     pool:
-      vmImage: "macOS-latest"
+      vmImage: "macOS-13"
     steps:
     - task: PythonScript@0
       displayName: Build
@@ -46,9 +46,9 @@ stages:
   - job: MacBuildArm64
     displayName: "Mac ARM64 Build"
     pool:
-      vmImage: "macOS-latest"
+      vmImage: "macOS-13"
     steps:
-    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64 --os=osx-11.0
+    - script: python scripts/mk_unix_dist.py --dotnet-key=$(Build.SourcesDirectory)/resources/z3.snk --arch=arm64
     - script: git clone https://github.com/z3prover/z3test z3test
     - script: cp dist/*.zip $(Build.ArtifactStagingDirectory)/.
     - task: PublishPipelineArtifact@1
@@ -98,7 +98,7 @@ stages:
     - script: echo '##vso[task.prependpath]/tmp/arm-toolchain/aarch64-none-linux-gnu/libc/usr/bin'
     - script: echo $PATH
     - script: stat /tmp/arm-toolchain/bin/aarch64-none-linux-gnu-gcc
-    - script: python scripts/mk_unix_dist.py --nodotnet --nojava --arch=arm64
+    - script: python scripts/mk_unix_dist.py --nodotnet --arch=arm64
     - task: CopyFiles@2
       inputs:
         sourceFolder: dist