1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- build.xml.orig 2021-06-24 22:24:41.619863591 +0200
+++ build.xml 2021-06-24 22:33:17.284859743 +0200
@@ -938,7 +938,7 @@
</if>
</target>
- <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jdk-download, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version">
+ <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version">
<mkdir dir="linux/work" />
<copy todir="linux/work" preservelastmodified="true">
@@ -1025,54 +1025,6 @@
<copy file="linux/processing-pde.xml" todir="linux/work/lib" />
<copy file="linux/appdata.xml" todir="linux/work/lib" />
<copy file="linux/desktop.template" todir="linux/work/lib" />
-
-<!--
- Cannot use ant version of tar because it doesn't preserve properties.
- <untar compression="gzip"
- dest="linux/work"
- src="linux/jdk.tgz"
- overwrite="false"/>
--->
-
-<!--
- http://www.gnu.org/software/tar/manual/html_section/transform.html
--->
- <exec executable="tar" dir="linux">
- <!-- Change directory -->
- <!--
- <arg value="-C" />
- <arg value="linux/work" />
- <arg value="-xzpf" />
- -->
- <arg value="xfz" />
- <arg value="../${jdk.tgz.path}"/>
- </exec>
-
- <property name="jdk.dir" value="jdk-${jdk.esoteric}+${jdk.build}/" />
-
- <exec executable="rsync" dir="linux">
- <arg value="-a" />
- <arg value="--delete" />
- <arg value="${jdk.dir}" />
- <arg value="work/java/" />
- </exec>
-
- <!-- Remove unused JRE bloat. -->
- <delete failonerror="true">
- <fileset refid="jdk-optional-linux" />
- </delete>
-
- <exec executable="rm">
- <arg value="-r"/>
- <arg line="linux/jdk-${jdk.esoteric}+${jdk.build}"/>
- </exec>
-
- <!--
- <exec executable="rm">
- <arg value="-r"/>
- <arg line="${jfx.path.dist}"/>
- </exec>
- -->
</target>
<target name="linux-run" depends="linux-build"
|