File 0001-Make-it-build-against-our-jars.patch of Package gant

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Make-it-build-against-our-jars.patch of Package gant (Revision c7d274c1be86c974dd30620ad04a08b0)

Currently displaying revision c7d274c1be86c974dd30620ad04a08b0 , Show latest

From 3e388bc9d05e19029b673e5b9f8a91034cc830c9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 23 Nov 2009 06:11:11 +0100
Subject: [PATCH] Make it build against our jars

---
 build.xml |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff -up gant-1.8.1/build.xml.build gant-1.8.1/build.xml
--- gant-1.8.1/build.xml.build	2009-10-02 13:19:13.000000000 +0200
+++ gant-1.8.1/build.xml	2009-11-23 23:41:25.896457653 +0100
@@ -105,6 +105,27 @@ Author : Russel Winder <russel.winder@co
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="mavenAntTaskJarPathId"/>
   </target>
 
+  <target name="-initializeFedora">
+    <echo message="Building with Fedora Groovy installation."/>
+    <path id="compileJarSetPathId">
+      <pathelement location="${groovyJar}"/>
+      <pathelement location="${commons-cliJar}"/>
+      <pathelement location="${asm2Jar}"/>
+      <pathelement location="${antlrJar}"/>
+      <pathelement location="${antJar}"/>
+    </path>
+    <path id="testJarSetPathId">
+      <path refid="compileJarSetPathId"/>
+      <pathelement location="${junitJar}"/>
+      <pathelement location="${ant-junitJar}"/>
+      <pathelement location="${ant-launcherJar}"/>
+    </path>
+    <path id="ivyJarPathId">
+      <pathelement location="${ivyJar}"/>
+    </path>
+    <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpathref="compileJarSetPathId" />
+  </target>
+
   <target name="-initializeWithGroovyHome" if="groovyHomeIsSet">
     <echo message="Building with the Groovy installation at $GROOVY_HOME (${environment.GROOVY_HOME})."/>
     <path id="groovyJarPathId">
@@ -190,9 +211,9 @@ Author : Russel Winder <russel.winder@co
     <mkdir dir="${buildTestReportsDirectory}"/>
     
     <echo file="groovyAntTaskTestVersion.properties" message="groovyAntTaskTestVersion = ${groovyVersion}"/>
-    <artifact:dependencies pathId="ivyJarPathId">
+    
     <path id="testClasspathPathId">
       <pathelement location="${buildTestClassesDirectory}"/>
       <path refid="mavenAntTaskJarPathId"/>
@@ -275,7 +296,7 @@ Author : Russel Winder <russel.winder@co
     <echo message="Property installDirectory is not set, so cannot uninstall.  Set installDirectory in file local.build.properties."/>
   </target>
 
-  <target name="-commandLineDependencies" depends="-checkGroovyHome,-initializeWithGroovyHome,-initializeNoGroovyHome"/>
+  <target name="-commandLineDependencies" depends="-initializeFedora"/>
   
   <!--
       The targets usable from the command line.

Places

File 0001-Make-it-build-against-our-jars.patch of Package gant (Revision c7d274c1be86c974dd30620ad04a08b0)

Places