Mercurial > octave
annotate scripts/java/module.mk @ 26492:67724e9f6661 stable
build: add custom silent rule tags for jar and javac
* scripts/java/module.mk (OCT_V_JAR, OCT_V_JAVAC): Define and use custom
silent build rule variables for the javac compiler and jar tool.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Mon, 07 Jan 2019 17:51:39 -0800 |
parents | 20c83f619102 |
children | 5701a3716577 |
rev | line source |
---|---|
20328
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19792
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 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
3 %canon_reldir%_FCN_FILES = \ |
23526
dc3745744aef
maint: sort lists of function files
Mike Miller <mtmiller@octave.org>
parents:
23495
diff
changeset
|
4 %reldir%/javaArray.m \ |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
5 %reldir%/java_get.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
6 %reldir%/java_set.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
7 %reldir%/javaaddpath.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
8 %reldir%/javachk.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
9 %reldir%/javaclasspath.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
10 %reldir%/javamem.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
11 %reldir%/javarmpath.m \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
12 %reldir%/usejava.m |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 |
20343
916cc788d906
fix installation of script files
John W. Eaton <jwe@octave.org>
parents:
20341
diff
changeset
|
14 if AMCOND_HAVE_JAVA |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
15 %canon_reldir%_JAR_FILES = %reldir%/octave.jar |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
17 JAR_FILES += $(%canon_reldir%_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 \ |
23526
dc3745744aef
maint: sort lists of function files
Mike Miller <mtmiller@octave.org>
parents:
23495
diff
changeset
|
25 $(org_octave_dir)/Matrix.java \ |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 $(org_octave_dir)/OctClassLoader.java \ |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 $(org_octave_dir)/Octave.java \ |
23526
dc3745744aef
maint: sort lists of function files
Mike Miller <mtmiller@octave.org>
parents:
23495
diff
changeset
|
28 $(org_octave_dir)/OctaveReference.java |
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 JAVA_CLASSES = $(JAVA_SRC:.java=.class) |
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
33 %canon_reldir%_JAVA_SRC = $(addprefix %reldir%/, $(JAVA_SRC)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
35 %canon_reldir%_JAVA_CLASSES = $(addprefix %reldir%/, $(JAVA_CLASSES)) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 |
26492
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
37 OCT_V_JAR = $(oct__v_JAR_$(V)) |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
38 oct__v_JAR_ = $(oct__v_JAR_$(AM_DEFAULT_VERBOSITY)) |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
39 oct__v_JAR_0 = @echo " JAR " $@; |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
40 oct__v_JAR_1 = |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
41 |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
42 OCT_V_JAVAC = $(oct__v_JAVAC_$(V)) |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
43 oct__v_JAVAC_ = $(oct__v_JAVAC_$(AM_DEFAULT_VERBOSITY)) |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
44 oct__v_JAVAC_0 = @echo " JAVAC " $@; |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
45 oct__v_JAVAC_1 = |
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
46 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
47 $(%canon_reldir%_JAVA_CLASSES) : %.class : %.java | %reldir%/$(octave_dirstamp) |
26492
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
48 $(OCT_V_JAVAC)$(MKDIR_P) %reldir%/$(org_octave_dir) && \ |
23929
20c83f619102
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
Mike Miller <mtmiller@octave.org>
parents:
23928
diff
changeset
|
49 ( cd $(srcdir)/scripts/java; \ |
20c83f619102
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
Mike Miller <mtmiller@octave.org>
parents:
23928
diff
changeset
|
50 "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \ |
20c83f619102
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
Mike Miller <mtmiller@octave.org>
parents:
23928
diff
changeset
|
51 -d $(abs_top_builddir)/scripts/java \ |
20c83f619102
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
Mike Miller <mtmiller@octave.org>
parents:
23928
diff
changeset
|
52 $(org_octave_dir)/$(<F) ) |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
54 if AMCOND_HAVE_JAVA |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
55 %reldir%/octave.jar: $(%canon_reldir%_JAVA_CLASSES) |
26492
67724e9f6661
build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents:
23929
diff
changeset
|
56 $(OCT_V_JAR)rm -f $@-t $@ && \ |
20328
fa9fa6ab76f0
eliminate recursive make invocation in scripts directory tree
John W. Eaton <jwe@octave.org>
parents:
19792
diff
changeset
|
57 ( cd scripts/java; \ |
21630
b5d9b95d1e1a
Removing Java dialog boxes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents:
21154
diff
changeset
|
58 "$(JAR)" cf octave.jar-t $(JAVA_CLASSES) ) && \ |
19792
4f6ae6b94abe
make --enable-silent-rules configure option more useful
John W. Eaton <jwe@octave.org>
parents:
18911
diff
changeset
|
59 mv $@-t $@ |
15778
2c6b00c03329
build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents:
15737
diff
changeset
|
60 endif |
15625
acf0addfc610
include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
61 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
62 %canon_reldir%dir = $(fcnfiledir)/java |
20343
916cc788d906
fix installation of script files
John W. Eaton <jwe@octave.org>
parents:
20341
diff
changeset
|
63 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
64 %canon_reldir%_DATA = \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
65 $(%canon_reldir%_FCN_FILES) \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
66 $(%canon_reldir%_JAR_FILES) |
20343
916cc788d906
fix installation of script files
John W. Eaton <jwe@octave.org>
parents:
20341
diff
changeset
|
67 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
68 FCN_FILES += $(%canon_reldir%_FCN_FILES) |
20343
916cc788d906
fix installation of script files
John W. Eaton <jwe@octave.org>
parents:
20341
diff
changeset
|
69 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
70 PKG_ADD_FILES += %reldir%/PKG_ADD |
20343
916cc788d906
fix installation of script files
John W. Eaton <jwe@octave.org>
parents:
20341
diff
changeset
|
71 |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
72 DIRSTAMP_FILES += %reldir%/$(octave_dirstamp) |
20366
9b44691a3520
provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents:
20343
diff
changeset
|
73 |
9b44691a3520
provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents:
20343
diff
changeset
|
74 scripts_EXTRA_DIST += \ |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
75 $(%canon_reldir%_JAVA_SRC) |
20366
9b44691a3520
provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents:
20343
diff
changeset
|
76 |
9b44691a3520
provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents:
20343
diff
changeset
|
77 scripts_CLEANFILES += \ |
23495
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
78 $(%canon_reldir%_JAR_FILES) \ |
8308417aff1c
use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents:
21630
diff
changeset
|
79 $(%canon_reldir%_JAVA_CLASSES) |