Skip to content

Commit 8b4c4ef

Browse files
benfrybenfry
committed
set all build.xml files to Java 17; replace a few tabs with spaces
1 parent 19e5ffd commit 8b4c4ef

File tree

10 files changed

+98
-85
lines changed

10 files changed

+98
-85
lines changed

‎build/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@
14931493
<arg line="core -type f -exec rm -rf {} ';'" />
14941494
</exec>
14951495

1496-
<javadoc access="public" author="false" classpath="../core/library/jogl-all.jar:../core/bin:../core/library/gluegen-rt.jar" destdir="javadoc/core" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="11" splitindex="false" use="false" version="false">
1496+
<javadoc access="public" author="false" classpath="../core/library/jogl-all.jar:../core/bin:../core/library/gluegen-rt.jar" destdir="javadoc/core" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="17" splitindex="false" use="false" version="false">
14971497

14981498
<!-- provide links for java.* classes.
14991499
also suppresses the java.lang prefix in the text. -->
@@ -1532,7 +1532,7 @@
15321532
<arg line="everything -type f -exec rm -rf {} ';'" />
15331533
</exec>
15341534

1535-
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/serial/library:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="11" splitindex="false" use="false" version="false" noqualifier="all">
1535+
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/serial/library:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="17" splitindex="false" use="false" version="false" noqualifier="all">
15361536

15371537
<arg value="-notimestamp" />
15381538

@@ -1570,7 +1570,7 @@
15701570
<arg line="libraries -type f -exec rm -rf {} ';'" />
15711571
</exec>
15721572

1573-
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/library/batik.jar:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/serial/library/jssc.jar:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="11" splitindex="false" use="false" version="false" noqualifier="all">
1573+
<javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/library/batik.jar:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/serial/library/jssc.jar:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="17" splitindex="false" use="false" version="false" noqualifier="all">
15741574

15751575
<arg value="-notimestamp" />
15761576

‎build/shared/tools/MovieMaker/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292

9393
<target name="compile" description="Compile sources">
9494
<mkdir dir="bin" />
95-
<javac target="11"
96-
source="11"
95+
<javac target="17"
96+
source="17"
9797
srcdir="src"
9898
destdir="bin"
9999
encoding="UTF-8"

‎core/methods/build.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<target name="compile">
44

55
<mkdir dir="bin" />
6-
<javac source="11"
7-
target="11"
8-
srcdir="src"
6+
<javac source="17"
7+
target="17"
8+
srcdir="src"
99
destdir="bin"
10-
debug="true"
11-
includeantruntime="true"
12-
nowarn="true">
10+
debug="true"
11+
includeantruntime="true"
12+
nowarn="true">
1313

1414
</javac>
1515
</target>
@@ -28,8 +28,8 @@
2828
</copy>
2929

3030
<taskdef name="methods"
31-
classname="PAppletMethods"
32-
classpath="methods.jar" />
31+
classname="PAppletMethods"
32+
classpath="methods.jar" />
3333
<methods dir="demo"/>
3434
</target>
3535

‎java/libraries/dxf/build.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<?xml version="1.0"?>
22
<project name="Processing DXF Library" default="build">
3-
4-
<target name="clean" description="Clean the build directories">
5-
<delete dir="bin" />
6-
<delete file="library/dxf.jar" />
7-
</target>
3+
<property name="core.path" location="../../../core/library/core.jar" />
84

95
<target name="compile" description="Compile sources">
106
<condition property="core-built">
11-
<available file="../../../core/library/core.jar" />
7+
<available file="${core.path}" />
128
</condition>
13-
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
9+
<fail unless="core-built" message="Please build the core library first and make sure it sits in ${core.path}" />
1410

1511
<mkdir dir="bin" />
16-
<javac source="11"
17-
target="11"
18-
srcdir="src" destdir="bin"
19-
encoding="UTF-8"
20-
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar"
22-
nowarn="true">
12+
<javac source="17"
13+
target="17"
14+
srcdir="src" destdir="bin"
15+
encoding="UTF-8"
16+
includeAntRuntime="false"
17+
classpath="${core.path}"
18+
nowarn="true">
2319
</javac>
2420
</target>
2521

