diff options
Diffstat (limited to 'no_jdk_download.patch')
| -rw-r--r-- | no_jdk_download.patch | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/no_jdk_download.patch b/no_jdk_download.patch index a88764082ab7..b5efe69d5c26 100644 --- a/no_jdk_download.patch +++ b/no_jdk_download.patch @@ -1,30 +1,30 @@ ---- build.xml.orig 2022-01-20 09:27:03.184138511 +0100 -+++ build.xml.mod 2022-01-20 09:34:06.541856662 +0100 -@@ -982,7 +982,7 @@ +--- build.xml.orig 2022-01-31 12:44:46.824038995 +0100 ++++ build.xml.patched 2022-01-31 12:47:21.567810435 +0100 +@@ -940,7 +940,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"> +- <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"> -@@ -1048,47 +1048,6 @@ +@@ -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 ----> +- <!-- +- http://www.gnu.org/software/tar/manual/html_section/transform.html +- --> - <exec executable="tar" dir="linux"> - <!-- Change directory --> - <!-- @@ -36,12 +36,10 @@ - <arg value="../${jdk.archive.path}"/> - </exec> - -- <property name="jdk.dir" value="jdk-${jdk.detail}+${jdk.build}/" /> -- - <exec executable="rsync" dir="linux"> - <arg value="-a" /> - <arg value="--delete" /> -- <arg value="${jdk.dir}" /> +- <arg value="${jdk.folder}/" /> - <arg value="work/java/" /> - </exec> - @@ -52,7 +50,7 @@ - - <exec executable="rm"> - <arg value="-r"/> -- <arg line="linux/jdk-${jdk.detail}+${jdk.build}"/> +- <arg line="linux/${jdk.folder}"/> - </exec> </target> |