From 393d8a851469e311c19806825c07449cd820169b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 23 Nov 2009 20:31:37 +0100
Subject: [PATCH] Use system-wide installed gant, ant and jps

We removed them anyway.
---
 build.xml      | 22 +++++++++++++++-------
 build/gant.xml |  4 ----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index a3ccb87d26..dee0d94224 100644
--- a/build.xml
+++ b/build.xml
@@ -19,15 +19,23 @@
         <jvmarg line="&quot;-Dgant.script=@{script}&quot;"/>
 
         <classpath>
-          <fileset dir="${project.home}/lib/ant/lib">
-            <include name="*.jar"/>
-          </fileset>
-          <pathelement location="${project.home}/build/lib/gant_patches.jar"/>
-          <fileset dir="${gant.home}/lib">
-            <include name="*.jar"/>
-          </fileset>
+          <pathelement location="/usr/share/java/jps/gant_patches.jar"/>
+          <pathelement location="/usr/share/java/gant.jar"/>
+          <pathelement location="/usr/share/java/ant.jar"/>
+          <pathelement location="/usr/share/java/ant-launcher.jar"/>
+          <pathelement location="/usr/share/java/groovy.jar"/>
+          <pathelement location="/usr/share/java/objectweb-asm/asm.jar"/>
+          <pathelement location="/usr/share/java/antlr.jar"/>
+          <pathelement location="/usr/share/java/commons-cli.jar"/>
+          <pathelement location="/usr/share/java/jgoodies-forms.jar"/>
+          <pathelement location="/usr/share/java/jdom.jar"/>
+          <pathelement location="/usr/share/java/objectweb-asm/asm-commons.jar"/>
+          <pathelement location="/usr/share/java/idea/javac2.jar"/>
+          <pathelement location="/usr/share/java/jps/jps.jar"/>
         </classpath>
 
+        <arg value="-d"/>
+        <arg value="-v"/>
         <arg value="-f"/>
         <arg value="${project.home}/build/gant.xml"/>
       </java>
diff --git a/build/gant.xml b/build/gant.xml
index 01c3701618..23122f536d 100644
--- a/build/gant.xml
+++ b/build/gant.xml
@@ -4,10 +4,6 @@
   <property name="gant.home" value="${project.home}/build/lib/gant"/>
 
   <path id="gant.classpath">
-    <pathelement location="${project.home}/build/lib/gant_patches.jar"/>
-    <fileset dir="${gant.home}/lib">
-      <include name="*.jar"/>
-    </fileset>
   </path>
 
   <taskdef name="gant" classname="org.codehaus.gant.ant.Gant">
-- 
2.11.4.GIT