Author: ludovicc-guest Date: 2009-08-02 22:10:27 +0000 (Sun, 02 Aug 2009) New Revision: 9506
Modified: trunk/groovy/debian/patches/ant-build.diff Log: * Fix classpath for bnd task Modified: trunk/groovy/debian/patches/ant-build.diff =================================================================== --- trunk/groovy/debian/patches/ant-build.diff 2009-08-02 22:09:41 UTC (rev 9505) +++ trunk/groovy/debian/patches/ant-build.diff 2009-08-02 22:10:27 UTC (rev 9506) @@ -1,169 +1,178 @@ --- a/build.xml +++ b/build.xml @@ -28,10 +28,18 @@ - <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-maven.xml"/> - <import file="config/ant/build-checkstyle.xml"/> - <import file="config/ant/build-cobertura.xml"/> -- <import file="config/ant/build-retro.xml"/> -+ <import file="config/ant/build-retro.xml"/--> + <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-maven.xml"/> + <import file="config/ant/build-checkstyle.xml"/> + <import file="config/ant/build-cobertura.xml"/> +- <import file="config/ant/build-retro.xml"/> ++ <import file="config/ant/build-retro.xml"/--> + -+ <path id="compilePath"> -+ <path path="${java.class.path}" /> -+ </path> -+ <path id="toolsPath"> -+ <path path="${java.class.path}" /> -+ </path> - - <condition property="_skipTests_"> - <or> ++ <path id="compilePath"> ++ <path path="${java.class.path}" /> ++ </path> ++ <path id="toolsPath"> ++ <path path="${java.class.path}" /> ++ </path> + + <condition property="_skipTests_"> + <or> @@ -96,7 +104,9 @@ - </copy> - </target> - -- <target name="-init" depends="-fetchDependencies"/> + </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}"/> ++ <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}"/> @@ -455,13 +465,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" + <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" @@ -563,12 +573,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="asm2.jar"/> -+ <include name="asm2-commons.jar"/> -+ <include name="asm2-tree.jar"/> -+ <include name="asm2-xml.jar"/> - </fileset> - </unzip> - <unzip dest="${stagingDirectory}"> + <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="asm2.jar"/> ++ <include name="asm2-commons.jar"/> ++ <include name="asm2-tree.jar"/> ++ <include name="asm2-xml.jar"/> + </fileset> + </unzip> + <unzip dest="${stagingDirectory}"> @@ -588,8 +598,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" /> + <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" /> +@@ -661,7 +671,7 @@ + </target> + + <target name="updateJarsForOsgi"> +- <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> @@ -710,7 +720,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 --> + <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 --> @@ -742,12 +751,12 @@ - </chmod> - </target> - -- <target name="translate" depends="-retroInit" if="_forceRetro_"> -+ <target name="translate" if="_forceRetro_"> - <retroArtifact basedir="${targetDistDirectory}" artifact="groovy"/> - <retroArtifact basedir="${targetDistDirectory}" artifact="groovy-all"/> - </target> - -- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit" -+ <target name="checkstyle" depends="-init,-initializeReports" - description="Create the code style reports."> - <checkAndReport - reportDirectory="${reportsDirectory}/checkstyle" + </chmod> + </target> + +- <target name="translate" depends="-retroInit" if="_forceRetro_"> ++ <target name="translate" if="_forceRetro_"> + <retroArtifact basedir="${targetDistDirectory}" artifact="groovy"/> + <retroArtifact basedir="${targetDistDirectory}" artifact="groovy-all"/> + </target> + +- <target name="checkstyle" depends="-init,-initializeReports,-checkstyleInit" ++ <target name="checkstyle" depends="-init,-initializeReports" + description="Create the code style reports."> + <checkAndReport + reportDirectory="${reportsDirectory}/checkstyle" @@ -799,7 +808,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}" + + <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}" @@ -835,16 +844,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}"/> + </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}"/> @@ -869,7 +877,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}"/> + </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}"/> @@ -893,7 +901,7 @@ - </delete> - </target> - -- <target name="deploy" depends="-mavenDeployInit,install,doc,-deployPlainOnly,-deployPlainAndRetro" -+ <target name="deploy" depends="install,doc,-deployPlainOnly,-deployPlainAndRetro" - description="Deploy jars to maven repository."/> - - <target name="-deployPlainOnly" unless="_forceRetro_"> + </delete> + </target> + +- <target name="deploy" depends="-mavenDeployInit,install,doc,-deployPlainOnly,-deployPlainAndRetro" ++ <target name="deploy" depends="install,doc,-deployPlainOnly,-deployPlainAndRetro" + description="Deploy jars to maven repository."/> + + <target name="-deployPlainOnly" unless="_forceRetro_"> @@ -913,7 +921,7 @@ - <mavenDeploy version="${groovyVersion}" prefix="groovy-all-jdk14"/> - </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"/> + <mavenDeploy version="${groovyVersion}" prefix="groovy-all-jdk14"/> + </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"/> --- a/config/ant/build-setup.xml +++ b/config/ant/build-setup.xml @@ -66,6 +66,7 @@ - <sequential> - <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true"> - <classpath refid="@{classpathref}"/> -+ <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/> - <arg value="@{target}"/> - </java> - </sequential> + <sequential> + <java classname="org.apache.tools.ant.launch.Launcher" fork="true" maxmemory="@{maxmemory}" failonerror="true"> + <classpath refid="@{classpathref}"/> ++ <jvmarg line="-Dant.library.dir=/usr/share/ant/lib"/> + <arg value="@{target}"/> + </java> + </sequential> _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits