at v192 88 lines 2.7 kB view raw
1From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001 2From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com> 3Date: Tue, 26 Aug 2014 00:07:58 +0200 4Subject: [PATCH] patch 5 6--- 7 build/build.xml | 42 +++++++++++++++++++++--------------------- 8 1 file changed, 21 insertions(+), 21 deletions(-) 9 10diff --git a/build/build.xml b/build/build.xml 11index 4d0f0b2..c3f5c09 100755 12--- a/build/build.xml 13+++ b/build/build.xml 14@@ -640,10 +640,11 @@ 15 value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" /> 16 --> 17 18+ <!-- 19 <get src="http://processing.googlecode.com/files/${jre.file}" 20 dest="linux/jre.tgz" 21 usetimestamp="true" /> 22- 23+ --> 24 <!-- 25 Cannot use ant version of tar because it doesn't preserve properties. 26 <untar compression="gzip" 27@@ -655,39 +656,38 @@ 28 <!-- 29 http://www.gnu.org/software/tar/manual/html_section/transform.html 30 --> 31- <exec executable="tar" dir="linux"> 32+ <!-- <exec executable="tar" dir="linux"> --> 33 <!-- Change directory --> 34 <!-- 35 <arg value="-C" /> 36 <arg value="linux/work" /> 37 <arg value="-xzpf" /> 38 --> 39- <arg value="xfz" /> 40- <arg value="jre.tgz"/> 41- </exec> 42+ <!-- <arg value="xfz" /> --> 43+ <!-- <arg value="jre.tgz"/> --> 44+ <!-- </exec> --> 45 46 <!-- 47 We only want to move when the folder didn't exist before 48 <move file="linux/jre1.7.0_40" tofile="linux/work/java" /> 49 --> 50- <exec executable="rsync" dir="linux"> 51- <arg value="-a" /> 52- <arg value="--delete" /> 53- <arg value="jre1.7.0_40/" /> 54- <arg value="work/java" /> 55- </exec> 56- <delete dir="linux/jre1.7.0_40" /> 57+ <!-- <exec executable="rsync" dir="linux"> --> 58+ <!-- <arg value="-a" /> --> 59+ <!-- <arg value="jre1.7.0_40/" /> --> 60+ <!-- <arg value="work/java" /> --> 61+ <!-- </exec> --> 62+ <!-- <delete dir="linux/jre1.7.0_40" /> --> 63 64 <!-- Remove unused JRE bloat. --> 65- <delete> 66- <fileset refid="javafx-basics" /> 67- <fileset refid="javafx-linux-${sun.arch.data.model}" /> 68- <fileset refid="jre-optional-linux" /> 69- </delete> 70- 71- <copy todir="linux/work/java/lib/fonts"> 72- <fileset dir="shared/lib/fonts" includes="*" /> 73- </copy> 74+ <!-- <delete> --> 75+ <!-- <fileset refid="javafx-basics" /> --> 76+ <!-- <fileset refid="javafx-linux-${sun.arch.data.model}" /> --> 77+ <!-- <fileset refid="jre-optional-linux" /> --> 78+ <!-- </delete> --> 79+ 80+ <!-- <copy todir="linux/work/java/lib/fonts"> --> 81+ <!-- <fileset dir="shared/lib/fonts" includes="*" /> --> 82+ <!-- </copy> --> 83 84 </target> 85 86-- 872.1.0 88