Further updated build scripts

Removed install_* scripts in gsviewer and mtdemo and put them
into their respective build_* scripts. Updated the README to
reflect this change.

Also increased the number of threads being tested in mtdemo from
2 to 10.

8 files changed, 34 insertions, 70 deletions

diff --git a/demos/java/gsviewer/build_darwin.sh b/demos/java/gsviewer/build_darwin.sh
index 6c9d96c7b..ff9ec5b92 100755
--- a/demos/java/gsviewer/build_darwin.sh
+++ b/demos/java/gsviewer/build_darwin.sh
@@ -34,4 +34,18 @@ javac -sourcepath src/ -d bin/ \
 cd bin
 
 echo "Packing gsviewer JAR file..."
-jar cfm "../gsviewer.jar" "../Manifest.md" "com/"
\ No newline at end of file
+jar cfm "../gsviewer.jar" "../Manifest.md" "com/"
+
+
+echo "Copy gs_jni.dylib"
+cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
+
+echo "Create libgpdl.dylib link"
+cp "../../../sobin/libgpdl.dylib" "libgpdl.dylib"
+
+cd ../../../sobin
+
+echo "Copy libgpdl.dylib target"
+cp $(readlink "libgpdl.dylib") "../demos/java/gsviewer"
+
+cd ../demos/java/gsviewer
\ No newline at end of file
diff --git a/demos/java/gsviewer/build_linux.sh b/demos/java/gsviewer/build_linux.sh
index 67b3e9cfe..3cd706169 100755
--- a/demos/java/gsviewer/build_linux.sh
+++ b/demos/java/gsviewer/build_linux.sh
@@ -34,4 +34,18 @@ javac -sourcepath src/ -d bin/ \
 cd bin
 
 echo "Packing gsviewer JAR file..."
-jar cfm "../gsviewer.jar" "../Manifest.md" "com/"
\ No newline at end of file
+jar cfm "../gsviewer.jar" "../Manifest.md" "com/"
+
+
+echo "Copy gs_jni.so"
+cp "../jni/gs_jni/gs_jni.so" "gs_jni.so"
+
+echo "Create libgpdl.so link"
+cp "../../../sobin/libgpdl.so" "libgpdl.so"
+
+cd ../../../sobin
+
+echo "Copy libgpdl.so target"
+cp $(readlink "libgpdl.so")  "../demos/java/gsviewer"
+
+cd ../demos/java/gsviewer
\ No newline at end of file
diff --git a/demos/java/gsviewer/install_darwin.sh b/demos/java/gsviewer/install_darwin.sh
deleted file mode 100755
index bb3e3c90f..000000000
--- a/demos/java/gsviewer/install_darwin.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!bin/bash
-
-echo "Copy gs_jni.dylib"
-cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
-
-echo "Create libgpdl.dylib link"
-cp "../../../sobin/libgpdl.dylib" "libgpdl.dylib"
-
-cd ../../../sobin
-
-echo "Copy libgpdl.dylib target"
-cp $(readlink "libgpdl.dylib") "../demos/java/gsviewer"
-
-cd ../demos/java/gsviewer
diff --git a/demos/java/gsviewer/install_linux.sh b/demos/java/gsviewer/install_linux.sh
deleted file mode 100755
index bdfdd3928..000000000
--- a/demos/java/gsviewer/install_linux.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!bin/bash
-
-echo "Copy gs_jni.so"
-cp "../jni/gs_jni/gs_jni.so" "gs_jni.so"
-
-echo "Create libgpdl.so link"
-cp "../../../sobin/libgpdl.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/Main.java b/demos/java/mtdemo/Main.java
index 4563388db..82e636195 100644
--- a/demos/java/mtdemo/Main.java
+++ b/demos/java/mtdemo/Main.java
@@ -12,19 +12,13 @@ public class Main {
 	// The output directory
 	public static final String OUTDIR = "pdfout";
 
-	public static final boolean WAIT_FOR_INPUT = false;
-
 	public static void main(String[] args) {
-		if (WAIT_FOR_INPUT) {
-			System.out.print("Awaiting input: ");
-			new Scanner(System.in).nextLine();
-		}
 		// For multithreading, call this before any GSInstance objects
 		// are created.
 		GSInstance.setAllowMultithreading(true);
 
 		// Parse first command line argument as thread count
-		int workerCount = 2;
+		int workerCount = 10;
 		if (args.length > 0) {
 			try {
 				workerCount = Integer.parseInt(args[0]);
diff --git a/demos/java/mtdemo/README.txt b/demos/java/mtdemo/README.txt
index a08240917..0dca6335e 100644
--- a/demos/java/mtdemo/README.txt
+++ b/demos/java/mtdemo/README.txt
@@ -10,8 +10,8 @@ What is here?
 * build_darwin.sh - Builds the Java program on Darwin systems
 * build_linux.sh - Builds the Java program on Linux systems
 * build_win32.bat - Builds the Java program on Windows
-* install_linux.sh - Installs required libraries to run the demo on Linux
-* install_darwin.sh - Installs required libraries to run the demo on Darwin
+* runmtd_darwin.sh - Runs the Java program on Darwin systems
+* runmtd_linux.sh - Runs the Java program on Linux systems
 * runmtd_win32.bat - Starts the Java program for Windows
 
 Build/run instructions:
@@ -42,9 +42,7 @@ Build/run instructions:
 
    /etc/java-8-openjdk/accessibility.properties
 
-3. Run build_linux.sh to build.
-
-4. Run install_linux.sh to install required libraries.
+3. Run build_linux.sh to build and copy libraries.
 
 5. Run runmtd_linux.sh to start the application.
 
diff --git a/demos/java/mtdemo/install_darwin.sh b/demos/java/mtdemo/install_darwin.sh
deleted file mode 100755
index 5284904a2..000000000
--- a/demos/java/mtdemo/install_darwin.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!bin/bash
-
-echo "Copy gs_jni.dylib"
-cp "../jni/gs_jni/gs_jni.dylib" "gs_jni.dylib"
-
-echo "Create libgpdl.dylib link"
-cp "../../../sobin/libgpdl.dylib" "libgpdl.dylib"
-
-cd ../../../sobin
-
-echo "Copy libgpdl.dylib target"
-cp $(readlink "libgpdl.dylib") "../demos/java/mtdemo"
-
-cd ../demos/java/mtdemo
\ No newline at end of file
diff --git a/demos/java/mtdemo/install_linux.sh b/demos/java/mtdemo/install_linux.sh
deleted file mode 100755
index 5eee89af0..000000000
--- a/demos/java/mtdemo/install_linux.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!bin/bash
-
-echo "Copy gs_jni.so"
-cp "../jni/gs_jni/gs_jni.so" "gs_jni.so"
-
-echo "Create libgpdl.so link"
-cp "../../../sobin/libgpdl.so" "libgpdl.so"
-
-cd ../../../sobin
-
-echo "Copy libgpdl.so target"
-cp $(readlink "libgpdl.so") "../demos/java/mtdemo"
-
-cd ../demos/java/mtdemo
\ No newline at end of file