Revert "Improve Z3 support on ARM Macs"

.github/workflows/release_on_tag.yml

@@ -37,8 +37,6 @@ jobs:
     - name: Unzip Ghidra ${{ matrix.ghidra_version }}
       run: 7z x 3rdparty/ghidra_${{ matrix.ghidra_version }}_*.zip -o3rdparty/
 
-    # ejs: Ummm, macro anyone?
-
     - name: Download Z3 for Linux x64 (glibc)
       uses: robinraju/[email protected]
       with:
@@ -76,20 +74,7 @@ jobs:
           cp z3-4.12.1-x64-osx-10.16/bin/*.dylib ${{ github.workspace }}/os/mac_x86_64/
           rm z3-4.12.1-x64-osx-10.16.zip
           rm -r z3-4.12.1-x64-osx-10.16/
-
-    - name: Download Z3 for MacOS arm64
-      uses: robinraju/[email protected]
-      with:
-        repository: "Z3Prover/z3"
-        tag: "z3-4.12.1"
-        fileName: "z3-4.12.1-arm64-osx-11.0.zip"
-    - name: Unzip Z3 for MacOS arm64
-      run: |
-          7z x z3-4.12.1-arm64-osx-11.0.zip
-          cp z3-4.12.1-arm64-osx-11.0/bin/*.dylib ${{ github.workspace }}/os/mac_arm_64/
-          rm z3-4.12.1-arm64-osx-11.0.zip
-          rm -r z3-4.12.1-arm64-osx-11.0/
-
+      
     - name: Set up Gradle
       uses: gradle/gradle-build-action@v2
       with:

CHANGELOG.md

@@ -1,10 +1,5 @@
 # Current Release
 
-## 241204
-- Improvements:
-* Include Z3 for ARM Macs
-* Stream-line build system a bit
-
 ## 241119
 - Bugfixes:
 * Fix bad performance of Disassembly Improvements in specific situations (#81)

build.gradle

@@ -77,10 +77,6 @@ else {
 
 OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
 
-// Technically we probably should not be doing this, but we need to know which platform we're on.
-apply from: new File(ghidraInstallDir).getCanonicalPath() + "/GPL/nativePlatforms.gradle"
-def ghidraPlatformName = getCurrentPlatformName()
-
 // change this to set the version of Z3 we're using
 String z3Version = "4.12.1"
 
@@ -155,6 +151,7 @@ task printGhidraDir {
     println 'Using Ghidra install directory ' + ghidraInstallDir
     println 'Using Java ' + targetCompatibility + ' for Ghidra ' + ghidraVersion
     println 'Using AUTOCATS test directory ' + autocatsDir
+    println 'Targeting '+ os.getDisplayName() + ' (' + System.properties['os.name'].toLowerCase() + '-' + System.getProperty('os.arch') + ')'
 }
 
 task copyToLib(type: Copy) {
@@ -287,16 +284,11 @@ tasks.clean.dependsOn(tasks.cmakeClean)
 // slow because LTO. So we dynamically decide whether to set tasks.cmakeBuild as
 // a dependency depending on whether z3 appears to be built.
 task buildZ3 {
-    if (fileTree("build/cmake/z3").matching {
-        include "*-*/libz3.so"
-        include "*-*/libz3.dll"
-        include "*-*/libz3.dylib"
-        include "*-*/libz3java.so"
-        include "*-*/libz3java.dll"
-        include "*-*/libz3java.dylib"
-    }.isEmpty()) {
+    if (!(file('build/cmake/z3/linux-amd64/libz3.so').exists() ||
+          file('build/cmake/z3/windows-amd64/libz3.dll').exists() ||
+          file('build/cmake/z3/osx-amd64/libz3.dylib').exists())) {
         dependsOn(tasks.cmakeBuild)
-    }
+    } 
 }
 
 tasks.build.dependsOn(tasks.buildZ3)
@@ -313,31 +305,37 @@ project.getTasks().matching(
     }
 );
 
-task copyZ3(type: Copy) {
-    from ("build/cmake/z3") {
-        include "*-*/libz3.so"
-        include "*-*/libz3.dll"
-        include "*-*/libz3.dylib"
-        include "*-*/libz3java.so"
-        include "*-*/libz3java.dll"
-        include "*-*/libz3java.dylib"
-
+if (os.isLinux()) {
+    task copyZ3toOsLinux(type: Copy) {
+        from ("build/cmake/z3/linux-amd64/libz3.so")
+        from ("build/cmake/z3/linux-amd64/libz3java.so")
+        into "os/linux_x86_64"
     }
-    into "os/${ghidraPlatformName}"
+
+    copyZ3toOsLinux.dependsOn(tasks.buildZ3)
+    copyToLib.dependsOn(copyZ3toOsLinux)
+}
 
-    // https://stackoverflow.com/a/45635959
-    // Flatten the hierarchy by setting the path
-    // of all files to their respective basename
-    eachFile {
-      path = name
+if (os.isWindows()) {
+    task copyZ3toOsWin(type: Copy) {
+        from ("build/cmake/z3/windows-amd64/libz3.dll")
+        from ("build/cmake/z3/windows-amd64/libz3java.dll")
+        into "os/win_x86_64"
     }
+
+    copyZ3toOsWin.dependsOn(tasks.buildZ3)
+    copyToLib.dependsOn(copyZ3toOsWin)
+}
 
-    // Flattening the hierarchy leaves empty directories,
-    // do not copy those
-    includeEmptyDirs = false
-
-    copyZ3.dependsOn(tasks.buildZ3)
-    copyToLib.dependsOn(copyZ3)
+if (os.isMacOsX()) {
+    task copyZ3toOsMac(type: Copy) {
+        from ("build/cmake/z3/osx-amd64/libz3.dylib")
+        from ("build/cmake/z3/osx-amd64/libz3java.dylib")
+        into "os/mac_x86_64"
+    }
+
+    copyZ3toOsMac.dependsOn(tasks.buildZ3)
+    copyToLib.dependsOn(copyZ3toOsMac)
 }
 
 // END: cmake z3 build section
@@ -455,20 +453,12 @@ testlogger {
 
 test {
 
-    def osDir = file("${ghidraInstallDir}/Ghidra/Extensions/kaiju/os/")
-
-    // Automatically find the os dir names.
-    def osDirNames =
-        osDir.listFiles()
-        .findAll { it.isDirectory() }
-        .collect { file(osDir.name + "/" + it.name )}
-        .join(':')
-
     jvmArgs = ['-Djava.awt.headless=true',
                 // add-exports needed prior to Ghidra 10.3 to address sun.awt not exported in JDK 17+
                 '--add-exports=java.desktop/sun.awt=ALL-UNNAMED',
                 // add the kaiju os directories to load z3 library to run tests
-                '-Djava.library.path=' + ghidraInstallDir + '/Ghidra/Extensions/kaiju/lib/:' + osDirNames]
+                '-Djava.library.path=' + ghidraInstallDir + '/Ghidra/Extensions/kaiju/lib/:'+ ghidraInstallDir + '/Ghidra/Extensions/kaiju/os/linux_x86_64/:' + ghidraInstallDir + '/Ghidra/Extensions/kaiju/os/mac_x86_64/:' + ghidraInstallDir + '/Ghidra/Extensions/kaiju/os/win_x86_64/']
+
     useJUnitPlatform()
 
     maxHeapSize = '2G'