Merge pull request dials#45 from DiamondLightSource/update-java-build

Update Java bindings build
phyy-nx · May 11, 2022 · 0a79a58 · 0a79a58
2 parents 4a28364 + d63fe23
commit 0a79a58
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 71 deletions.
diff --git a/Makefile b/Makefile
@@ -570,21 +570,27 @@ PYSWIG = swig -python
 JSWIG = swig -java
 
 #
-# Compiler for Java
+# Java SDK root directory
 #
-JAVAC = javac
+ifeq ($(JDKDIR),)
+	JDKDIR 	=	/etc/alternatives/java_sdk
+endif
 
 #
-# Java archiver for compiled classes
+# Launcher for Java
 #
-JAR = jar
+JAVA = $(JDKDIR)/bin/java
 
 #
-# Java SDK root directory
+# Compiler for Java
 #
-ifeq ($(JDKDIR),)
-	JDKDIR 	=	/usr/lib/java
-endif
+JAVAC = $(JDKDIR)/bin/javac
+
+#
+# Java archiver for compiled classes
+#
+JAR = $(JDKDIR)/bin/jar
+
 
 ifneq ($(CBF_DONT_USE_LONG_LONG),)
 NOLLFLAG = -DCBF_DONT_USE_LONG_LONG
@@ -2134,7 +2140,7 @@ $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
 $(BIN)/testcbf.class: $(EXAMPLES)/testcbf.java $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
 	mkdir -p $(BIN)
 	$(JAVAC) -cp $(JCBF)/cbflib-$(VERSION).jar -d $(BIN) $(EXAMPLES)/testcbf.java
-	
+
 ifneq ($(CBF_USE_ULP),)
 #
 # testulp test program
@@ -2702,7 +2708,7 @@ py3cbfuserinstall: $(PY3CBF)/_pycbf.$(PY3CBFEXT) $(PY3CBF)/py3cbfuserinstall
 
 javatests: $(BIN)/ctestcbf $(BIN)/testcbf.class $(SOLIB)/libcbf_wrap.so
 	$(LDPREFIX)  $(BIN)/ctestcbf > testcbfc.txt
-	$(LDPREFIX) java -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
+	$(LDPREFIX) $(JAVA) -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
 	$(DIFF) testcbfc.txt testcbfj.txt
 
 dectristests: $(BIN)/cbf_template_t $(TEMPLATES)/cbf_test_orig.out

diff --git a/Makefile_LINUX b/Makefile_LINUX
@@ -570,21 +570,27 @@ PYSWIG = swig -python
 JSWIG = swig -java
 
 #
-# Compiler for Java
+# Java SDK root directory
 #
-JAVAC = javac
+ifeq ($(JDKDIR),)
+	JDKDIR 	=	/etc/alternatives/java_sdk
+endif
 
 #
-# Java archiver for compiled classes
+# Launcher for Java
 #
-JAR = jar
+JAVA = $(JDKDIR)/bin/java
 
 #
-# Java SDK root directory
+# Compiler for Java
 #
-ifeq ($(JDKDIR),)
-	JDKDIR 	=	/usr/lib/java
-endif
+JAVAC = $(JDKDIR)/bin/javac
+
+#
+# Java archiver for compiled classes
+#
+JAR = $(JDKDIR)/bin/jar
+
 
 ifneq ($(CBF_DONT_USE_LONG_LONG),)
 NOLLFLAG = -DCBF_DONT_USE_LONG_LONG
@@ -2130,7 +2136,7 @@ $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
 $(BIN)/testcbf.class: $(EXAMPLES)/testcbf.java $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
 	mkdir -p $(BIN)
 	$(JAVAC) -cp $(JCBF)/cbflib-$(VERSION).jar -d $(BIN) $(EXAMPLES)/testcbf.java
-	
+
 ifneq ($(CBF_USE_ULP),)
 #
 # testulp test program
@@ -2698,7 +2704,7 @@ py3cbfuserinstall: $(PY3CBF)/_pycbf.$(PY3CBFEXT) $(PY3CBF)/py3cbfuserinstall
 
 javatests: $(BIN)/ctestcbf $(BIN)/testcbf.class $(SOLIB)/libcbf_wrap.so
 	$(LDPREFIX)  $(BIN)/ctestcbf > testcbfc.txt
