Author: ludovicc-guest Date: 2009-08-02 13:00:18 +0000 (Sun, 02 Aug 2009) New Revision: 9452
Added: trunk/groovy/debian/README.source trunk/groovy/debian/grape.1 trunk/groovy/debian/groovy-doc.doc-base.1 trunk/groovy/debian/groovy-doc.doc-base.2 trunk/groovy/debian/groovy-doc.doc-base.3 trunk/groovy/debian/groovy.poms trunk/groovy/debian/maven.publishedRules trunk/groovy/debian/maven.rules trunk/groovy/debian/patches/ant-build.diff Removed: trunk/groovy/debian/ant.properties trunk/groovy/debian/build.xml trunk/groovy/debian/groovy-doc.doc-base trunk/groovy/debian/javadoc-stylesheet.css trunk/groovy/debian/patches/build.diff Modified: trunk/groovy/debian/README.Debian trunk/groovy/debian/changelog trunk/groovy/debian/control trunk/groovy/debian/groovy-doc.docs trunk/groovy/debian/groovy.install trunk/groovy/debian/groovy.links trunk/groovy/debian/groovy.manpages trunk/groovy/debian/patches/series trunk/groovy/debian/rules Log: * Change the section to java * Update the build to use most of the original ant build script * Remove build.diff patch as it is not useful anymore. * Use BND to add the OSGi metadata to the jar. * Add bnd, libqdox-java, libjarjar-java to Build-Depends * Link ivy.jar into the Groovy lib folder (Closes: #526472) * Add Build-Depends on maven-repo-helper * Deploy groovy jars into the Maven repository * Add embeddable jar groovy-all.jar * Add the Groovy documentation (gapi) and the Groovy changes to the JDK (groovy-jdk) specification. * Move the classloader configuration to /etc/groovy. * Bump Standards-Version to 3.8.2: - Add a README.source to describe patch system - move API documentation to /usr/share/doc/groovy/api Modified: trunk/groovy/debian/README.Debian =================================================================== --- trunk/groovy/debian/README.Debian 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/README.Debian 2009-08-02 13:00:18 UTC (rev 9452) @@ -77,3 +77,12 @@ improvements, patches, etc. Thanks for using this package. -- Marcus Crafter <[email protected]>, Sat, 18 Dec 2004 22:45:06 +0100 + +Groovy's build is now using Ant and compatible with Maven 2. +I have patched the Ant build to work with Debian, and I'm deploying +Groovy's jars into the Maven 2 repository for Debian in /usr/share/maven-repo + +Documentation is now completely generated from the code, using the Ant build script. + + -- Ludovic Claude <[email protected]> Fri, 17 Jul 2009 00:33:18 +0100 + Added: trunk/groovy/debian/README.source =================================================================== --- trunk/groovy/debian/README.source (rev 0) +++ trunk/groovy/debian/README.source 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,9 @@ +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + Deleted: trunk/groovy/debian/ant.properties =================================================================== --- trunk/groovy/debian/ant.properties 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/ant.properties 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,5 +0,0 @@ -class.dir=target/classes -source.dir=src/main -jar.name=target/groovy.jar -javadoc.dir=target/docs/api -asm2.jar=/usr/share/java/asm2.jar Deleted: trunk/groovy/debian/build.xml =================================================================== --- trunk/groovy/debian/build.xml 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/build.xml 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="${project.name}" basedir=".."> - - <patternset id="compiler.resources"> - <include name="**/?*.properties" /> - <include name="**/?*.xml" /> - <include name="**/?*.png" /> - <include name="**/?*.html" /> - </patternset> - - <target name="clean"> - <delete dir="${class.dir}" quiet="true"/> - <delete file="${jar.name}" quiet="true"/> - </target> - - <target name="compile" description="o Compile the code"> - <mkdir dir="${class.dir}"/> - - <javac srcdir="${source.dir}" destdir="${class.dir}" - source="1.5" target="1.5" debug="true" optimize="false"> - <exclude name="groovy/ui/**/*.java"/> - </javac> - - <taskdef name="groovyc" - classname="org.codehaus.groovy.ant.Groovyc" - classpath="${class.dir}"/> - - <groovyc srcdir="${source.dir}/groovy/ui/text/" destdir="${class.dir}"/> - - <javac srcdir="${source.dir}" destdir="${class.dir}" - source="1.5" target="1.5" debug="true" optimize="false"> - <include name="groovy/ui/**/*.java"/> - </javac> - - <groovyc srcdir="${source.dir}" destdir="${class.dir}"/> - - <java classname="org.codehaus.groovy.tools.DgmConverter" - classpath="${asm2.jar}:${class.dir}"/> - - <copy todir="${class.dir}"> - <fileset dir="${source.dir}"> - <patternset refid="compiler.resources" /> - </fileset> - </copy> - </target> - - <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${jar.name}" excludes="**/package.html, **/*.groovy" - basedir="${class.dir}" /> - </target> - - <target name="javadoc" description="o Generate javadoc"> - <mkdir dir="${javadoc.dir}"/> - <javadoc use="true" private="true" destdir="${javadoc.dir}" - author="true" version="true" sourcepath="${source.dir}" - stylesheetfile="debian/javadoc-stylesheet.css" - packagenames="groovy.*,org.codehaus.groovy.*"> - <doctitle><![CDATA[<h1>groovy ${version} API</h1>]]></doctitle> - <bottom><![CDATA[Copyright © ${year} The Codehaus. All Rights Reserved.]]></bottom> - </javadoc> - </target> - -</project> Modified: trunk/groovy/debian/changelog =================================================================== --- trunk/groovy/debian/changelog 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/changelog 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,3 +1,23 @@ +groovy (1.6.3-2) experimental; urgency=low + + * Change the section to java + * Update the build to use most of the original ant build script + * Remove build.diff patch as it is not useful anymore. + * Use BND to add the OSGi metadata to the jar. + * Add bnd, libqdox-java, libjarjar-java to Build-Depends + * Link ivy.jar into the Groovy lib folder (Closes: #526472) + * Add Build-Depends on maven-repo-helper + * Deploy groovy jars into the Maven repository + * Add embeddable jar groovy-all.jar + * Add the Groovy documentation (gapi) and the Groovy changes + to the JDK (groovy-jdk) specification. + * Move the classloader configuration to /etc/groovy. + * Bump Standards-Version to 3.8.2: + - Add a README.source to describe patch system + - move API documentation to /usr/share/doc/groovy/api + + -- Ludovic Claude <[email protected]> Fri, 17 Jul 2009 00:33:18 +0100 + groovy (1.6.3-1) unstable; urgency=low * New upstream release Modified: trunk/groovy/debian/control =================================================================== --- trunk/groovy/debian/control 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/control 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,15 +1,15 @@ Source: groovy -Section: devel +Section: java Priority: optional Maintainer: Debian Java maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected]> Build-Depends: debhelper (>= 6), cdbs, quilt -Build-Depends-Indep: ant-optional, openjdk-6-jdk, bzip2, libasm2-java, +Build-Depends-Indep: maven-repo-helper, ant-optional, openjdk-6-jdk, bzip2, libasm2-java, libbsf-java, libcommons-cli-java (>= 1.0), libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>= 1.2), libservlet2.4-java, libxstream-java, libjline-java, antlr, - tofrodos, ivy -Standards-Version: 3.8.1 + tofrodos, ivy, bnd, libqdox-java, libjarjar-java +Standards-Version: 3.8.2 Homepage: http://groovy.codehaus.org/ Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/groovy/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/groovy/ Added: trunk/groovy/debian/grape.1 =================================================================== --- trunk/groovy/debian/grape.1 (rev 0) +++ trunk/groovy/debian/grape.1 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,53 @@ +.TH grape "20" "July 2009" +.SH NAME +grape \- inspection and management of the local grape cache used by Groovy +.SH DESCRIPTION +usage: grape [options] <command> [args] +options: +.TP +\fB\-D\fR,\-\-define <name=value> +define a system property +.TP +\fB\-d\fR,\-\-debug +debug log level 4 will print out full stack traces +.TP +\fB\-h\fR,\-\-help +usage information +.TP +\fB\-i\fR,\-\-info +info log level 2 will print out information +.TP +\fB\-q\fR,\-\-quiet +quiet log level 0 will print only errors +.TP +\fB\-v\fR,\-\-version +display the Groovy and JVM versions +.TP +\fB\-V\fR,\-\-verbose +verbose log level 3 will print verbose logs +.TP +\fB\-w\fR,\-\-warn +warn log level 1 will print only errors and warnings +.SH COMMANDS +.TP +\fBinstall\fR <groupId> <artifactId> [<version>]: +This installs the specified groovy module or maven artifact. +If a version is specified that specific version will be installed, +otherwise the most recent version will be used (as if '*' we passed in). +.TP +\fBlist\fR: +Lists locally installed modules (with their full maven name in the case of +groovy modules) and versions. +.TP +\fBresolve\fR (<groupId> <artifactId> <version>)+: +This returns the file locations of the jars representing the artifcats for +the specified module(s) and the respective transitive dependencies. +You may optionally pass in -ant, -dos, or -shell to get the dependencies +expressed in a format applicable for an ant script, windows batch file, or +unix shell script respectively. +.SH "SEE ALSO" +.BR groovy (1) +.SH AUTHOR +This manual page was generated using help2man and edited by Ludovic +Claude <[email protected]>, for the Debian project (but may +be used by others). Deleted: trunk/groovy/debian/groovy-doc.doc-base =================================================================== --- trunk/groovy/debian/groovy-doc.doc-base 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/groovy-doc.doc-base 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,9 +0,0 @@ -Document: groovy-doc -Title: Groovy API Documentation -Author: Groovy Development Team ([email protected]) -Abstract: This manual is the Groovy API documemtation. This is the Groovy API extensions added to default Java types. -Section: Programming - -Format: HTML -Index: /usr/share/doc/groovy-doc/api/index.html -Files: /usr/share/doc/groovy-doc/api/* Added: trunk/groovy/debian/groovy-doc.doc-base.1 =================================================================== --- trunk/groovy/debian/groovy-doc.doc-base.1 (rev 0) +++ trunk/groovy/debian/groovy-doc.doc-base.1 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,11 @@ +Document: groovy-doc1 +Title: Java API Documentation for Groovy +Author: Groovy Development Team ([email protected]) +Abstract: This manual is the Java API documentation for Groovy. + It contains the Groovy API extensions added to default Java types + and the Groovy runtime. +Section: Programming + +Format: HTML +Index: /usr/share/doc/groovy/api/index.html +Files: /usr/share/doc/groovy/api/* Added: trunk/groovy/debian/groovy-doc.doc-base.2 =================================================================== --- trunk/groovy/debian/groovy-doc.doc-base.2 (rev 0) +++ trunk/groovy/debian/groovy-doc.doc-base.2 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,9 @@ +Document: groovy-doc2 +Title: Groovy API Documentation for Groovy developers +Author: Groovy Development Team ([email protected]) +Abstract: This manual is the Groovy API documentation for Groovy developers. +Section: Programming + +Format: HTML +Index: /usr/share/doc/groovy-doc/gapi/index.html +Files: /usr/share/doc/groovy-doc/gapi/* Added: trunk/groovy/debian/groovy-doc.doc-base.3 =================================================================== --- trunk/groovy/debian/groovy-doc.doc-base.3 (rev 0) +++ trunk/groovy/debian/groovy-doc.doc-base.3 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,9 @@ +Document: groovy-doc3 +Title: Groovy JDK API Specification +Author: Groovy Development Team ([email protected]) +Abstract: This document describes the methods added to the JDK to make it more groovy. +Section: Programming + +Format: HTML +Index: /usr/share/doc/groovy-doc/groovy-jdk/index.html +Files: /usr/share/doc/groovy-doc/groovy-jdk/* Modified: trunk/groovy/debian/groovy-doc.docs =================================================================== --- trunk/groovy/debian/groovy-doc.docs 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/groovy-doc.docs 2009-08-02 13:00:18 UTC (rev 9452) @@ -1 +1,2 @@ -target/docs/api +target/html/gapi +target/html/groovy-jdk Modified: trunk/groovy/debian/groovy.install =================================================================== --- trunk/groovy/debian/groovy.install 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/groovy.install 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,7 +1,9 @@ -src/bin/groovy /usr/share/groovy/bin/ -src/bin/groovyConsole /usr/share/groovy/bin/ -src/bin/groovyc /usr/share/groovy/bin/ -src/bin/groovysh /usr/share/groovy/bin/ -src/bin/java2groovy /usr/share/groovy/bin/ -src/bin/startGroovy /usr/share/groovy/bin/ -src/conf/* /usr/share/groovy/conf/ +target/install/bin/grape /usr/share/groovy/bin/ +target/install/bin/groovy /usr/share/groovy/bin/ +target/install/bin/groovyConsole /usr/share/groovy/bin/ +target/install/bin/groovyc /usr/share/groovy/bin/ +target/install/bin/groovysh /usr/share/groovy/bin/ +target/install/bin/java2groovy /usr/share/groovy/bin/ +target/install/bin/startGroovy /usr/share/groovy/bin/ +target/install/conf/* /etc/groovy + Modified: trunk/groovy/debian/groovy.links =================================================================== --- trunk/groovy/debian/groovy.links 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/groovy.links 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,29 +1,32 @@ -/usr/share/groovy/bin/groovy /usr/bin/groovy -/usr/share/groovy/bin/groovyc /usr/bin/groovyc -/usr/share/groovy/bin/groovyConsole /usr/bin/groovyConsole -/usr/share/groovy/bin/groovysh /usr/bin/groovysh -/usr/share/groovy/bin/java2groovy /usr/bin/java2groovy -/usr/share/groovy/bin/startGroovy /usr/bin/startGroovy -/usr/share/java/ant.jar /usr/share/groovy/lib/ant.jar -/usr/share/java/ant-junit.jar /usr/share/groovy/lib/ant-junit.jar -/usr/share/java/ant-launcher.jar /usr/share/groovy/lib/ant-launcher.jar -/usr/share/java/antlr.jar /usr/share/groovy/lib/antlr.jar -/usr/share/java/asm2.jar /usr/share/groovy/lib/asm2.jar -/usr/share/java/asm2-analysis.jar /usr/share/groovy/lib/asm2-analysis.jar -/usr/share/java/asm2-tree.jar /usr/share/groovy/lib/asm2-tree.jar -/usr/share/java/asm2-util.jar /usr/share/groovy/lib/asm2-util.jar -/usr/share/java/bsf.jar /usr/share/groovy/lib/bsf.jar -/usr/share/java/commons-cli.jar /usr/share/groovy/lib/commons-cli.jar -/usr/share/java/commons-logging.jar /usr/share/groovy/lib/commons-logging.jar -/usr/share/java/jline.jar /usr/share/groovy/lib/jline.jar -/usr/share/java/junit4.jar /usr/share/groovy/lib/junit4.jar -/usr/share/java/jsp-api.jar /usr/share/groovy/lib/jsp-api.jar -/usr/share/java/mockobjects-core.jar /usr/share/groovy/lib/mockobjects-core.jar -/usr/share/java/regexp.jar /usr/share/groovy/lib/regexp.jar -/usr/share/java/servlet-api.jar /usr/share/groovy/lib/servlet-api.jar -/usr/share/java/xstream.jar /usr/share/groovy/lib/xstream.jar -/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/startGroovy.1.gz -/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/groovysh.1.gz -/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/java2groovy.1.gz -/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/groovyConsole.1.gz +/usr/share/groovy/bin/grape /usr/bin/grape +/usr/share/groovy/bin/groovy /usr/bin/groovy +/usr/share/groovy/bin/groovyc /usr/bin/groovyc +/usr/share/groovy/bin/groovyConsole /usr/bin/groovyConsole +/usr/share/groovy/bin/groovysh /usr/bin/groovysh +/usr/share/groovy/bin/java2groovy /usr/bin/java2groovy +/usr/share/groovy/bin/startGroovy /usr/bin/startGroovy +/usr/share/java/ant.jar /usr/share/groovy/lib/ant.jar +/usr/share/java/ant-junit.jar /usr/share/groovy/lib/ant-junit.jar +/usr/share/java/ant-launcher.jar /usr/share/groovy/lib/ant-launcher.jar +/usr/share/java/antlr.jar /usr/share/groovy/lib/antlr.jar +/usr/share/java/asm2.jar /usr/share/groovy/lib/asm2.jar +/usr/share/java/asm2-analysis.jar /usr/share/groovy/lib/asm2-analysis.jar +/usr/share/java/asm2-tree.jar /usr/share/groovy/lib/asm2-tree.jar +/usr/share/java/asm2-util.jar /usr/share/groovy/lib/asm2-util.jar +/usr/share/java/bsf.jar /usr/share/groovy/lib/bsf.jar +/usr/share/java/commons-cli.jar /usr/share/groovy/lib/commons-cli.jar +/usr/share/java/commons-logging.jar /usr/share/groovy/lib/commons-logging.jar +/usr/share/java/ivy.jar /usr/share/groovy/lib/ivy.jar +/usr/share/java/jline.jar /usr/share/groovy/lib/jline.jar +/usr/share/java/junit4.jar /usr/share/groovy/lib/junit4.jar +/usr/share/java/jsp-api.jar /usr/share/groovy/lib/jsp-api.jar +/usr/share/java/mockobjects-core.jar /usr/share/groovy/lib/mockobjects-core.jar +/usr/share/java/regexp.jar /usr/share/groovy/lib/regexp.jar +/usr/share/java/servlet-api.jar /usr/share/groovy/lib/servlet-api.jar +/usr/share/java/xstream.jar /usr/share/groovy/lib/xstream.jar +/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/startGroovy.1.gz +/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/groovysh.1.gz +/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/java2groovy.1.gz +/usr/share/man/man1/groovy.1.gz /usr/share/man/man1/groovyConsole.1.gz +/etc/groovy /usr/share/groovy/conf Modified: trunk/groovy/debian/groovy.manpages =================================================================== --- trunk/groovy/debian/groovy.manpages 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/groovy.manpages 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,2 +1,3 @@ +debian/grape.1 debian/groovy.1 debian/groovyc.1 Added: trunk/groovy/debian/groovy.poms =================================================================== --- trunk/groovy/debian/groovy.poms (rev 0) +++ trunk/groovy/debian/groovy.poms 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,3 @@ +pom.xml +target/groovy-all.pom + Deleted: trunk/groovy/debian/javadoc-stylesheet.css =================================================================== --- trunk/groovy/debian/javadoc-stylesheet.css 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/javadoc-stylesheet.css 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,45 +0,0 @@ -/* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { background-color: #FFFFFF } - -a:link, a:visited { - color: blue; - } - -a:active, a:hover, #leftcol a:active, #leftcol a:hover { - color: #f30 !important; - } - -a:link.selfref, a:visited.selfref { - color: #555 !important; - } - -.a td { - background: #ddd; - color: #000; - } - -/* Table colors */ -.TableHeadingColor { background: #036; color:#FFFFFF } /* Dark blue */ -.TableSubHeadingColor { background: #bbb; color:#fff } /* Dark grey */ -.TableRowColor { background: #efefef } /* White */ - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: normal; font-family: normal; color:#000000 } -.FrameHeadingFont { font-size: normal; font-family: normal; color:#000000 } -.FrameItemFont { font-size: normal; font-family: normal; color:#000000 } - -/* Example of smaller, sans-serif font in frames */ -/* .FrameItemFont { font-size: 10pt; font-family: Helvetica, Arial, sans-serif } */ - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#ddd;}/* Light mauve */ -.NavBarCell1Rev { background-color:#888;}/* Dark Blue */ -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;} Added: trunk/groovy/debian/maven.publishedRules =================================================================== --- trunk/groovy/debian/maven.publishedRules (rev 0) +++ trunk/groovy/debian/maven.publishedRules 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,3 @@ +s/groovy/org.codehaus.groovy/ groovy* + + Added: trunk/groovy/debian/maven.rules =================================================================== --- trunk/groovy/debian/maven.rules (rev 0) +++ trunk/groovy/debian/maven.rules 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,6 @@ +asm asm* jar s/2\..*/2.x/ +antlr antlr jar s/2\..*/2.x/ +junit junit jar s/3\..*/3.x/ +javax.servlet servlet-api jar * +s/javax.servlet/javax.servlet.jsp/ jsp-api jar * + Added: trunk/groovy/debian/patches/ant-build.diff =================================================================== --- trunk/groovy/debian/patches/ant-build.diff (rev 0) +++ trunk/groovy/debian/patches/ant-build.diff 2009-08-02 13:00:18 UTC (rev 9452) @@ -0,0 +1,169 @@ +--- 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"/--> ++ ++ <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"/> ++ <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}"/> +@@ -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" +@@ -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}"> +@@ -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" /> +@@ -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 --> +@@ -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" +@@ -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}" +@@ -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}"/> +@@ -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}"/> +@@ -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_"> +@@ -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"/> +--- 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> Deleted: trunk/groovy/debian/patches/build.diff =================================================================== --- trunk/groovy/debian/patches/build.diff 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/patches/build.diff 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,13 +0,0 @@ -Index: groovy-1.6.3/src/main/org/codehaus/groovy/ant/Groovy.java -=================================================================== ---- groovy-1.6.3.orig/src/main/org/codehaus/groovy/ant/Groovy.java 2009-05-13 22:29:38.000000000 +0200 -+++ groovy-1.6.3/src/main/org/codehaus/groovy/ant/Groovy.java 2009-05-19 21:57:33.000000000 +0200 -@@ -510,7 +510,7 @@ - private void createNewArgs(String txt) throws IOException { - final String[] args = cmdline.getCommandline(); - // Temporary file - delete on exit, create (assured unique name). -- final File tempFile = FileUtils.getFileUtils().createTempFile(PREFIX, SUFFIX, null, true, true); -+ final File tempFile = FileUtils.getFileUtils().createTempFile(PREFIX, SUFFIX, null, true); - final String[] commandline = new String[args.length + 1]; - DefaultGroovyMethods.write(tempFile, txt); - commandline[0] = tempFile.getCanonicalPath(); Modified: trunk/groovy/debian/patches/series =================================================================== --- trunk/groovy/debian/patches/series 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/patches/series 2009-08-02 13:00:18 UTC (rev 9452) @@ -1 +1 @@ -build.diff +ant-build.diff Modified: trunk/groovy/debian/rules =================================================================== --- trunk/groovy/debian/rules 2009-08-02 12:29:55 UTC (rev 9451) +++ trunk/groovy/debian/rules 2009-08-02 13:00:18 UTC (rev 9452) @@ -1,28 +1,35 @@ #!/usr/bin/make -f +include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_BUILD_TARGET := jar javadoc -DEB_JARS := ant mockobjects-core servlet-api jsp-api commons-cli antlr \ - xstream bsf xercesImpl jline junit4 xstream jline asm2 \ - asm2-util asm2-tree asm2-analysis ivy +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +DEB_ANT_BUILDFILE := build.xml +DEB_ANT_BUILD_TARGET := install doc +DEB_ANT_ARGS := -debug -DskipTests=true -DskipFetch=true +DEB_JARS := ant mockobjects-core servlet-api jsp-api commons-cli antlr \ + ant-antlr ant-trax xstream bsf xercesImpl jline junit4 xstream jline asm2 \ + asm2-util asm2-tree asm2-analysis ivy bnd qdox jarjar +API_DOCS := target/html/api -binary-install/groovy:: - fromdos debian/groovy/usr/share/groovy/bin/* +binary-post-install/$(PACKAGE):: chmod a+x debian/groovy/usr/share/groovy/bin/* - install -m 644 -D target/groovy.jar \ - debian/groovy/usr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar sed -i \ -e"1s,.*,#!/bin/sh," \ - -e"s,@GROOVYJAR@,groovy-$(DEB_UPSTREAM_VERSION).jar," \ debian/groovy/usr/share/groovy/bin/startGroovy - dh_link -pgroovy \ - /usr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar \ - /usr/share/java/groovy.jar + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -dusr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar -l pom.xml target/install/lib/groovy-$(DEB_UPSTREAM_VERSION).jar + mh_installjar -p$(PACKAGE) -dusr/share/groovy/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar -l target/groovy-all.pom target/install/embeddable/groovy-all-$(DEB_UPSTREAM_VERSION).jar +binary-post-install/$(PACKAGE)-doc:: + dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE) + +clean:: + -rm -rf debian/tmp + get-orig-source: - -uscan --upstream-version 0 --rename + -uscan --download-version $(VERSION) --force-download --rename + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