2622
<target name="build" depends="compile" description="Build DXF library">
2723
<jar basedir="bin" destfile="library/dxf.jar" />
2824
</target>
25+
26+
<target name="clean" description="Clean the build directories">
27+
<delete dir="bin" />
28+
<delete file="library/dxf.jar" />
29+
</target>
2930
</project>

‎java/libraries/io/build.xml‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0"?>
22
<project name="Processing Hardware I/O Library" default="build">
33

4-
<target name="clean" description="Clean the build directories">
5-
<delete dir="bin" />
6-
<delete file="library/io.jar" />
7-
</target>
8-
94
<property name="core.path" location="../../../core/library/core.jar" />
105

116
<target name="compile" description="Compile sources">
@@ -15,13 +10,13 @@
1510
<fail unless="core-built" message="Please build the core library first and make sure it is located at ${core.path}" />
1611

1712
<mkdir dir="bin" />
18-
<javac source="11"
19-
target="11"
20-
srcdir="src" destdir="bin"
21-
encoding="UTF-8"
22-
includeAntRuntime="false"
23-
classpath="${core.path}"
24-
nowarn="true" />
13+
<javac source="17"
14+
target="17"
15+
srcdir="src" destdir="bin"
16+
encoding="UTF-8"
17+
includeAntRuntime="false"
18+
classpath="${core.path}"
19+
nowarn="true" />
2520
</target>
2621

2722
<target name="build" depends="compile" description="Build I/O library">
@@ -40,9 +35,17 @@
4035
</tokenfilter>
4136
</filterchain>
4237
</loadfile>
43-
<replaceregexp file="library.properties" match="version = .*" replace="version = ${revision}" flags="g" />
44-
<replaceregexp file="library.properties" match="prettyVersion = .*" replace="prettyVersion = ${revision}" flags="g" />
4538

39+
<replaceregexp file="library.properties"
40+
match="version = .*"
41+
replace="version = ${revision}"
42+
flags="g" />
43+
<replaceregexp file="library.properties"
44+
match="prettyVersion = .*"
45+
replace="prettyVersion = ${revision}"
46+
flags="g" />
47+
48+
<!-- TODO this is the old reference! needs an update [fry 230120] -->
4649
<get src="http://download.processing.org/reference.zip"
4750
dest="reference.zip"
4851
usetimestamp="true" />
@@ -69,4 +72,9 @@
6972
<copy file="library.properties"
7073
toFile="../io.txt"/>
7174
</target>
75+
76+
<target name="clean" description="Clean the build directories">
77+
<delete dir="bin" />
78+
<delete file="library/io.jar" />
79+
</target>
7280
</project>

‎java/libraries/net/build.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<?xml version="1.0"?>
22
<project name="Processing Net Library" default="build">
3-
4-
<target name="clean" description="Clean the build directories">
5-
<delete dir="bin" />
6-
<delete file="library/net.jar" />
7-
</target>
3+
<property name="core.path" location="../../../core/library/core.jar" />
84

95
<target name="compile" description="Compile sources">
106
<condition property="core-built">
11-
<available file="../../../core/library/core.jar" />
7+
<available file="${core.path}" />
128
</condition>
13-
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
9+
<fail unless="core-built" message="Please build the core library first and make sure it sits in ${core.path}" />
1410

1511
<mkdir dir="bin" />
16-
<javac source="11"
17-
target="11"
18-
srcdir="src" destdir="bin"
19-
encoding="UTF-8"
20-
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar"
22-
nowarn="true">
12+
<javac source="17"
13+
target="17"
14+
srcdir="src" destdir="bin"
15+
encoding="UTF-8"
16+
includeAntRuntime="false"
17+
classpath="${core.path}"
18+
nowarn="true">
2319
</javac>
2420
</target>
2521

2622
<target name="build" depends="compile" description="Build net library">
2723
<jar basedir="bin" destfile="library/net.jar" />
2824
</target>
25+
26+
<target name="clean" description="Clean the build directories">
27+
<delete dir="bin" />
28+
<delete file="library/net.jar" />
29+
</target>
2930
</project>

