From 9d82693bafc6b598a46bd962486d1d75280f0160 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Tue, 13 Jan 2015 16:17:17 +0000
Subject: [PATCH] Improvements to build process for Linux/Mac versions of
 lp_solve_java.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9519 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/Makefile                                | 2 ++
 prism/ext/lp_solve_5.5_java/Makefile          | 4 ++--
 prism/ext/lp_solve_5.5_java/lib/build         | 8 +++-----
 prism/ext/lp_solve_5.5_java/lib/mac/build-osx | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/prism/Makefile b/prism/Makefile
index 6cd01a1d..1fb0ebaa 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -342,6 +342,8 @@ extpackages: checks
 	  LIBMATH="$(LIBMATH)" \
 	  BINDISTSUFFIX="$(BINDISTSUFFIX)" \
 	  JAVA_DIR="$(JAVA_DIR)" \
+	  JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" \
+	  JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" \
 	  ) || exit 1; \
 	done
 
diff --git a/prism/ext/lp_solve_5.5_java/Makefile b/prism/ext/lp_solve_5.5_java/Makefile
index 56af02ca..0e2900cc 100644
--- a/prism/ext/lp_solve_5.5_java/Makefile
+++ b/prism/ext/lp_solve_5.5_java/Makefile
@@ -19,7 +19,7 @@ lpsolve55java:
 	@echo Making sure lpsolve55 Java wrapper is compatible with $(OSTYPE) $(ARCH)
 	@(if [ "$(OSTYPE)" = "linux" ]; then \
 	  echo "Rebuild lpsolve55 Java wrapper for Linux"; \
-	  (cd lib ; ARCH=$(ARCH) JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" sh build); \
+	  (cd lib ; ARCH=$(ARCH) JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" sh build); \
 	  if [ "$(ARCH)" = "" ]; then \
 	    cp lib/lpsolve55j.jar lib/ux32/liblpsolve55j.so ../../lib/ ; \
 	  else \
@@ -28,7 +28,7 @@ lpsolve55java:
 	fi)
 	@(if [ "$(OSTYPE)" = "darwin" ]; then \
 	  echo "Rebuild lpsolve55 Java wrapper for MacOS"; \
-	  (cd lib/mac; ARCH=$(ARCH) sh -x build-osx); \
+	  (cd lib/mac; ARCH=$(ARCH) JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" sh -x build-osx); \
 	  cp lib/lpsolve55j.jar lib/mac/liblpsolve55j.jnilib ../../lib/ ; \
 	fi)
 	@(if [ "$(OSTYPE)" = "cygwin" ]; then \
diff --git a/prism/ext/lp_solve_5.5_java/lib/build b/prism/ext/lp_solve_5.5_java/lib/build
index 972b96ce..b9e36ee8 100755
--- a/prism/ext/lp_solve_5.5_java/lib/build
+++ b/prism/ext/lp_solve_5.5_java/lib/build
@@ -15,10 +15,8 @@
 LPSOLVE_DIR=../../lpsolve55/src/lp_solve_5.5
 LPSOLVE_LIB_DIR=../../../lib
 #JDK_DIR=/usr/local/lib/jdk1.5.0_02
-JDK_DIR=/usr/lib/jvm/java-6-sun-1.6.0.10
-JDK_DIR=$JAVA_DIR
-
-echo DIR $JDK_DIR
+#JDK_DIR=/usr/lib/jvm/java-6-sun-1.6.0.10
+#JDK_DIR=$JAVA_DIR
 
 c=g++
 
@@ -46,7 +44,7 @@ mkdir $PLATFORM >/dev/null 2>&1
 # OK, here we go!
 
 SRC_DIR=../src/c
-INCL="-I $JDK_DIR/include -I $JDK_DIR/include/linux -I $LPSOLVE_DIR -I $SRC_DIR"
+INCL="-I -I$JAVA_JNI_H_DIR -I$JAVA_JNI_MD_H_DIR -I $LPSOLVE_DIR -I $SRC_DIR"
 
 $c $CFLAGS $INCL -c $SRC_DIR/lpsolve5j.cpp
 $c $CFLAGS -shared -Wl,-soname,liblpsolve55j.so -o $PLATFORM/liblpsolve55j.so lpsolve5j.o -L$LPSOLVE_LIB_DIR -lc -llpsolve55
diff --git a/prism/ext/lp_solve_5.5_java/lib/mac/build-osx b/prism/ext/lp_solve_5.5_java/lib/mac/build-osx
index 8f76fa25..e47e87d4 100755
--- a/prism/ext/lp_solve_5.5_java/lib/mac/build-osx
+++ b/prism/ext/lp_solve_5.5_java/lib/mac/build-osx
@@ -13,12 +13,13 @@
 # -------------------------------------------------------------------
 LPSOLVE_DIR=../../../lpsolve55/src/lp_solve_5.5
 LPSOLVE_LIB_DIR=../../../../lib
-JDK_DIR=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers
+#JDK_DIR=/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers
+#JDK_DIR=$JAVA_DIR
 
 # OK, here we go!
 
 SRC_DIR=../../src/c
-INCL="-I $JDK_DIR -I $LPSOLVE_DIR -I $SRC_DIR -idirafter /usr/include/sys"
+INCL="-I -I$JAVA_JNI_H_DIR -I$JAVA_JNI_MD_H_DIR -I $LPSOLVE_DIR -I $SRC_DIR -idirafter /usr/include/sys"
 
 if [ "$ARCH" = "" ]
 then