Mercurial > octave-nkf
view scripts/java/module.mk @ 15781:c33594eefda7
Add fieldnames.m which extensds fieldnames() to work on Java objects.
Deprecate javafields. Rename old C++ fieldnames to __fieldnames__.
* scripts/deprecated/javafields.m: Moved from scripts/java. Added deprecated
warning.
* scripts/java/javafields.m: Moved to scripts/deprecated.
* scripts/general/fieldnames.m: New m-file which accepts Java, structure,
or Octave objects as inputs.
* libinterp/octave-value/ov-struct.cc(Ffieldnames): Renamed fieldnames to
__fieldnames__ to avoid class with fieldnames.m.
* scripts/deprecated/module.mk: Added javafields to deprecated build.
* scripts/general/module.mk: Added fieldnames.m to build.
* scripts/java/module.mk: Removed javafields.m from build.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 13 Dec 2012 10:57:04 -0800 |
parents | 2c6b00c03329 |
children | 42cff4396de4 |
line wrap: on
line source
FCN_FILE_DIRS += java java_FCN_FILES = \ java/dlgtest.m \ java/errordlg.m \ java/helpdlg.m \ java/inputdlg.m \ java/java.m \ java/javaArray.m \ java/javaaddpath.m \ java/javaclasspath.m \ java/javamem.m \ java/javamethods.m \ java/javarmpath.m \ java/listdlg.m \ java/msgbox.m \ java/questdlg.m \ java/warndlg.m FCN_FILES += $(java_FCN_FILES) PKG_ADD_FILES += java/PKG_ADD DIRSTAMP_FILES += java/$(octave_dirstamp) if AMCOND_HAVE_JAVA JAR_FILES += java/octave.jar endif org_octave_dir = org/octave if AMCOND_HAVE_JAVA JAVA_SRC = \ $(org_octave_dir)/ClassHelper.java \ $(org_octave_dir)/OctClassLoader.java \ $(org_octave_dir)/Octave.java \ $(org_octave_dir)/OctaveReference.java \ $(org_octave_dir)/Matrix.java \ $(org_octave_dir)/JDialogBox.java \ $(org_octave_dir)/DlgListener.java \ $(org_octave_dir)/TeXtranslator.java \ $(org_octave_dir)/TeXcode.java endif JAVA_CLASSES = $(JAVA_SRC:.java=.class) JAVA_IMAGES = \ $(org_octave_dir)/images/question.png \ $(org_octave_dir)/images/error.png \ $(org_octave_dir)/images/warning.png \ $(org_octave_dir)/images/information.png \ $(org_octave_dir)/images/octave.png java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC)) java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES)) java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES)) srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES)) %.class : %.java $(MKDIR_P) java/$(org_octave_dir) ( cd $(srcdir)/java; $(JAVAC) -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) ) java/images.stamp: $(srcdir_java_JAVA_IMAGES) if [ "x$(srcdir)" != "x." ]; then \ $(MKDIR_P) java/$(org_octave_dir)/images; \ cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \ fi touch $@ if AMCOND_HAVE_JAVA java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) ( cd java; $(JAR) cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) ) mv $@.t $@ endif EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES) CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES) DISTCLEANFILES += java/images.stamp