Fixed Linux install and build scripts

4 files changed, 43 insertions, 11 deletions

diff --git a/demos/java/gsviewer/install_linux.sh b/demos/java/gsviewer/install_linux.sh
index 4772d70a6..bdfdd3928 100755
--- a/demos/java/gsviewer/install_linux.sh
+++ b/demos/java/gsviewer/install_linux.sh
@@ -1,7 +1,14 @@
 #!bin/bash
 
-cd ../jni/gs_jni
+echo "Copy gs_jni.so"
+cp "../jni/gs_jni/gs_jni.so" "gs_jni.so"
 
-bash install_linux.sh
+echo "Create libgpdl.so link"
+cp "../../../sobin/libgpdl.so" "libgpdl.so"
 
-cd ../../gsviewer
\ No newline at end of file
+cd ../../../sobin
+
+echo "Copy libgpdl.so target"
+cp $(readlink "libgpdl.so")  "../demos/java/gsviewer"
+
+cd ../demos/java/gsviewer
diff --git a/demos/java/jni/gs_jni/build_linux.sh b/demos/java/jni/gs_jni/build_linux.sh
index 974dfba38..1d492b5ee 100644
--- a/demos/java/jni/gs_jni/build_linux.sh
+++ b/demos/java/jni/gs_jni/build_linux.sh
@@ -46,6 +46,16 @@ g++ -c -Wall -O3\
 	"jni_util.cpp" \
 	-o "obin/jni_util.o"
 
+echo "Compile instance_data.cpp"
+g++ -c -Wall -O3 -fPIC \
+	-std=c++14 \
+	-I./include \
+	-I./include/linux \
+	-I./../../../../psi \
+	-I./../../../../devices \
+	"instance_data.cpp" \
+	-o "obin/instance_data.o"
+
 echo "Link"
 g++ -shared \
 	-Wl,-soname,gs_jni.so \
@@ -54,4 +64,5 @@ g++ -shared \
 	"obin/com_artifex_gsjava_GSAPI.o" \
 	"obin/com_artifex_gsjava_util_NativePointer.o" \
 	"obin/jni_util.o" \
-	"../../../../sobin/libgpdl.so"
\ No newline at end of file
+	"obin/instance_data.o" \
+	"../../../../sobin/libgpdl.so"
diff --git a/demos/java/jni/gs_jni/install_linux.sh b/demos/java/jni/gs_jni/install_linux.sh
index 1626c2129..0f4b1147d 100644
--- a/demos/java/jni/gs_jni/install_linux.sh
+++ b/demos/java/jni/gs_jni/install_linux.sh
@@ -1,7 +1,14 @@
 #!bin/bash
 
-echo "Copy libgpdl.so -> /usr/lib/libgpdl.so"
-sudo cp -L "../../../../sobin/libgpdl.so" "/usr/lib/libgpdl.so"
+echo "Copy libgpdl.so"
+cp -L "../jni/gs_jni/gs_jni.so" "gs_jni.so"
 
-echo "Copy gs_jni.so -> /usr/lib/gs_jni.so"
-sudo cp "gs_jni.so" "/usr/lib/gs_jni.so"
\ No newline at end of file
+echo "Create libpgdl.so link"
+cp "../../../sobin/lbgpdl.so" "libgpdl.so"
+
+cd ../../../sobin
+
+echo "Copy libgpdl.so target"
+cp $(readlink "libgpdl.so") "../demos/java/gsviewer"
+
+cd ../demos/java.gsviewer
diff --git a/demos/java/mtdemo/install_linux.sh b/demos/java/mtdemo/install_linux.sh
index 4772d70a6..7d9c00949 100755
--- a/demos/java/mtdemo/install_linux.sh
+++ b/demos/java/mtdemo/install_linux.sh
@@ -1,7 +1,14 @@
 #!bin/bash
 
-cd ../jni/gs_jni
+echo "Copy gs_jni.so"
+cp "../jni/gs_jni/gs_jni.so" "gs_jni.so"
 
-bash install_linux.sh
+echo "Create libgpdl.so link"
+cp "../../../sobin/libgpdl.so" "libgpdl.so"
 
-cd ../../gsviewer
\ No newline at end of file
+cd ../../../sobin
+
+echo "Copy libgpdl.so target"
+cp $(readlink "libgpdl.so") "../demos/java/mtdemo"
+
+cd ../demos/java/mtdemo