fix

Author: davexparker

.github/workflows/make-tests.yml

@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix:
         java: [11, 21]
-        os: [ubuntu-latest, macos-latest]
+        #os: [ubuntu-latest, macos-latest]
         #java: [11, 17, 21]
-        #os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-14, macos-15, macos-26, ubuntu-22.04-arm, ubuntu-24.04-arm, macos-15-intel]
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-14, macos-15, macos-26, ubuntu-22.04-arm, ubuntu-24.04-arm, macos-15-intel]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -37,9 +37,9 @@ jobs:
     strategy:
       matrix:
         java: [11, 21]
-        os: [windows-latest]
+        #os: [windows-latest]
         #java: [11, 17, 21]
-        #os: [windows-2019, windows-2022, windows-2025] #, windows-11-arm]
+        os: [windows-2019, windows-2022, windows-2025] #, windows-11-arm]
         #exclude:
           #- os: windows-11-arm
             #java: 11

prism/ext/ppl/Makefile

@@ -59,12 +59,14 @@ rpath:
 	  install_name_tool -add_rpath "@loader_path/." ../../$(PRISM_LIB_DIR)/libppl_java.dylib; \
 	  install_name_tool -change "/Users/dxp/tools/tmp/lib/libppl.15.dylib" "@rpath/libppl.15.dylib" ../../$(PRISM_LIB_DIR)/libppl_java.dylib; \
 	  codesign --force --deep --sign - ../../$(PRISM_LIB_DIR)/libppl*.dylib; \
+	  #otool -L ../../$(PRISM_LIB_DIR)/libppl*dylib; \
 	fi; \
 	if [ $(OSTYPE) = "linux" ]; then \
 	  patchelf --set-soname "libppl.so.15" ../../$(PRISM_LIB_DIR)/libppl.so.15; \
 	  patchelf --set-soname "libppl_java.so" ../../$(PRISM_LIB_DIR)/libppl_java.so; \
-	  patchelf --set-rpath '$ORIGIN' ../../$(PRISM_LIB_DIR)/libppl_java.so; \
+	  patchelf --set-rpath '$$ORIGIN' ../../$(PRISM_LIB_DIR)/libppl_java.so; \
 	  patchelf --replace-needed "libppl.so.15" "libppl.15.so" ../../$(PRISM_LIB_DIR)/libppl_java.so; \
+	  #readelf -d ../../$(PRISM_LIB_DIR)/libppl*so; \
 	fi
 
 clean: checks

prism/ext/yices/Makefile

@@ -53,17 +53,19 @@ libfiles: $(NATIVE_LIBS_COPY) $(COMMON_LIBS_COPY)
 	fi
 
 rpath:
-	@if [ $(OSTYPE) = "darwin" ]; then \
+	if [ $(OSTYPE) = "darwin" ]; then \
 	  install_name_tool -id "@rpath/libyices.2.dylib" ../../$(PRISM_LIB_DIR)/libyices.2.dylib; \
 	  install_name_tool -id "@rpath/libyices2java.dylib" ../../$(PRISM_LIB_DIR)/libyices2java.dylib; \
 	  install_name_tool -add_rpath "@loader_path/." ../../$(PRISM_LIB_DIR)/libyices2java.dylib; \
 	  install_name_tool -change "/usr/local/lib/libyices.2.dylib" "@rpath/libyices.2.dylib" ../../$(PRISM_LIB_DIR)/libyices2java.dylib; \
+	  #otool -L ../../$(PRISM_LIB_DIR)/libyices*dylib; \
 	fi; \
 	if [ $(OSTYPE) = "linux" ]; then \
 	  patchelf --set-soname "libyices.so.2.6"  ../../$(PRISM_LIB_DIR)/libyices.so.2.6; \
 	  patchelf --set-soname "libyices2java.so"  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
-	  patchelf --set-rpath '$ORIGIN'  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
+	  patchelf --set-rpath '$$ORIGIN'  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
 	  patchelf --replace-needed "libyices.so.2.6" "libyices.so.2.6"  ../../$(PRISM_LIB_DIR)/libyices2java.so; \
+	  #readelf -d ../../$(PRISM_LIB_DIR)/libyices*so; \
 	fi
 
 clean: checks

prism/ext/z3/Makefile

@@ -59,12 +59,14 @@ rpath:
 	  install_name_tool -add_rpath "@loader_path/." ../../$(PRISM_LIB_DIR)/libz3java.dylib; \
 	  install_name_tool -change "libz3.dylib" "@rpath/libz3.dylib" ../../$(PRISM_LIB_DIR)/libz3java.dylib; \
 	  codesign --force --deep --sign - ../../$(PRISM_LIB_DIR)/libz3*.dylib; \
+	  #otool -L ../../$(PRISM_LIB_DIR)/libz3*dylib; \
 	fi; \
 	if [ $(OSTYPE) = "linux" ]; then \
 	  patchelf --set-soname "libz3.so" ../../$(PRISM_LIB_DIR)/libz3.so; \
 	  patchelf --set-soname "libz3java.so" ../../$(PRISM_LIB_DIR)/libz3java.so; \
-	  patchelf --set-rpath '$ORIGIN' ../../$(PRISM_LIB_DIR)/libz3java.so; \
+	  patchelf --set-rpath '$$ORIGIN' ../../$(PRISM_LIB_DIR)/libz3java.so; \
 	  patchelf --replace-needed "libz3.so" "libz3.so" ../../$(PRISM_LIB_DIR)/libz3java.so; \
+	  #readelf -d ../../$(PRISM_LIB_DIR)/libz3*so; \
 	fi
 
 clean: checks