groovy (1.7.0-4) ant-build.diff

Summary

 build.xml                  |   53 +++++++++++++++++++++++++--------------------
 config/ant/build-setup.xml |    1 
 2 files changed, 31 insertions(+), 23 deletions(-)

    
download this patch

Patch contents

Index: groovy-1.7.0/build.xml
===================================================================
--- groovy-1.7.0.orig/build.xml	2009-12-09 14:14:12.000000000 -0500
+++ groovy-1.7.0/build.xml	2010-02-17 19:01:49.000000000 -0500
@@ -28,10 +28,17 @@
     <property name="ant.requiredVersion" value="1.6.5"/>
 
     <!-- config/ant/build-maven.xml imports config/ant/build-setup.xml where all the paths are defined. -->
-    <import file="config/ant/build-maven.xml"/>
+    <import file="config/ant/build-setup.xml"/>
     <import file="config/ant/build-checkstyle.xml"/>
     <import file="config/ant/build-cobertura.xml"/>
 
+    <path id="compilePath">
+        <path path="${java.class.path}" />
+    </path>
+    <path id="toolsPath">
+        <path path="${java.class.path}" />
+    </path>
+
     <condition property="_skipTests_">
         <or>
             <equals arg1="${test}" arg2="false"/>
@@ -98,7 +105,9 @@
         </copy>
     </target>
 
-    <target name="-init" depends="-fetchDependencies"/>
+    <target name="-init">
+        <xslt in="pom.xml" out="${targetDirectory}/groovy-all.pom" style="config/maven/groovy-all.xsl"/>
+    </target>
 
     <target name="-banner">
         <echo message="Java Runtime Environment version: ${java.version}"/>
@@ -408,13 +417,13 @@
         <fail message="Test failed, not processing further targets."/>
     </target>
 
-    <target name="-coverageInstrument" depends="-initCoverage,-coberturaInit" if="_forceCoverage_">
+    <target name="-coverageInstrument" if="_forceCoverage_">
         <mkdir dir="${instrumentedClassesDirectory}"/>
-        <coberturaInstrument classesDirectory="${mainClassesDirectory}"/>
+        <!--coberturaInstrument classesDirectory="${mainClassesDirectory}"/-->
     </target>
 
     <target name="-coverageReport" depends="-initCoverage" if="_forceCoverage_">
-        <coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/>
+        <!--coberturaReport reportDirectory="${reportsDirectory}/cobertura" sourceDirectory="${mainSourceDirectory}"/-->
     </target>
 
     <target name="-actuallyCreateJars"
@@ -526,12 +535,12 @@
         <delete dir="${stagingDirectory}" quiet="true"/>
         <mkdir dir="${stagingDirectory}"/>
         <unzip dest="${stagingDirectory}">
-            <fileset dir="${runtimeLibDirectory}">
-                <include name="antlr*.jar"/>
-                <include name="asm*.jar"/>
-                <exclude name="asm-attr*.jar"/>
-                <exclude name="asm-util*.jar"/>
-                <exclude name="asm-analysis*.jar"/>
+            <fileset dir="/usr/share/java">
+                <include name="antlr.jar"/>
+                <include name="asm3.jar"/>
+                <include name="asm3-commons.jar"/>
+                <include name="asm3-tree.jar"/>
+                <include name="asm3-xml.jar"/>
             </fileset>
         </unzip>
         <unzip dest="${stagingDirectory}">
@@ -551,8 +560,8 @@
                 <exclude name="META-INF/MANIFEST.MF"/>
             </patternset>
             <globmapper from="META-INF/LICENSE.txt" to="META-INF/CLI-LICENSE.txt"/>
-            <fileset dir="${runtimeLibDirectory}">
-                <include name="commons-cli-*.jar"/>
+            <fileset dir="/usr/share/java">
+                <include name="commons-cli.jar"/>
             </fileset>
         </unzip>
         <makeManifest file="${stagingDirectory}/META-INF/MANIFEST.MF" />
@@ -576,7 +585,7 @@
             description="Build Groovy and create the jarfiles."/>
 
     <target name="updateJarsForOsgi" unless="_skipOsgi_">
