From c8c2e3a7b729d7fbcfcbf0d6369a9f8511aaac50 Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Thu, 25 Jan 2024 15:05:33 -0800
Subject: [PATCH] update java install/build

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
 scripts/mk_win_dist_cmake.py |  6 ++++--
 scripts/nightly.yaml         | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/mk_win_dist_cmake.py b/scripts/mk_win_dist_cmake.py
index 08273a33b13..c4d691b6f30 100644
--- a/scripts/mk_win_dist_cmake.py
+++ b/scripts/mk_win_dist_cmake.py
@@ -190,6 +190,8 @@ def mk_build_dir(arch):
         if JAVA_ENABLED:
             cmd.append(' -DZ3_BUILD_JAVA_BINDINGS=ON')
             cmd.append(' -DZ3_INSTALL_JAVA_BINDINGS=ON')
+            cmd.append(' -DZ3_JAVA_JAR_INSTALLDIR=java')
+            cmd.append(' -DZ3_JAVA_JNI_LIB_INSTALLDIR=java')
         if PYTHON_ENABLED:
             cmd.append(' -DZ3_BUILD_PYTHON_BINDINGS=ON')
             cmd.append(' -DZ3_INSTALL_PYTHON_BINDINGS=ON')
@@ -252,11 +254,11 @@ def mk_z3(arch):
     if arch == "arm64":
         arch = "x64_arm64"
     cmds = []
-    cmds.append('call "%VCINSTALLDIR%Auxiliary\\build\\vcvarsall.bat" ' + arch + ' ')
+    cmds.append('call "%VCINSTALLDIR%Auxiliary\\build\\vcvarsall.bat" ' + arch)
     cmds.append('cd %s' % build_dir)
     cmds.append('nmake install')
     if exec_cmds(cmds) != 0:
-        raise MKException("Failed to make z3, x64: %s" % x64)
+        raise MKException("Failed to make z3"))
 
 def mk_z3s():
     global ARCHS
diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 968c9dbbb85..1915ed99633 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -169,7 +169,7 @@ stages:
             --zip
     - task: CopyFiles@2
       inputs:
-        sourceFolder: dist
+        sourceFolder: build-dist/x86/dist
         contents: '*.zip'
         targetFolder: $(Build.ArtifactStagingDirectory)
     - task: PublishPipelineArtifact@1
@@ -179,7 +179,7 @@ stages:
     - task: CopyFiles@2
       displayName: 'Collect Symbols'
       inputs:
-        sourceFolder: dist
+        sourceFolder: build-dist/x86/dist
         contents: '**/*.pdb'
         targetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
     # Publish symbol archive to match nuget package
@@ -209,7 +209,7 @@ stages:
             --zip
     - task: CopyFiles@2
       inputs:
-        sourceFolder: dist
+        sourceFolder: build-dist/x64/dist
         contents: '*.zip'
         targetFolder: $(Build.ArtifactStagingDirectory)
     - task: PublishPipelineArtifact@1
@@ -219,7 +219,7 @@ stages:
     - task: CopyFiles@2
       displayName: 'Collect Symbols'
       inputs:
-        sourceFolder: dist
+        sourceFolder: build-dist/x64/dist
         contents: '**/*.pdb'
         targetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
     # Publish symbol archive to match nuget package
@@ -249,7 +249,7 @@ stages:
             --zip
     - task: CopyFiles@2
       inputs:
-        sourceFolder: dist
+        sourceFolder: build-dist/arm64/dist
         contents: '*.zip'
         targetFolder: $(Build.ArtifactStagingDirectory)
     - task: PublishPipelineArtifact@1
@@ -259,7 +259,7 @@ stages:
     - task: CopyFiles@2
       displayName: 'Collect Symbols'
       inputs:
-        sourceFolder: dist
+        sourceFolder: build-dist/arm64/dist
         contents: '**/*.pdb'
         targetFolder: '$(Build.ArtifactStagingDirectory)/symbols'
     # Publish symbol archive to match nuget package