‎java/libraries/pdf/build.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<?xml version="1.0"?>
22
<project name="Processing PDF Library" default="build">
3-
4-
<target name="clean" description="Clean the build directories">
5-
<delete dir="bin" />
6-
<delete file="library/pdf.jar" />
7-
</target>
3+
<property name="core.path" location="../../../core/library/core.jar" />
84

95
<target name="compile" description="Compile sources">
106
<condition property="core-built">
11-
<available file="../../../core/library/core.jar" />
7+
<available file="${core.path}" />
128
</condition>
13-
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
9+
<fail unless="core-built" message="Please build the core library first and make sure it sits in ${core.path}" />
1410

1511
<mkdir dir="bin" />
16-
<javac source="11"
17-
target="11"
18-
srcdir="src" destdir="bin"
19-
encoding="UTF-8"
20-
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar; library/itext.jar"
22-
nowarn="true">
12+
<javac source="17"
13+
target="17"
14+
srcdir="src" destdir="bin"
15+
encoding="UTF-8"
16+
includeAntRuntime="false"
17+
classpath="${core.path}; library/itext.jar"
18+
nowarn="true">
2319
</javac>
2420
</target>
2521

2622
<target name="build" depends="compile" description="Build PDF library">
2723
<jar basedir="bin" destfile="library/pdf.jar" />
2824
</target>
25+
26+
<target name="clean" description="Clean the build directories">
27+
<delete dir="bin" />
28+
<delete file="library/pdf.jar" />
29+
</target>
2930
</project>

‎java/libraries/serial/build.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<?xml version="1.0"?>
22
<project name="Processing Serial Library" default="build">
3-
4-
<target name="clean" description="Clean the build directories">
5-
<delete dir="bin" />
6-
<delete file="library/serial.jar" />
7-
</target>
3+
<property name="core.path" location="../../../core/library/core.jar" />
84

95
<target name="compile" description="Compile sources">
106
<condition property="core-built">
11-
<available file="../../../core/library/core.jar" />
7+
<available file="${core.path}" />
128
</condition>
13-
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />
9+
<fail unless="core-built" message="Please build the core library first and make sure it sits in ${core.path}" />
1410

1511
<mkdir dir="bin" />
16-
<javac source="11"
17-
target="11"
18-
srcdir="src" destdir="bin"
19-
encoding="UTF-8"
20-
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar; library/jssc.jar"
22-
nowarn="true">
12+
<javac source="17"
13+
target="17"
14+
srcdir="src" destdir="bin"
15+
encoding="UTF-8"
16+
includeAntRuntime="false"
17+
classpath="${core.path}; library/jssc.jar"
18+
nowarn="true">
2319
</javac>
2420
</target>
2521

2622
<target name="build" depends="compile" description="Build serial library">
2723
<jar basedir="bin" destfile="library/serial.jar" />
2824
</target>
25+
26+
<target name="clean" description="Clean the build directories">
27+
<delete dir="bin" />
28+
<delete file="library/serial.jar" />
29+
</target>
2930
</project>

‎java/libraries/svg/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<fail unless="core-built" message="Please build the core library first and make sure it is located at ${core.library.jar}" />
6161

6262
<mkdir dir="bin" />
63-
<javac source="11" target="11"
63+
<javac source="17" target="17"
6464
srcdir="src" destdir="bin"
6565
encoding="UTF-8"
6666
includeAntRuntime="false"

‎todo.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
1291 (4.1.3 or 4.2)
22
X preferences.txt is not saved when closing Processing under certain circumstances
33
X https://github.com/processing/processing4/issues/608
4+
X set all build.xml files to use Java 17
5+
X also fix several that still had tabs instead of spaces
46

57
manager
68
X add 'exports' to the library parameters
@@ -27,7 +29,6 @@ _ point to binaries in /Applications/Processing.app? (no)
2729
_ add a protocol handler for pdex and pdez
2830
_ https://github.com/processing/processing4/issues/559
2931

30-
_ set more build.xml files to use Java 17
3132

3233

3334
known issues

0 commit comments

Comments
 (0)