summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/java/gsjava/build_darwin.sh2
-rw-r--r--demos/java/gsjava/build_linux.sh2
-rw-r--r--demos/java/gsviewer/README.txt7
-rw-r--r--demos/java/gsviewer/build_darwin.sh2
-rw-r--r--demos/java/gsviewer/build_linux.sh6
-rw-r--r--demos/java/gsviewer/build_win32.bat14
6 files changed, 21 insertions, 12 deletions
diff --git a/demos/java/gsjava/build_darwin.sh b/demos/java/gsjava/build_darwin.sh
index eee71f549..212dfb365 100644
--- a/demos/java/gsjava/build_darwin.sh
+++ b/demos/java/gsjava/build_darwin.sh
@@ -57,6 +57,6 @@ javac -sourcepath src/ -d bin/ \
cd bin
echo "Packing gsjava JAR file..."
-jar cfm "../gsjava.jar" "../Manifest.txt" "com/"
+jar cfm "../gsjava.jar" "../Manifest.md" "com/"
cd .. \ No newline at end of file
diff --git a/demos/java/gsjava/build_linux.sh b/demos/java/gsjava/build_linux.sh
index 54f049fc1..2866c07e9 100644
--- a/demos/java/gsjava/build_linux.sh
+++ b/demos/java/gsjava/build_linux.sh
@@ -57,6 +57,6 @@ javac -sourcepath src/ -d bin/ \
cd bin
echo "Packing gsjava JAR file..."
-jar cfm "../gsjava.jar" "../Manifest.txt" "com/"
+jar cfm "../gsjava.jar" "../Manifest.md" "com/"
cd .. \ No newline at end of file
diff --git a/demos/java/gsviewer/README.txt b/demos/java/gsviewer/README.txt
index c3663cf97..e2514dd17 100644
--- a/demos/java/gsviewer/README.txt
+++ b/demos/java/gsviewer/README.txt
@@ -48,9 +48,10 @@ Building:
-= WINDOWS =-
-Ensure both gs_jni.dll, gpdldll64.dll, and gsjava.jar have been built. Then,
-run the build_win32.bat script. To run, open gsviewer.jar either through File
-Explorer or in the command line through the following command:
+Ensure both gs_jni.dll and gpdldll64.dll. Then, run the build_win32.bat script.
+This will automatically build and copy gsjava.jar to this directory. To run,
+open gsviewer.jar either through File Explorer or in the command line through
+the following command:
java -jar gsviewer.jar
diff --git a/demos/java/gsviewer/build_darwin.sh b/demos/java/gsviewer/build_darwin.sh
index 9c0a9d98f..6c9d96c7b 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/" \ No newline at end of file
+jar cfm "../gsviewer.jar" "../Manifest.md" "com/" \ No newline at end of file
diff --git a/demos/java/gsviewer/build_linux.sh b/demos/java/gsviewer/build_linux.sh
index 0e2abb646..67b3e9cfe 100644
--- a/demos/java/gsviewer/build_linux.sh
+++ b/demos/java/gsviewer/build_linux.sh
@@ -34,8 +34,4 @@ javac -sourcepath src/ -d bin/ \
cd bin
echo "Packing gsviewer JAR file..."
-jar cfm "../gsviewer.jar" "../Manifest.txt" "com/"
-
-#com.artifex.gsviewer.Main \
-# -cf ../gsviewer.jar \
-# "com/" \ No newline at end of file
+jar cfm "../gsviewer.jar" "../Manifest.md" "com/" \ No newline at end of file
diff --git a/demos/java/gsviewer/build_win32.bat b/demos/java/gsviewer/build_win32.bat
index 00b696748..0e279e9ff 100644
--- a/demos/java/gsviewer/build_win32.bat
+++ b/demos/java/gsviewer/build_win32.bat
@@ -1,5 +1,17 @@
@echo off
+echo Build gsjava
+
+cd "..\gsjava"
+
+call build_win32
+
+cd "..\gsviewer"
+
+copy "..\gsjava\gsjava.jar" ".\gsjava.jar"
+
+echo Build gsviewer
+
if not exist bin mkdir bin
echo Compiling Java source...
@@ -25,6 +37,6 @@ javac -sourcepath src\ -d bin\^
cd bin
echo Packing JAR file...
-jar cfm "..\gsviewer.jar" "..\Manifest.txt" "com"
+jar cfm "..\gsviewer.jar" "..\Manifest.md" com\
cd.. \ No newline at end of file