Changeset 1722 for trunk


Ignore:
Timestamp:
May 19, 2010 1:47:39 PM (12 years ago)
Author:
braffert
Message:

Added java bindings

Location:
trunk
Files:
12 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r1678 r1722  
    608608SHLIB_LDFLAGS
    609609RP_BASE
     610JAVA_INCLUDES
     611JAVA_HOME
     612JAVAH
     613JAVAC
     614JAVA
    610615RUBY_PLATFORM
    611616RUBY_VERSION_RV
     
    84228427
    84238428
     8429# TODO: Check that these actually exist.
     8430JAVA=java
     8431JAVAC=javac
     8432JAVAH=javah
     8433
     8434# TODO: Find the java install from path to java exectuable.
     8435JAVA_HOME=/usr/lib/jvm/java-6-sun
     8436
     8437# TODO: find the location of jni.h and jni_md.h.
     8438# Obviously the linux subdir won't exist on all platforms.
     8439JAVA_INCLUDES="-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/linux"
     8440
     8441
     8442
     8443
     8444
     8445
     8446
    84248447RP_BASE=`pwd`
    84258448
     
    89268949
    89278950
    8928 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"
     8951ac_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"
    89298952
    89308953cat >confcache <<\_ACEOF
     
    96369659    "gui/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES gui/scripts/Makefile" ;;
    96379660    "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;;
     9661    "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;;
    96389662    "lang/perl/Makefile") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile" ;;
    96399663    "lang/perl/Makefile.PL") CONFIG_FILES="$CONFIG_FILES lang/perl/Makefile.PL" ;;
     
    96579681    "examples/app-fermi/cee/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/cee/Makefile" ;;
    96589682    "examples/app-fermi/fortran/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/fortran/Makefile" ;;
     9683    "examples/app-fermi/java/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/java/Makefile" ;;
    96599684    "examples/app-fermi/matlab/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/Makefile" ;;
    96609685    "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;;
  • trunk/configure.in

    r1678 r1722  
    451451AC_SUBST(RUBY_VERSION_RV)
    452452AC_SUBST(RUBY_PLATFORM)
     453
     454# TODO: Check that these actually exist.
     455JAVA=java
     456JAVAC=javac
     457JAVAH=javah
     458
     459# TODO: Find the java install from path to java exectuable.
     460JAVA_HOME=/usr/lib/jvm/java-6-sun
     461
     462# TODO: find the location of jni.h and jni_md.h.
     463# Obviously the linux subdir won't exist on all platforms.
     464JAVA_INCLUDES="-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/linux"
     465
     466AC_SUBST(JAVA)
     467AC_SUBST(JAVAC)
     468AC_SUBST(JAVAH)
     469AC_SUBST(JAVA_HOME)
     470AC_SUBST(JAVA_INCLUDES)
    453471
    454472RP_BASE=`pwd`
     
    542560    gui/scripts/Makefile
    543561    lang/Makefile
     562    lang/java/Makefile
    544563    lang/perl/Makefile
    545564    lang/perl/Makefile.PL
     
    563582    examples/app-fermi/cee/Makefile
    564583    examples/app-fermi/fortran/Makefile
     584    examples/app-fermi/java/Makefile
    565585    examples/app-fermi/matlab/Makefile
    566586    examples/app-fermi/matlab/compiled/Makefile
  • trunk/examples/app-fermi/Makefile.in

    r1044 r1722  
    2323MEX =           @MEX@
    2424MKOCTFILE =     @MKOCTFILE@
     25JAVA =          @JAVA@
    2526
    2627LANGS = target_c target_tcl target_wrapper target_2_0
     
    4243ifneq ($(RUBY),)
    4344    LANGS += target_ruby
     45endif
     46ifneq ($(JAVA),)
     47    LANGS += target_java
    4448endif
    4549
     
    7074build_2_0:
    7175        $(MAKE) -C 2.0 all
     76build_java:
     77        $(MAKE) -C java all
    7278
    7379install_c:
     
    9197install_2_0:
    9298        $(MAKE) -C 2.0 install
     99install_java:
     100        $(MAKE) -C java install
    93101
    94102clean:
     
    103111        $(MAKE) -C wrapper clean
    104112        $(MAKE) -C 2.0 clean
     113        $(MAKE) -C java clean
    105114       
    106115distclean:
     
    115124        $(MAKE) -C wrapper distclean
    116125        $(MAKE) -C 2.0 distclean
     126        $(MAKE) -C java distclean
    117127        $(RM) Makefile
  • trunk/gui/apps/rappture.env.in

    r1679 r1722  
    5252export TCL_LIBRARY TK_LIBRARY TCLLIBPATH
    5353
     54CLASSPATH=.:${libdir}/java:$CLASSPATH
     55JAVALIB=${libdir}/java:$JAVALIB
     56LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$JAVALIB
     57
     58export CLASSPATH JAVALIB LD_LIBRARY_PATH
     59
  • trunk/lang/Makefile.in

    r1087 r1722  
    2121MEX             = @MEX@
    2222MKOCTFILE       = @MKOCTFILE@
     23JAVA            = @JAVA@
    2324
    2425# Rappture requires it. We always build a Tcl language API.
     
    4041  LANGS += octave
    4142endif
     43ifneq ($(JAVA),)
     44  LANGS += java
     45endif
    4246
    43 .PHONY: tcl octave matlab perl python ruby
     47.PHONY: tcl octave matlab perl python ruby java
    4448
    4549all:
Note: See TracChangeset for help on using the changeset viewer.