-	$(LDPREFIX) java -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
+	$(LDPREFIX) $(JAVA) -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
 	$(DIFF) testcbfc.txt testcbfj.txt
 
 dectristests: $(BIN)/cbf_template_t $(TEMPLATES)/cbf_test_orig.out

diff --git a/Makefile_MINGW b/Makefile_MINGW
@@ -570,21 +570,27 @@ PYSWIG = swig -python
 JSWIG = swig -java
 
 #
-# Compiler for Java
+# Java SDK root directory
 #
-JAVAC = javac
+ifeq ($(JDKDIR),)
+	JDKDIR 	=	/etc/alternatives/java_sdk
+endif
 
 #
-# Java archiver for compiled classes
+# Launcher for Java
 #
-JAR = jar
+JAVA = $(JDKDIR)/bin/java
 
 #
-# Java SDK root directory
+# Compiler for Java
 #
-ifeq ($(JDKDIR),)
-	JDKDIR 	=	/usr/lib/java
-endif
+JAVAC = $(JDKDIR)/bin/javac
+
+#
+# Java archiver for compiled classes
+#
+JAR = $(JDKDIR)/bin/jar
+
 
 ifneq ($(CBF_DONT_USE_LONG_LONG),)
 NOLLFLAG = -DCBF_DONT_USE_LONG_LONG
@@ -2141,7 +2147,7 @@ $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
 $(BIN)/testcbf.class: $(EXAMPLES)/testcbf.java $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
 	mkdir -p $(BIN)
 	$(JAVAC) -cp $(JCBF)/cbflib-$(VERSION).jar -d $(BIN) $(EXAMPLES)/testcbf.java
-	
+
 ifneq ($(CBF_USE_ULP),)
 #
 # testulp test program
@@ -2709,7 +2715,7 @@ py3cbfuserinstall: $(PY3CBF)/_pycbf.$(PY3CBFEXT) $(PY3CBF)/py3cbfuserinstall
 
 javatests: $(BIN)/ctestcbf $(BIN)/testcbf.class $(SOLIB)/libcbf_wrap.so
 	$(LDPREFIX)  $(BIN)/ctestcbf > testcbfc.txt
-	$(LDPREFIX) java -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
+	$(LDPREFIX) $(JAVA) -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
 	$(DIFF) testcbfc.txt testcbfj.txt
 
 dectristests: $(BIN)/cbf_template_t $(TEMPLATES)/cbf_test_orig.out

diff --git a/Makefile_MSYS2 b/Makefile_MSYS2
@@ -569,21 +569,27 @@ PYSWIG = swig -python
 JSWIG = swig -java
 
 #
-# Compiler for Java
+# Java SDK root directory
 #
-JAVAC = javac
+ifeq ($(JDKDIR),)
+	JDKDIR 	=	/etc/alternatives/java_sdk
+endif
 
 #
-# Java archiver for compiled classes
+# Launcher for Java
 #
-JAR = jar
+JAVA = $(JDKDIR)/bin/java
 
 #
-# Java SDK root directory
+# Compiler for Java
 #
-ifeq ($(JDKDIR),)
-	JDKDIR 	=	/usr/lib/java
-endif
+JAVAC = $(JDKDIR)/bin/javac
+
+#
+# Java archiver for compiled classes
+#
+JAR = $(JDKDIR)/bin/jar
+
 
 ifneq ($(CBF_DONT_USE_LONG_LONG),)
 NOLLFLAG = -DCBF_DONT_USE_LONG_LONG
@@ -2129,7 +2135,7 @@ $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
 $(BIN)/testcbf.class: $(EXAMPLES)/testcbf.java $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
 	mkdir -p $(BIN)
 	$(JAVAC) -cp $(JCBF)/cbflib-$(VERSION).jar -d $(BIN) $(EXAMPLES)/testcbf.java
-	
+
 ifneq ($(CBF_USE_ULP),)
 #
 # testulp test program
@@ -2697,7 +2703,7 @@ py3cbfuserinstall: $(PY3CBF)/_pycbf.$(PY3CBFEXT) $(PY3CBF)/py3cbfuserinstall
 
 javatests: $(BIN)/ctestcbf $(BIN)/testcbf.class $(SOLIB)/libcbf_wrap.so
 	$(LDPREFIX)  $(BIN)/ctestcbf > testcbfc.txt
-	$(LDPREFIX) java -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
+	$(LDPREFIX) $(JAVA) -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
 	$(DIFF) testcbfc.txt testcbfj.txt
 
 dectristests: $(BIN)/cbf_template_t $(TEMPLATES)/cbf_test_orig.out

diff --git a/Makefile_OSX b/Makefile_OSX
@@ -570,21 +570,27 @@ PYSWIG = swig -python
 JSWIG = swig -java
 
 #
-# Compiler for Java
+# Java SDK root directory
 #
-JAVAC = javac
+ifeq ($(JDKDIR),)
+	JDKDIR 	=	/etc/alternatives/java_sdk
+endif
 
 #
-# Java archiver for compiled classes
+# Launcher for Java
 #
-JAR = jar
+JAVA = $(JDKDIR)/bin/java
 
 #
-# Java SDK root directory
+# Compiler for Java
 #
-ifeq ($(JDKDIR),)
-	JDKDIR 	=	/usr/lib/java
-endif
+JAVAC = $(JDKDIR)/bin/javac
+
+#
+# Java archiver for compiled classes
+#
+JAR = $(JDKDIR)/bin/jar
+
 
 ifneq ($(CBF_DONT_USE_LONG_LONG),)
 NOLLFLAG = -DCBF_DONT_USE_LONG_LONG
@@ -651,14 +657,14 @@ INSTALLSETUP_PY = installsetup.py
 #########################################################
 CC	= gcc
 C++	= g++
-CFLAGS  = -g -O2  -Wall -ansi -pedantic $(HDF5CFLAGS)
+CFLAGS  = -g -O2 -Wall -std=c99 -pedantic $(HDF5CFLAGS)
 LDFLAGS =
 F90C = gfortran
 F90FLAGS = -g -fno-range-check -fallow-invalid-boz
 F90LDFLAGS = -bind_at_load
 SOCFLAGS = -fPIC
 SOLDFLAGS = -dynamiclib -Wl,-rpath,$(CBF_PREFIX)/lib
-JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/linux
+JAVAINCLUDES = -I$(JDKDIR)/include -I$(JDKDIR)/include/darwin
 LDPREFIX = DYLD_LIBRARY_PATH=$(SOLIB):$$DYLD_LIBRARY_PATH;export DYLD_LIBRARY_PATH;
 RUNLDPREFIX = DYLD_LIBRARY_PATH=$(CBF_PREFIX)/lib:$$DYLD_LIBRARY_PATH;export DYLD_LIBRARY_PATH;
 EXTRALIBS = -lm
@@ -2127,7 +2133,7 @@ $(BIN)/ctestcbf: $(EXAMPLES)/testcbf.c $(LIB)/libcbf.a
 $(BIN)/testcbf.class: $(EXAMPLES)/testcbf.java $(JCBF)/cbflib-$(VERSION).jar $(SOLIB)/libcbf_wrap.so
 	mkdir -p $(BIN)
 	$(JAVAC) -cp $(JCBF)/cbflib-$(VERSION).jar -d $(BIN) $(EXAMPLES)/testcbf.java
-	
+
 ifneq ($(CBF_USE_ULP),)
 #
 # testulp test program
@@ -2695,7 +2701,7 @@ py3cbfuserinstall: $(PY3CBF)/_pycbf.$(PY3CBFEXT) $(PY3CBF)/py3cbfuserinstall
 
 javatests: $(BIN)/ctestcbf $(BIN)/testcbf.class $(SOLIB)/libcbf_wrap.so
 	$(LDPREFIX)  $(BIN)/ctestcbf > testcbfc.txt
-	$(LDPREFIX) java -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
+	$(LDPREFIX) $(JAVA) -cp $(JCBF)/cbflib-$(VERSION).jar:$(BIN) testcbf > testcbfj.txt
 	$(DIFF) testcbfc.txt testcbfj.txt
 
 dectristests: $(BIN)/cbf_template_t $(TEMPLATES)/cbf_test_orig.out

diff --git a/examples/testcbf.java b/examples/testcbf.java
@@ -14,14 +14,14 @@ public class testcbf {
 
 	static {
 		try {
-			System.loadLibrary("libpcre");
+			System.loadLibrary("cbf");
 		} catch (UnsatisfiedLinkError e) {
-			System.err.println("Could not load regex");
+			System.err.println("Could not load CBF library");
 		}
 		try {
 			System.loadLibrary("cbf_wrap");
 		} catch (UnsatisfiedLinkError e) {
-			System.err.println("Could not load wrapper");
+			System.err.println("Could not load CBF wrapper");
 		}
 	}