Mercurial > hg > octave-nkf

annotate scripts/java/module.mk @ 20792:fd0efcdb3718

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use new string_value method to handle value extraction errors * dirfns.cc, file-io.cc, gammainc.cc, help.cc, load-path.cc, octave-link.cc, qz.cc, regexp.cc, strfns.cc, syscalls.cc, time.cc, variables.cc: Use new string_value method.
author John W. Eaton <jwe@octave.org>
date Thu, 08 Oct 2015 19:00:51 -0400
parents 6b7c10920dfe
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
1 FCN_FILE_DIRS += scripts/java
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
3 scripts_java_FCN_FILES = \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
4 scripts/java/java_get.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
5 scripts/java/java_set.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
6 scripts/java/javaArray.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
7 scripts/java/javaaddpath.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
8 scripts/java/javachk.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
9 scripts/java/javaclasspath.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
10 scripts/java/javamem.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
11 scripts/java/javarmpath.m \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
12 scripts/java/usejava.m
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13
20553
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
14 if AMCOND_HAVE_JAVA
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
15 scripts_java_JAR_FILES = scripts/java/octave.jar
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
20553
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
17 JAR_FILES += $(scripts_java_JAR_FILES)
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
18 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 org_octave_dir = org/octave
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
22 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 JAVA_SRC = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 $(org_octave_dir)/ClassHelper.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 $(org_octave_dir)/OctClassLoader.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 $(org_octave_dir)/Octave.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 $(org_octave_dir)/OctaveReference.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 $(org_octave_dir)/Matrix.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 $(org_octave_dir)/JDialogBox.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 $(org_octave_dir)/DlgListener.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 $(org_octave_dir)/TeXtranslator.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 $(org_octave_dir)/TeXcode.java
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
33 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 JAVA_IMAGES = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 $(org_octave_dir)/images/question.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 $(org_octave_dir)/images/error.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 $(org_octave_dir)/images/warning.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 $(org_octave_dir)/images/information.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 $(org_octave_dir)/images/octave.png
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
44 scripts_java_JAVA_SRC = $(addprefix scripts/java/, $(JAVA_SRC))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
46 scripts_java_JAVA_CLASSES = $(addprefix scripts/java/, $(JAVA_CLASSES))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
48 scripts_java_JAVA_IMAGES = $(addprefix scripts/java/, $(JAVA_IMAGES))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
20576
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
50 scripts_DISTCLEANFILES += $(addprefix $(abs_top_builddir), $(java_JAVA_IMAGES))
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
51
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
52 srcdir_scripts_java_JAVA_IMAGES = $(addprefix $(srcdir)/scripts/java/, $(JAVA_IMAGES))
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
20577
6b7c10920dfe make interpreter targets and dirstamp files order-only prerequisites
John W. Eaton <jwe@octave.org>
parents: 20576
diff changeset
54 $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
55 $(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
56 ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
58 scripts/java/images.stamp: $(srcdir_scripts_java_JAVA_IMAGES)
19997
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 19101
diff changeset
59 $(AM_V_GEN)if [ "x$(srcdir)" != "x." ]; then \
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
60 $(MKDIR_P) scripts/java/$(org_octave_dir)/images; \
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
61 cp $(srcdir_scripts_java_JAVA_IMAGES) scripts/java/$(org_octave_dir)/images; \
19997
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 19101
diff changeset
62 fi && \
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 touch $@
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
65 if AMCOND_HAVE_JAVA
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
66 scripts/java/octave.jar: scripts/java/images.stamp $(scripts_java_JAVA_CLASSES)
19997
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 19101
diff changeset
67 $(AM_V_GEN)rm -f $@-t $@ && \
20538
fa9fa6ab76f0 eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents: 19997
diff changeset
68 ( cd scripts/java; \
19997
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 19101
diff changeset
69 "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) $(JAVA_IMAGES) ) && \
4f6ae6b94abe make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents: 19101
diff changeset
70 mv $@-t $@
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
71 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72
20553
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
73 scripts_javadir = $(fcnfiledir)/java
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
74
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
75 scripts_java_DATA = \
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
76 $(scripts_java_FCN_FILES) \
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
77 $(scripts_java_JAR_FILES)
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
78
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
79 FCN_FILES += $(scripts_java_FCN_FILES)
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
80
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
81 PKG_ADD_FILES += scripts/java/PKG_ADD
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
82
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20551
diff changeset
83 DIRSTAMP_FILES += scripts/java/$(octave_dirstamp)
20576
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
84
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
85 scripts_EXTRA_DIST += \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
86 $(scripts_java_JAR_FILES) \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
87 $(scripts_java_JAVA_SRC) \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
88 $(scripts_java_JAVA_IMAGES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
89
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
90 scripts_CLEANFILES += \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
91 $(scripts_java_JAR_FILES) \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
92 $(scripts_java_JAVA_CLASSES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
93
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20553
diff changeset
94 scripts_DISTCLEANFILES += scripts/java/images.stamp