Mercurial > hg > octave-lyh
comparison run-octave.in @ 15752:f96faf028d90
make java functions part of core octave_value classes
* run-octave.in: Set OCTAVE_JAVA_DIR.
* octave-value/ov-java.cc: Rename from dldfcn/__java__.cc.
(get_module_path): Delete.
(initial_java_dir): Don't set architecture dependent directory.
Check environment or use Vfcn_file_dir to set default directory.
(initial_class_path): Don't search load path for octave.jar.
(initialize_jvm): Don't add -Doctave.java.path=DIR to vm_args.
Use DEFUN, not DEFUN_DLD.
(F__java__): Delete.
* octave-value/ov-java.h: Rename from dldfcn/__java__.h.
* dldfcn/module-files: Delete entry for __java__.cc.
* libinterp/Makefile.am (octinclude_HEADERS): Delete $(DLDFCN_INC)
from the list.
* octave-value/module.mk (OCTAVE_VALUE_INC): Add ov-java.h to the list.
(OCTAVE_VALUE_SRC) Add ov-java.cc to the list.
(octave_value_liboctave_value_la_LIBADD): New variable.
(octave_value_liboctave_value_la_CPPFLAGS): Add $(JAVA_CPPFLAGS) to
the list.
* dldfcn/config-module.awk: Don't print DLDFCN_INC variable.
* Octave.java, OctaveReference.java: Don't grab a reference to
__java__.oct.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 08 Dec 2012 00:23:13 -0500 |
parents | bf0857c789f4 |
children | e27d9b9b71f4 |
comparison
equal
deleted
inserted
replaced
15751:72968fb32c82 | 15752:f96faf028d90 |
---|---|
78 fi | 78 fi |
79 fi | 79 fi |
80 | 80 |
81 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ | 81 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ |
82 OCTAVE_DEFAULT_QT_SETTINGS="$top_srcdir/libgui/default-qt-settings" \ | 82 OCTAVE_DEFAULT_QT_SETTINGS="$top_srcdir/libgui/default-qt-settings" \ |
83 OCTAVE_JAVA_DIR="$builddir/scripts/java" \ | |
83 exec $builddir/libtool --mode=execute $driver \ | 84 exec $builddir/libtool --mode=execute $driver \ |
84 "$octave_executable" --no-init-path --path="$LOADPATH" \ | 85 "$octave_executable" --no-init-path --path="$LOADPATH" \ |
85 --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ | 86 --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ |
86 --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \ | 87 --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \ |
87 --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@" | 88 --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@" |