Use system-wide installed gant, ant and jps
authorLubomir Rintel <lkundrak@v3.sk>
Mon, 23 Nov 2009 19:31:37 +0000 (23 20:31 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Sun, 14 Mar 2010 00:20:04 +0000 (14 01:20 +0100)
We removed them anyway.

build.xml
build/gant.xml

index a3ccb87..dee0d94 100644 (file)
--- a/build.xml
+++ b/build.xml
         <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>
index 01c3701..23122f5 100644 (file)
@@ -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">