blob: 8f6a5e2018e172d3aefd9cba7893d37be389c03c (
plain) (
blame)
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
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Tue, 26 Aug 2014 00:07:58 +0200
Subject: [PATCH] patch
---
build/build.xml | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/build/build.xml b/build/build.xml
index 4d0f0b2..c3f5c09 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -640,10 +640,11 @@
value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" />
-->
+ <!--
<get src="http://processing.googlecode.com/files/${jre.file}"
dest="linux/jre.tgz"
usetimestamp="true" />
-
+ -->
<!--
Cannot use ant version of tar because it doesn't preserve properties.
<untar compression="gzip"
@@ -655,39 +656,38 @@
<!--
http://www.gnu.org/software/tar/manual/html_section/transform.html
-->
- <exec executable="tar" dir="linux">
+ <!-- <exec executable="tar" dir="linux"> -->
<!-- Change directory -->
<!--
<arg value="-C" />
<arg value="linux/work" />
<arg value="-xzpf" />
-->
- <arg value="xfz" />
- <arg value="jre.tgz"/>
- </exec>
+ <!-- <arg value="xfz" /> -->
+ <!-- <arg value="jre.tgz"/> -->
+ <!-- </exec> -->
<!--
We only want to move when the folder didn't exist before
<move file="linux/jre1.7.0_40" tofile="linux/work/java" />
-->
- <exec executable="rsync" dir="linux">
- <arg value="-a" />
- <arg value="--delete" />
- <arg value="jre1.7.0_40/" />
- <arg value="work/java" />
- </exec>
- <delete dir="linux/jre1.7.0_40" />
+ <!-- <exec executable="rsync" dir="linux"> -->
+ <!-- <arg value="-a" /> -->
+ <!-- <arg value="jre1.7.0_40/" /> -->
+ <!-- <arg value="work/java" /> -->
+ <!-- </exec> -->
+ <!-- <delete dir="linux/jre1.7.0_40" /> -->
<!-- Remove unused JRE bloat. -->
- <delete>
- <fileset refid="javafx-basics" />
- <fileset refid="javafx-linux-${sun.arch.data.model}" />
- <fileset refid="jre-optional-linux" />
- </delete>
-
- <copy todir="linux/work/java/lib/fonts">
- <fileset dir="shared/lib/fonts" includes="*" />
- </copy>
+ <!-- <delete> -->
+ <!-- <fileset refid="javafx-basics" /> -->
+ <!-- <fileset refid="javafx-linux-${sun.arch.data.model}" /> -->
+ <!-- <fileset refid="jre-optional-linux" /> -->
+ <!-- </delete> -->
+
+ <!-- <copy todir="linux/work/java/lib/fonts"> -->
+ <!-- <fileset dir="shared/lib/fonts" includes="*" /> -->
+ <!-- </copy> -->
</target>
--
2.1.0
|