mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 06:01:15 +00:00
89 lines
2.6 KiB
Diff
89 lines
2.6 KiB
Diff
|
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
|
||
|
|
|