diff libinterp/octave-value/ov-java.h @ 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 libinterp/dldfcn/__java__.h@4be890c5527c
children e61405133a76
line wrap: on
line diff
copy from libinterp/dldfcn/__java__.h
copy to libinterp/octave-value/ov-java.h
--- a/libinterp/dldfcn/__java__.h
+++ b/libinterp/octave-value/ov-java.h
@@ -20,8 +20,8 @@
 
 */
 
-#if !defined (octave___java__h)
-#define octave___java__h 1
+#if !defined (octave_java_h)
+#define octave_java_h 1
 
 #include <jni.h>
 
@@ -321,4 +321,4 @@
   std::string java_type;
 };
 
-#endif /* __JAVA__H__ */
+#endif