Mercurial > hg > octave-nkf

annotate scripts/java/module.mk @ 19098:10c38b9e5423 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move java_set.m and java_get.m from scripts/deprecated/module.mk to scripts/java/module.mk. Fixes cset 54ab08d8de55. * scripts/java/module.mk: Add java_get.m and java_set.m. * scripts/deprecated/module.mk: Remove java_get.m and java_set.m.
author Ben Abbott <bpabbott@mac.com>
date Sun, 13 Jul 2014 09:45:00 -0400
parents 7f2395651a1c
children d1c649bd90e9
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 = \
19098
10c38b9e5423 Move java_set.m and java_get.m from scripts/deprecated/module.mk to scripts/java/module.mk.
Ben Abbott <bpabbott@mac.com>
parents: 16512
diff changeset
4 java/java_get.m \
10c38b9e5423 Move java_set.m and java_get.m from scripts/deprecated/module.mk to scripts/java/module.mk.
Ben Abbott <bpabbott@mac.com>
parents: 16512
diff changeset
5 java/java_set.m \
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 java/javaArray.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 java/javaaddpath.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 java/javaclasspath.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 java/javamem.m \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 java/javarmpath.m \
16505
ff061068a66c move dialog files to separate directory
John W. Eaton <jwe@octave.org>
parents: 15836
diff changeset
11 java/usejava.m
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 FCN_FILES += $(java_FCN_FILES)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 PKG_ADD_FILES += java/PKG_ADD
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 DIRSTAMP_FILES += java/$(octave_dirstamp)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
19 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 JAR_FILES += java/octave.jar
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
21 endif
15625
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 org_octave_dir = org/octave
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
25 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 JAVA_SRC = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 $(org_octave_dir)/ClassHelper.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 $(org_octave_dir)/OctClassLoader.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 $(org_octave_dir)/Octave.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 $(org_octave_dir)/OctaveReference.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 $(org_octave_dir)/Matrix.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 $(org_octave_dir)/JDialogBox.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 $(org_octave_dir)/DlgListener.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 $(org_octave_dir)/TeXtranslator.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 $(org_octave_dir)/TeXcode.java
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
36 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 JAVA_IMAGES = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 $(org_octave_dir)/images/question.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 $(org_octave_dir)/images/error.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 $(org_octave_dir)/images/warning.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 $(org_octave_dir)/images/information.png \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 $(org_octave_dir)/images/octave.png
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 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
48
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 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
50
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 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
52
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
53 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
54
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 %.class : %.java
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 $(MKDIR_P) java/$(org_octave_dir)
15836
48a75e6884ec Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15805
diff changeset
57 ( cd $(srcdir)/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) )
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
59 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
60 if [ "x$(srcdir)" != "x." ]; then \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 $(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
62 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
63 fi
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 touch $@
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
66 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 java/octave.jar: java/images.stamp $(java_JAVA_CLASSES)
15836
48a75e6884ec Fix JAVA detection for MSVC and support white space in Java path.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15805
diff changeset
68 ( cd java; "$(JAR)" cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) )
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 mv $@.t $@
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
70 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71
15737
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
72 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
73
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
74 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
75
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
76 DISTCLEANFILES += java/images.stamp
71dfd53ed47a build: Add rules to clean built files in java/scripts directory.
Rik <rik@octave.org>
parents: 15625
diff changeset
77