Mercurial > hg > octave-nkf

view scripts/java/module.mk @ 15790:921912c92102

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate java_invoke, replace with javaMethod. Update all m-files to use javaMethod. * scripts/deprecated/java_invoke.m: New m-file with warning about function being deprecated. * libinterp/octave-value/ov-java.cc(Fjava_invoke, FjavaMethod): Remove java_invoke. Replace body of javaMethod with old java_invoke code. * libinterp/octave-value/ov-java.cc(do_java_invoke): Rename to do_javaMethod. * libinterp/octave-value/ov-java.cc(do_java_create): Rename to do_javaObject. * libinterp/octave-value/ov-java.h(do_java_invoke, do_java_create): Rename prototypes for functions to do_javaMethod and do_javaObject respectively. * scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m, scripts/deprecated/module.mk, scripts/general/fieldnames.m, scripts/general/methods.m, scripts/java/errordlg.m, scripts/java/helpdlg.m, scripts/java/inputdlg.m, scripts/java/javaArray.m, scripts/java/javaaddpath.m, scripts/java/javaclasspath.m, scripts/java/javamem.m, scripts/java/javarmpath.m, scripts/java/listdlg.m, scripts/java/msgbox.m, scripts/java/questdlg.m, scripts/java/warndlg.m: Replace java_invoke calls with javaMethod calls.
author Rik <rik@octave.org>
date Fri, 14 Dec 2012 09:51:37 -0800
parents 42cff4396de4
children b15cfb7ed0eb
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/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