summarylogtreecommitdiffstats
path: root/no_jdk_download.patch
blob: 314c954025b28c2335bda6e16bc9b3df87c978f1 (plain)
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
--- a/build/build.xml	2022-01-31 12:44:46.824038995 +0100
+++ b/build/build.xml	2022-01-31 12:47:21.567810435 +0100
@@ -940,7 +940,7 @@
     </if>
   </target>
 
-  <target name="linux-build" depends="revision-check, linux-check-os, jdk-download, subprojects-build, subprojects-build-rpi" description="Build Linux version">
+  <target name="linux-build" depends="revision-check, linux-check-os, subprojects-build, subprojects-build-rpi" description="Build Linux version">
     <mkdir dir="linux/work" />
 
     <copy todir="linux/work" preservelastmodified="true">
@@ -1014,45 +1014,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.archive.path}"/>
-    </exec>
-
-    <exec executable="rsync" dir="linux">
-      <arg value="-a" />
-      <arg value="--delete" />
-      <arg value="${jdk.folder}/" />
-      <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.folder}"/>
-    </exec>
   </target>
 
   <target name="linux-run" depends="linux-build"