try JNI build again

OHDSI · Jun 3, 2024 · a150f6e · a150f6e
1 parent 8a343c2
commit a150f6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tools/configure.R b/tools/configure.R
@@ -25,13 +25,13 @@ if (getRversion() < "4.2") { # Windoz
 if (.Platform$OS.type == "unix") {
     java_home <- Sys.getenv("JAVA_HOME")
 } else {
-    system("tools/jvm-w32")
+    system("make tools/jvm-w32")
     java_home <- system("tools/jvm-w32/findjava -s -f", intern = TRUE)
+    # system("make tools/jvm-w32 clean")
 }
 
 if (length(java_home) == 0) {
     message("No JAVA_HOME defined; ignoring JNI compilation")
-    stop("no java")
 } else {
     message("Using JAVA_HOME=", java_home)
     jni_path = file.path(java_home, "include")

diff --git a/tools/jvm-w32/Makefile b/tools/jvm-w32/Makefile
@@ -4,7 +4,7 @@
 # Author: Simon Urbanek
 #         with contributions from Brian Ripley
 
-include $(R_HOME)/etc$(R_ARCH)/Makeconf
+ # $(R_HOME)/etc$(R_ARCH)/Makeconf
 
 TARGETS=findjava.exe
 
@@ -13,9 +13,9 @@ TARGETS=findjava.exe
 all: $(TARGETS)
 
 # detect 64-bit Windows
-ifeq ($(strip $(shell $(R_HOME)/bin/R --slave -e 'cat(.Machine$$sizeof.pointer)')),8)
-JVM64DEF=64
-endif
+# ifeq ($(strip $(shell $(R_HOME)/bin/R --slave -e 'cat(.Machine$$sizeof.pointer)')),8)
+# JVM64DEF=64
+# endif
 
 # compile findjava.exe from source - no magic here, no special libs necessary
 findjava.o: findjava.c