annotate scripts/java/module.mk @ 15778:2c6b00c03329

build: Build documentation correctly even without Java installed. * scripts/Makefile.am: Remove AMCOND_HAVE_JAVA conditionals disabling java directory build when Java not present. * scripts/java/module.mk: Disable octave.jar and octave class compilation when Java is not present.
author Rik <rik@octave.org>
date Wed, 12 Dec 2012 20:19:28 -0800
parents 71dfd53ed47a
children c33594eefda7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 FCN_FILE_DIRS += java
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 java_FCN_FILES = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 java/dlgtest.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 java/errordlg.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 java/helpdlg.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 java/inputdlg.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 java/java.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 java/javaArray.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 java/javaaddpath.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 java/javaclasspath.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 java/javafields.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 java/javamem.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 java/javamethods.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 java/javarmpath.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 java/listdlg.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 java/msgbox.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 java/questdlg.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 java/warndlg.m
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 FCN_FILES += $(java_FCN_FILES)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 PKG_ADD_FILES += java/PKG_ADD
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 DIRSTAMP_FILES += java/$(octave_dirstamp)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
27 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 JAR_FILES += java/octave.jar
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
29 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 org_octave_dir = org/octave
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
33 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 JAVA_SRC = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 $(org_octave_dir)/ClassHelper.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 $(org_octave_dir)/OctClassLoader.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 $(org_octave_dir)/Octave.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 $(org_octave_dir)/OctaveReference.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 $(org_octave_dir)/Matrix.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 $(org_octave_dir)/JDialogBox.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 $(org_octave_dir)/DlgListener.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 $(org_octave_dir)/TeXtranslator.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 $(org_octave_dir)/TeXcode.java
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
44 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 JAVA_IMAGES = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 $(org_octave_dir)/images/question.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 $(org_octave_dir)/images/error.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 $(org_octave_dir)/images/warning.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 $(org_octave_dir)/images/information.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 $(org_octave_dir)/images/octave.png
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC))
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES))
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES))
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
61 srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 %.class : %.java
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 $(MKDIR_P) java/$(org_octave_dir)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 ( cd $(srcdir)/java; $(JAVAC) -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) )
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
67 java/images.stamp: $(srcdir_java_JAVA_IMAGES)
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 if [ "x$(srcdir)" != "x." ]; then \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 $(MKDIR_P) java/$(org_octave_dir)/images; \
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
70 cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 fi
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 touch $@
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
74 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 java/octave.jar: java/images.stamp $(java_JAVA_CLASSES)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 ( cd java; $(JAR) cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) )
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 mv $@.t $@
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
78 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
80 EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES)
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
81
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
82 CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES)
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
83
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
84 DISTCLEANFILES += java/images.stamp
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
85