Added install.sh for gs_jni project

This script installs the required libraries in
/usr/lib so projects using it can be run.

Fixed build scripts on Mac

Added install_darwin.sh and fixed start_darwin.sh allowing Mac
instances of the viewer to run correctFixed build scripts on Mac

Renamed Manifest.txt files to have .md extension

This will be to allow newline characters at en of line, and to match
the internal extension of Java JAR manifest files.

Updated names of build scripts

Done to improve clarity of which scripts are used for which
operating system.

18 files changed, 47 insertions, 22 deletions

diff --git a/demos/java/gsjava/Manifest.txt b/demos/java/gsjava/Manifest.md
index de55435b3..de55435b3 100644
--- a/demos/java/gsjava/Manifest.txt
+++ b/demos/java/gsjava/Manifest.md
diff --git a/demos/java/gsjava/README.txt b/demos/java/gsjava/README.txt
index 7927b12a1..285e6bb9d 100644
--- a/demos/java/gsjava/README.txt
+++ b/demos/java/gsjava/README.txt
@@ -65,8 +65,10 @@ public static void main(String[] args) {
 	GSAPI.gsapi_delete_instance(instance);
 }
 
-To build the library, build.sh can be used on Linux and build.bat on Windows.
-Both of these scripts do not compile Ghostscript. However, build.sh will
+To build the library, build.sh can be used on Linux, build_darwin.sh can
+be used on Mac OS X, and build.bat on Windows.
+
+All of these scripts do not compile Ghostscript. However, build.sh will
 compile the C++ library unlike build.bat.
 
 Viewer:
diff --git a/demos/java/gsjava/build_darwin.sh b/demos/java/gsjava/build_darwin.sh
index 4522c219a..eee71f549 100644
--- a/demos/java/gsjava/build_darwin.sh
+++ b/demos/java/gsjava/build_darwin.sh
@@ -59,4 +59,4 @@ cd bin
 echo "Packing gsjava JAR file..."
 jar cfm "../gsjava.jar" "../Manifest.txt" "com/"
 
-cd ..
+cd ..
\ No newline at end of file
diff --git a/demos/java/gsjava/build.sh b/demos/java/gsjava/build_linux.sh
index 48817d367..54f049fc1 100644
--- a/demos/java/gsjava/build.sh
+++ b/demos/java/gsjava/build_linux.sh
@@ -6,7 +6,7 @@ echo "Compiling gs_jni C++ source..."
 
 cd "../jni/gs_jni"
 
-bash build.sh
+bash build_linux.sh
 
 cd "../../gsjava"
 
@@ -59,4 +59,4 @@ cd bin
 echo "Packing gsjava JAR file..."
 jar cfm "../gsjava.jar" "../Manifest.txt" "com/"
 
-cd ..
+cd ..
\ No newline at end of file
diff --git a/demos/java/gsjava/build.bat b/demos/java/gsjava/build_win32.bat
index 04b14ef75..887578115 100644
--- a/demos/java/gsjava/build.bat
+++ b/demos/java/gsjava/build_win32.bat
@@ -98,4 +98,4 @@ jar -cf ..\gsjava.jar^
 	com\artifex\gsjava\devices\TIFFDevice.class^
 	com\artifex\gsjava\devices\XPSDevice.class
 
-cd ..
+cd ..
\ No newline at end of file
diff --git a/demos/java/gsjava/src/com/artifex/gsjava/util/NativePointer.java b/demos/java/gsjava/src/com/artifex/gsjava/util/NativePointer.java
index 07829e355..444103772 100644
--- a/demos/java/gsjava/src/com/artifex/gsjava/util/NativePointer.java
+++ b/demos/java/gsjava/src/com/artifex/gsjava/util/NativePointer.java
@@ -38,6 +38,11 @@ public class NativePointer {
 			System.load(libgpdl.getAbsolutePath());
 			File gsjni = new File("gs_jni.so");
 			System.load(gsjni.getAbsolutePath());
+        } else if (System.getProperty("os.name").equalsIgnoreCase("Mac OS X")) {
+            File libgpdl = new File("libgpdl.dylib");
+            System.load(libgpdl.getAbsolutePath());
+            File gsjni = new File("gs_jni.dylib");
+            System.load(gsjni.getAbsolutePath());
 		} else {
 			System.loadLibrary("gs_jni");
 		}
diff --git a/demos/java/gsviewer/Manifest.txt b/demos/java/gsviewer/Manifest.md
index 77639479e..77639479e 100644
--- a/demos/java/gsviewer/Manifest.txt
+++ b/demos/java/gsviewer/Manifest.md
diff --git a/demos/java/gsviewer/build_darwin.sh b/demos/java/gsviewer/build_darwin.sh
index 0f3d038a3..9c0a9d98f 100644
--- a/demos/java/gsviewer/build_darwin.sh
+++ b/demos/java/gsviewer/build_darwin.sh
@@ -34,4 +34,4 @@ javac -sourcepath src/ -d bin/ \
 cd bin
 
 echo "Packing gsviewer JAR file..."
-jar cfm "../gsviewer.jar" "../Manifest.txt" "com/"
+jar cfm "../gsviewer.jar" "../Manifest.txt" "com/"
\ No newline at end of file
diff --git a/demos/java/gsviewer/build.sh b/demos/java/gsviewer/build_linux.sh
index 77a4b1d29..0e2abb646 100644
--- a/demos/java/gsviewer/build.sh
+++ b/demos/java/gsviewer/build_linux.sh
@@ -3,7 +3,7 @@
 # build gsjava
 cd ../gsjava
 
