From 9f3d482f113a15aa7fd0564313aed38ea6948089 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak@v3.sk> Date: Mon, 23 Nov 2009 20:31:37 +0100 Subject: [PATCH 10/15] Use system-wide installed gant, ant and jps We removed them anyway. --- build.xml | 20 +++++++++++++------- build/gant.xml | 4 ---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build.xml b/build.xml index a3ccb87..68e0e7c 100644 --- a/build.xml +++ b/build.xml @@ -19,13 +19,19 @@ <jvmarg line=""-Dgant.script=@{script}""/> <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="-f"/> diff --git a/build/gant.xml b/build/gant.xml index 01c3701..23122f5 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"> -- 1.7.0.1