-        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="toolsPath"/>
+        <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="/usr/share/java/bnd.jar"/>
         <copy todir="${targetDistDirectory}">
             <fileset dir="config/bnd" includes="groovy*.bnd"/>
             <filterset>
@@ -632,7 +641,6 @@
         <mkdir dir="${installDirectory}/lib"/>
         <copy todir="${installDirectory}/lib">
             <fileset dir="${targetDistDirectory}" includes="groovy-${groovyVersion}.jar"/>
-            <fileset dir="${runtimeLibDirectory}" includes="*.jar"/>
         </copy>
 
         <!-- Install the embeddable bits -->
@@ -664,7 +672,7 @@
         </chmod>
     </target>
 
-    <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit"
+    <target name="checkstyle" depends="-init,-initializeReports"
             description="Create the code style reports.">
         <checkAndReport
                 reportDirectory="${reportsDirectory}/checkstyle"
@@ -716,7 +724,7 @@
 
     <target name="doc" depends="javadoc, groovydoc" description="Create the documentation."/>
 
-   <target name="javadoc" depends="-fetchDependencies,-docInit,-jvm14BuildWarning,ensureGrammars"
+   <target name="javadoc" depends="-docInit,-jvm14BuildWarning,ensureGrammars"
             description="Create the javadoc documentation.">
         <javadoc destdir="${docsDirectory}/api" author="true" version="true"
                  windowtitle="${title}" doctitle="${title}"
@@ -742,16 +750,15 @@
         </copy>
     </target>
 
-    <target name="groovydoc" depends="-fetchDependencies">
+    <target name="groovydoc">
         <path id="groovydocpath">
             <path path="${mainClassesDirectory}"/>
-            <path refid="runtimePath"/>
             <path path="${java.class.path}"/>
         </path>
         <antforked target="realgroovydoc" maxmemory="${groovyDoc_mx}" classpathref="groovydocpath"/>
     </target>
 
-    <target name="realgroovydoc" depends="-fetchDependencies,-docInit,-includeGroovyDocTemplates,docGDK">
+    <target name="realgroovydoc" depends="-docInit,-includeGroovyDocTemplates,docGDK">
         <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc">
             <classpath>
                 <path path="${mainClassesDirectory}"/>
@@ -778,7 +785,7 @@
         </groovydoc>
     </target>
 
-    <target name="docGDK" depends="-fetchDependencies,-compileTools" description="Create the GDK documentation">
+    <target name="docGDK" depends="-compileTools" description="Create the GDK documentation">
         <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes" failonerror="true">
             <classpath>
                 <pathelement path="${toolsClassesDirectory}"/>
@@ -803,13 +810,13 @@
         </delete>
     </target>
 
-    <target name="deploy" depends="-mavenDeployInit,install,doc"
+    <target name="deploy" depends="install,doc"
             description="Deploy jars to maven repository.">
         <mavenDeploy version="${groovyVersion}" prefix="groovy"/>
         <mavenDeploy version="${groovyVersion}" prefix="groovy-all"/>
     </target>
 
-    <target name="installRepo" depends="-mavenInit,install,doc"
+    <target name="installRepo" depends="install,doc"
             description="Deploy artifacts to local maven repository.">
         <mavenInstallRepo version="${groovyVersion}" prefix="groovy"/>
         <mavenInstallRepo version="${groovyVersion}" prefix="groovy-all"/>
Index: groovy-1.7.0/config/ant/build-setup.xml
===================================================================
--- groovy-1.7.0.orig/config/ant/build-setup.xml	2009-12-09 14:14:10.000000000 -0500
+++ groovy-1.7.0/config/ant/build-setup.xml	2010-02-17 19:03:01.000000000 -0500
@@ -67,6 +67,7 @@
             <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true">
                 <classpath refid="@{classpathref}"/>
                 <jvmarg value="-Duser.home=${user.home}" />
+                <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/>
                 <arg value="@{target}"/>
                 <arg value="-DskipFetch=${skipFetch}"/>
                 <arg value="-DruntimeLibDirectory=${runtimeLibDirectory}"/>