view scripts/java/module.mk @ 18754:0ede4dbb37f1

Overhaul interp1, interp2, interp3 functions. * NEWS: Announce change in 'cubic' interpolation method for interp2 to match Matlab. * bicubic.m: Use interp2 (..., "spline") in %!tests. * interp1.m: Improve docstring. Use switch statement instead of if/elseif tree for simpler code. Use more informative error message than 'table too short'. Add titles to demo plots. Add new demo block showing difference between 'pchip' and 'spline' methods. * interp2.m: Rewrite docstring. Use variable 'extrap' instead of 'extrapval' to match documentation. Use clearer messages in error() calls. Make 'cubic' use the same algorithm as 'pchip' for Matlab compatibility. Use Octave coding conventions regarding spaces between variable and parenthesis. Added input validation tests. * interp3.m: Rewrite docstring. Use clearer messages in error() calls. Make 'cubic' use the same algorithm as 'pchip' for Matlab compatibility. Simplify input processing. Rewrite some %!tests for clarity. Added input validation tests.
author Rik <rik@octave.org>
date Sun, 30 Mar 2014 14:18:43 -0700
parents 7f2395651a1c
children 700714c099a2 10c38b9e5423
line wrap: on
line source

FCN_FILE_DIRS += java

java_FCN_FILES = \
  java/javaArray.m \
  java/javaaddpath.m \
  java/javaclasspath.m \
  java/javamem.m \
  java/javarmpath.m \
  java/usejava.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