view scripts/java/module.mk @ 15836:48a75e6884ec

Fix JAVA detection for MSVC and support white space in Java path. * configure.ac (JAVA_HOME, JAVA_PATH, java_version): Quote java-related paths and commands and consider backslash in path manipulations. Also detect the case of MSYS shell (mingw canonical host) with MSVC. In MSYS shell, convert JAVA_HOME into MSYS path (no backslash or colon). * scripts/java/modules.mk: Double-quote usage of $(JAVAC) and $(JAR).
author Michael Goffioul <michael.goffioul@gmail.com>
date Sun, 23 Dec 2012 03:16:08 +0000
parents 420b5603cbbf
children ff061068a66c
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/javaArray.m \
  java/javaaddpath.m \
  java/javaclasspath.m \
  java/javamem.m \
  java/javarmpath.m \
  java/listdlg.m \
  java/msgbox.m \
  java/questdlg.m \
  java/usejava.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