Changeset 1722

Timestamp:

May 19, 2010 1:47:39 PM (12 years ago)

Author:

braffert

Message:

Added java bindings

Location:

trunk

Files:

• configure (modified) (5 diffs)
• configure.in (modified) (3 diffs)
• examples/app-fermi/Makefile.in (modified) (6 diffs)
• examples/app-fermi/java (added)
• examples/app-fermi/java/Fermi.java (added)
• examples/app-fermi/java/Makefile.in (added)
• examples/app-fermi/java/tool.xml (added)
• gui/apps/rappture.env.in (modified) (1 diff)
• lang/Makefile.in (modified) (2 diffs)
• lang/java (added)
• lang/java/Library.java (added)
• lang/java/Makefile.in (added)
• lang/java/Units.java (added)
• lang/java/Utils.java (added)
• lang/java/jRpLibrary.cc (added)
• lang/java/jRpUnits.cc (added)
• lang/java/jRpUtils.cc (added)

trunk/configure

@@ -608 +608 @@
 SHLIB_LDFLAGS
 RP_BASE
+JAVA_INCLUDES
+JAVA_HOME
+JAVAH
+JAVAC
+JAVA
 RUBY_PLATFORM
 RUBY_VERSION_RV
@@ -8422 +8427 @@
 
 
+# TODO: Check that these actually exist.
+JAVA=java
+JAVAC=javac
+JAVAH=javah
+
+# TODO: Find the java install from path to java exectuable.
+JAVA_HOME=/usr/lib/jvm/java-6-sun
+
+# TODO: find the location of jni.h and jni_md.h.
+# Obviously the linux subdir won't exist on all platforms.
+JAVA_INCLUDES="-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/linux"
+
+
+
+
+
+
+
 RP_BASE=`pwd`
 
@@ -8926 +8949 @@
 
 
-ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile lang/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/RpOctaveInterface.h lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
+ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile lang/Makefile lang/java/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/RpOctaveInterface.h lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile test/Makefile test/src/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -9636 +9659 @@
     "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;;
     "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;;
+    "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;;
     "lang/perl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile" ;;
     "lang/perl/Makefile.PL") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile.PL" ;;
@@ -9657 +9681 @@
     "examples/app-fermi/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/cee/Makefile" ;;
     "examples/app-fermi/fortran/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/fortran/Makefile" ;;
+    "examples/app-fermi/java/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/java/Makefile" ;;
     "examples/app-fermi/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/Makefile" ;;
     "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;;

trunk/configure.in

@@ -451 +451 @@
 AC_SUBST(RUBY_VERSION_RV)
 AC_SUBST(RUBY_PLATFORM)
+
+# TODO: Check that these actually exist.
+JAVA=java
+JAVAC=javac
+JAVAH=javah
+
+# TODO: Find the java install from path to java exectuable.
+JAVA_HOME=/usr/lib/jvm/java-6-sun
+
+# TODO: find the location of jni.h and jni_md.h.
+# Obviously the linux subdir won't exist on all platforms.
+JAVA_INCLUDES="-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/linux"
+
+AC_SUBST(JAVA)
+AC_SUBST(JAVAC)
+AC_SUBST(JAVAH)
+AC_SUBST(JAVA_HOME)
+AC_SUBST(JAVA_INCLUDES)
 
 RP_BASE=`pwd`
@@ -542 +560 @@
     gui/scripts/Makefile
     lang/Makefile
+    lang/java/Makefile
     lang/perl/Makefile
     lang/perl/Makefile.PL
@@ -563 +582 @@
     examples/app-fermi/cee/Makefile
     examples/app-fermi/fortran/Makefile
+    examples/app-fermi/java/Makefile
     examples/app-fermi/matlab/Makefile
     examples/app-fermi/matlab/compiled/Makefile

trunk/examples/app-fermi/Makefile.in

@@ -23 +23 @@
 MEX =           @MEX@
 MKOCTFILE =     @MKOCTFILE@
+JAVA =          @JAVA@
 
 LANGS = target_c target_tcl target_wrapper target_2_0
@@ -42 +43 @@
 ifneq ($(RUBY),)
     LANGS += target_ruby
+endif
+ifneq ($(JAVA),)
+    LANGS += target_java
 endif
 
@@ -70 +74 @@
 build_2_0:
         $(MAKE) -C 2.0 all
+build_java:
+        $(MAKE) -C java all
 
 install_c: 
@@ -91 +97 @@
 install_2_0:
         $(MAKE) -C 2.0 install
+install_java:
+        $(MAKE) -C java install
 
 clean:
@@ -103 +111 @@
         $(MAKE) -C wrapper clean
         $(MAKE) -C 2.0 clean
+        $(MAKE) -C java clean
         
 distclean: 
@@ -115 +124 @@
         $(MAKE) -C wrapper distclean
         $(MAKE) -C 2.0 distclean
+        $(MAKE) -C java distclean
         $(RM) Makefile

trunk/gui/apps/rappture.env.in

@@ -52 +52 @@
 export TCL_LIBRARY TK_LIBRARY TCLLIBPATH
 
+CLASSPATH=.:${libdir}/java:$CLASSPATH
+JAVALIB=${libdir}/java:$JAVALIB
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$JAVALIB
+
+export CLASSPATH JAVALIB LD_LIBRARY_PATH
+

trunk/lang/Makefile.in

@@ -21 +21 @@
 MEX             = @MEX@
 MKOCTFILE       = @MKOCTFILE@
+JAVA            = @JAVA@
 
 # Rappture requires it. We always build a Tcl language API.
@@ -40 +41 @@
   LANGS += octave
 endif
+ifneq ($(JAVA),)
+  LANGS += java
+endif
 
-.PHONY: tcl octave matlab perl python ruby
+.PHONY: tcl octave matlab perl python ruby java
 
 all: