Mercurial > octave

annotate scripts/java/module.mk @ 28956:0089f0213384

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mark all core script files as encoded in UTF-8 (bug #49685). * scripts/.oct-config, scripts/audio/.oct-config, scripts/deprecated/.oct-config, scripts/elfun/.oct-config, scripts/general/.oct-config, scripts/geometry/.oct-config, scripts/gui/.oct-config, scripts/help/.oct-config, scripts/image/.oct-config, scripts/io/.oct-config, scripts/java/.oct-config, scripts/linear-algebra/.oct-config, scripts/miscellaneous/.oct-config, scripts/ode/.oct-config, scripts/optimization/.oct-config, scripts/path/.oct-config, scripts/pkg/.oct-config, scripts/plot/appearance/.oct-config, scripts/plot/draw/.oct-config, scripts/plot/util/.oct-config, scripts/polynomial/.oct-config, scripts/prefs/.oct-config, scripts/profiler/.oct-config, scripts/set/.oct-config, scripts/signal/.oct-config, scripts/sparse/.oct-config, scripts/specfun/.oct-config, scripts/special-matrix/.oct-config, scripts/statistics/.oct-config, scripts/strings/.oct-config, scripts/testfun/.oct-config, scripts/tie/.oct-config, scripts/web/.oct-config: Add files with encoding settings to each directory. * scripts/module.mk, scripts/audio/module.mk, scripts/deprecated/module.mk, scripts/elfun/module.mk, scripts/general/module.mk, scripts/geometry/module.mk, scripts/gui/module.mk, scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk, scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk, scripts/ode/module.mk, scripts/optimization/module.mk, scripts/path/module.mk, scripts/pkg/module.mk, scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk, scripts/plot/util/module.mk, scripts/polynomial/module.mk, scripts/prefs/module.mk, scripts/profiler/module.mk, scripts/set/module.mk, scripts/signal/module.mk, scripts/sparse/module.mk, scripts/specfun/module.mk, scripts/special-matrix/module.mk, scripts/statistics/module.mk, scripts/strings/module.mk, scripts/testfun/module.mk, scripts/tie/module.mk, scripts/web/module.mk: Add files with encoding setting to distribution
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 17 Oct 2020 15:49:12 +0200
parents 8f5e625062f3
children 02b97abbc6fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28061
8f5e625062f3 use %reldir% in more places in module.mk files in scripts directory
John W. Eaton <jwe@octave.org>
parents: 27896
diff changeset
1 FCN_FILE_DIRS += %reldir%
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 = \
28956
0089f0213384 Mark all core script files as encoded in UTF-8 (bug #49685).
Markus Mützel <markus.muetzel@gmx.de>
parents: 28061
diff changeset
4 %reldir%/.oct_config \
23526
dc3745744aef maint: sort lists of function files
Mike Miller <mtmiller@octave.org>
parents: 23495
diff changeset
5 %reldir%/javaArray.m \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
6 %reldir%/java_get.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
7 %reldir%/java_set.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
8 %reldir%/javaaddpath.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
9 %reldir%/javachk.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
10 %reldir%/javaclasspath.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
11 %reldir%/javamem.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
12 %reldir%/javarmpath.m \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
13 %reldir%/usejava.m
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
15 if AMCOND_HAVE_JAVA
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
16 %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
17
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
18 JAR_FILES += $(%canon_reldir%_JAR_FILES)
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
19 endif
15625
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 org_octave_dir = org/octave
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
23 if AMCOND_HAVE_JAVA
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 JAVA_SRC = \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 $(org_octave_dir)/ClassHelper.java \
23526
dc3745744aef maint: sort lists of function files
Mike Miller <mtmiller@octave.org>
parents: 23495
diff changeset
26 $(org_octave_dir)/Matrix.java \
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 $(org_octave_dir)/OctClassLoader.java \
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 $(org_octave_dir)/Octave.java \
23526
dc3745744aef maint: sort lists of function files
Mike Miller <mtmiller@octave.org>
parents: 23495
diff changeset
29 $(org_octave_dir)/OctaveReference.java
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
30 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 JAVA_CLASSES = $(JAVA_SRC:.java=.class)
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
34 %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
35
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
36 %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
37
26492
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_$(V))
67724e9f6661 build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents: 23929
diff changeset
39 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
40 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
41 oct__v_JAR_1 =
67724e9f6661 build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents: 23929
diff changeset
42
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_$(V))
67724e9f6661 build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents: 23929
diff changeset
44 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
45 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
46 oct__v_JAVAC_1 =
67724e9f6661 build: add custom silent rule tags for jar and javac
Mike Miller <mtmiller@octave.org>
parents: 23929
diff changeset
47
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
48 $(%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
49 $(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
50 ( cd $(srcdir)/scripts/java; \
27896
5701a3716577 build: compile Java bytecode for Java 8 compatibility (patch #9806)
Mike Miller <mtmiller@octave.org>
parents: 26492
diff changeset
51 "$(JAVAC)" -source 8 -target 8 -Xlint:-options \
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
52 -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
53 $(org_octave_dir)/$(<F) )
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
55 if AMCOND_HAVE_JAVA
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
56 %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
57 $(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
58 ( cd scripts/java; \
21630
b5d9b95d1e1a Removing Java dialog boxes.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 21154
diff changeset
59 "$(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
60 mv $@-t $@
15778
2c6b00c03329 build: Build documentation correctly even without Java installed.
Rik <rik@octave.org>
parents: 15737
diff changeset
61 endif
15625
acf0addfc610 include Octave Forge java package in core Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
63 %canon_reldir%dir = $(fcnfiledir)/java
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
64
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
65 %canon_reldir%_DATA = \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
66 $(%canon_reldir%_FCN_FILES) \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
67 $(%canon_reldir%_JAR_FILES)
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
68
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
69 FCN_FILES += $(%canon_reldir%_FCN_FILES)
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
70
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
71 PKG_ADD_FILES += %reldir%/PKG_ADD
20343
916cc788d906 fix installation of script files
John W. Eaton <jwe@octave.org>
parents: 20341
diff changeset
72
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
73 DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
74
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
75 scripts_EXTRA_DIST += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
76 $(%canon_reldir%_JAVA_SRC)
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
77
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20343
diff changeset
78 scripts_CLEANFILES += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
79 $(%canon_reldir%_JAR_FILES) \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 21630
diff changeset
80 $(%canon_reldir%_JAVA_CLASSES)