-bash build.sh
+bash build_linux.sh
 
 cd ../gsviewer
 
@@ -38,4 +38,4 @@ jar cfm "../gsviewer.jar" "../Manifest.txt" "com/"
 
 #com.artifex.gsviewer.Main \
 #	-cf ../gsviewer.jar \
-#	"com/"
+#	"com/"
\ No newline at end of file
diff --git a/demos/java/gsviewer/build.bat b/demos/java/gsviewer/build_win32.bat
index 326885f16..00b696748 100644
--- a/demos/java/gsviewer/build.bat
+++ b/demos/java/gsviewer/build_win32.bat
@@ -27,4 +27,4 @@ cd bin
 echo Packing JAR file...
 jar cfm "..\gsviewer.jar" "..\Manifest.txt" "com"
 
-cd..
+cd..
\ No newline at end of file
diff --git a/demos/java/gsviewer/install.sh b/demos/java/gsviewer/install.sh
deleted file mode 100644
index b61c0480e..000000000
--- a/demos/java/gsviewer/install.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!bin/bash
-
-cd ../jni/gs_jni
-
-bash install.sh
-
-cd ../../gsviewer
diff --git a/demos/java/gsviewer/install_darwin.sh b/demos/java/gsviewer/install_darwin.sh
new file mode 100644
index 000000000..b6c58b869
--- /dev/null
+++ b/demos/java/gsviewer/install_darwin.sh
@@ -0,0 +1,11 @@
+#!bin/bash
+
+echo "Copy gs_jni.dylib"
+cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
+
+cd ../../../sobin
+
+echo "Copy libgpdl.dylib"
+cp $(readlink "libgpdl.dylib") "../demos/java/gsviewer"
+
+cd ../demos/java/gsviewer
\ No newline at end of file
diff --git a/demos/java/gsviewer/install_linux.sh b/demos/java/gsviewer/install_linux.sh
new file mode 100644
index 000000000..4772d70a6
--- /dev/null
+++ b/demos/java/gsviewer/install_linux.sh
@@ -0,0 +1,7 @@
+#!bin/bash
+
+cd ../jni/gs_jni
+
+bash install_linux.sh
+
+cd ../../gsviewer
\ No newline at end of file
diff --git a/demos/java/gsviewer/start_darwin.sh b/demos/java/gsviewer/start_darwin.sh
index c2941c8cc..9e4004bd5 100644
--- a/demos/java/gsviewer/start_darwin.sh
+++ b/demos/java/gsviewer/start_darwin.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-export LD_PRELOAD=/usr/lib/libgpdl.dylib
+export LD_PRELOAD=./libgpdl.dylib
 
-java -jar gsviewer.jar
+java -jar gsviewer.jar
\ No newline at end of file
diff --git a/demos/java/gsviewer/start.sh b/demos/java/gsviewer/start_linux.sh
index b30e201b1..4ed9f5144 100644
--- a/demos/java/gsviewer/start.sh
+++ b/demos/java/gsviewer/start_linux.sh
@@ -2,4 +2,4 @@
 
 export LD_PRELOAD=/usr/lib/libgpdl.so.9
 
-java -jar gsviewer.jar
+java -jar gsviewer.jar
\ No newline at end of file
diff --git a/demos/java/jni/gs_jni/build_darwin.sh b/demos/java/jni/gs_jni/build_darwin.sh
index 0dfc65f61..81b10c019 100644
--- a/demos/java/jni/gs_jni/build_darwin.sh
+++ b/demos/java/jni/gs_jni/build_darwin.sh
@@ -54,4 +54,4 @@ g++ -dynamiclib -fPIC \
 	"obin/com_artifex_gsjava_GSAPI.o" \
 	"obin/com_artifex_gsjava_util_NativePointer.o" \
 	"obin/jni_util.o" \
-	"../../../../sobin/libgpdl.dylib"
+	"../../../../sobin/libgpdl.dylib"
\ No newline at end of file
diff --git a/demos/java/jni/gs_jni/build.sh b/demos/java/jni/gs_jni/build_linux.sh
index 2ea26d820..974dfba38 100644
--- a/demos/java/jni/gs_jni/build.sh
+++ b/demos/java/jni/gs_jni/build_linux.sh
@@ -54,4 +54,4 @@ g++ -shared \
 	"obin/com_artifex_gsjava_GSAPI.o" \
 	"obin/com_artifex_gsjava_util_NativePointer.o" \
 	"obin/jni_util.o" \
-	"../../../../sobin/libgpdl.so"
+	"../../../../sobin/libgpdl.so"
\ No newline at end of file
diff --git a/demos/java/jni/gs_jni/install_linux.sh b/demos/java/jni/gs_jni/install_linux.sh
new file mode 100644
index 000000000..1626c2129
--- /dev/null
+++ b/demos/java/jni/gs_jni/install_linux.sh
@@ -0,0 +1,7 @@
+#!bin/bash
+
+echo "Copy libgpdl.so -> /usr/lib/libgpdl.so"
+sudo cp -L "../../../../sobin/libgpdl.so" "/usr/lib/libgpdl.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