PLplot

Update of /cvsroot/plplot/plplot/bindings/java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2628/bindings/java

Modified Files:
	.cvsignore Makefile.am 
Log Message:
Compile java files in the build tree, create jar files, then install jar
files. Just like we do for other languages.

There are two separate jar files so the user can play with and rebuild the
examples if they like. There is a Makefile in share/plplot/examples/java 
for this - like the Makefile.examples for other languages. 

Update test_java.sh script to use the new jar files. As long as everything
is in the installation directories set at configure time there is no need
to set the CLASSPATH.

Tested with gcj and with Sun JDK. Please check this on your system, 
particularly if you are not using Linux.



Index: .cvsignore
===================================================================
RCS file: /cvsroot/plplot/plplot/bindings/java/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- .cvsignore	28 Jan 2004 18:00:36 -0000	1.5
+++ .cvsignore	29 Jun 2004 14:51:15 -0000	1.6
@@ -12,3 +12,6 @@
 plplotjavacJNI.java
 plplotjavac_wrap.c
 plplotjavacConstants.java
+plplot
+plplot.jar
+classnoinst.stamp

Index: Makefile.am
===================================================================
RCS file: /cvsroot/plplot/plplot/bindings/java/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	29 Jun 2004 04:58:51 -0000	1.28
+++ Makefile.am	29 Jun 2004 14:51:16 -0000	1.29
@@ -78,7 +78,17 @@
 
 # Use javaJAVA for gcj support once gcc-3.2 use becomes
 # widespread.
-ourexecjava_DATA = README.javaAPI $(javafiles)
+
+JAVAROOT = .
+
+noinst_JAVA = $(javafiles)
+plplotjavaexecdir = $(DATA_DIR)/java/
+plplotjavaexec_DATA = plplot.jar
+
+plplot.jar: $(javafiles)
+	jar -cf plplot.jar plplot/core/*.class
+
+#ourexecjava_DATA = README.javaAPI $(javafiles)
 
 execjavawrapper_LTLIBRARIES = plplotjavac_wrap.la
 
@@ -90,10 +100,12 @@
 
 install-exec-hook:
 if enable_java
-	( cd $(DESTDIR)$(execjavawrapperdir) ; \
-	  rm -f plplotjavac_wrap*.a plplotjavac_wrap*.la ; \
-	  cd $(DESTDIR)$(DATA_DIR) ; \
-	  javac -classpath java -d java java/plplot/core/*.java)
+#	( cd $(DESTDIR)$(execjavawrapperdir) ; \
+#	  rm -f plplotjavac_wrap*.a plplotjavac_wrap*.la ; \
+#	  cd $(DESTDIR)$(DATA_DIR) ; \
+#	  javac -classpath java -d java java/plplot/core/*.java ; \
+#	  cd java; jar -c -f plplot.jar plplot/core/*.class)
+
 endif
 
 MAINTAINERCLEANFILES = $(swiggenfiles)