[pkg-java] r4997 - in trunk/groovy: . debian
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Wed Dec 12 10:26:13 UTC 2007
Author: varun-guest
Date: 2007-12-12 10:26:12 +0000 (Wed, 12 Dec 2007)
New Revision: 4997
Added:
trunk/groovy/debian/build.xml
Removed:
trunk/groovy/build.xml
Modified:
trunk/groovy/debian/changelog
trunk/groovy/debian/control
trunk/groovy/debian/rules
Log:
* Add libxstream-java to Build-Depends
* Initial part builds now without radeox
Deleted: trunk/groovy/build.xml
===================================================================
--- trunk/groovy/build.xml 2007-12-12 10:25:53 UTC (rev 4996)
+++ trunk/groovy/build.xml 2007-12-12 10:26:12 UTC (rev 4997)
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--build.xml generated by maven from project.xml version 1.0-beta-8
- on date December 18 2004, time 2246-->
-
-<project default="jar" name="groovy" basedir=".">
- <property name="defaulttargetdir" value="target">
- </property>
- <property name="libdir" value="target/lib">
- </property>
- <property name="classesdir" value="target/classes">
- </property>
- <property name="testclassesdir" value="target/test-classes">
- </property>
- <property name="testclassesdir" value="target/test-classes">
- </property>
- <property name="testreportdir" value="target/test-reports">
- </property>
- <property name="distdir" value="dist">
- </property>
- <property name="javadocdir" value="target/docs/api">
- </property>
- <property name="version" value="1.0-beta-8">
- </property>
- <property name="final.name" value="groovy-${version}">
- </property>
-
- <path id="build.classpath">
- <fileset dir="${libdir}">
- <include name="**/*.jar">
- </include>
- </fileset>
- </path>
-
- <path id="test.classpath">
- <pathelement path="target/classes"/>
- <pathelement path="target/test-classes"/>
- <path refid="build.classpath"/>
- </path>
-
-
- <target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}">
- </mkdir>
- <condition property="noget">
- <equals arg2="only" arg1="${build.sysclasspath}">
- </equals>
- </condition>
- <!--Test if JUNIT is present in ANT classpath-->
-
- <available property="Junit.present" classname="junit.framework.Test">
- </available>
- </target>
-
-
- <target name="compile" description="o Compile the code" depends="init">
- <mkdir dir="${classesdir}">
- </mkdir>
- <!-- Compiles the Java classes -->
- <javac destdir="${classesdir}" deprecation="true" debug="true"
- source="1.5" excludes="**/package.html">
- <src>
- <pathelement location="src/main"/>
- </src>
- <classpath refid="build.classpath"/>
- </javac>
- <copy todir="${classesdir}">
- <fileset dir="src/main">
- <include name="**/*.properties">
- </include>
- <include name="**/*.xml">
- </include>
- </fileset>
- </copy>
-
- <!-- Compiles the groovy classes -->
- <copy todir="${classesdir}">
- <fileset dir="src/main">
- <include name="**/*.groovy"/>
- <exclude name="CVS/*"/>
- </fileset>
- </copy>
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="test.classpath"/>
- <groovyc destdir="${classesdir}" srcdir="${classesdir}" listfiles="true">
- <classpath refid="test.classpath"/>
- </groovyc>
- </target>
-
-
- <target name="jar" description="o Create the jar" depends="compile">
-
- <!-- Builds groovy-xxx.jar -->
- <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
- </jar>
-
- </target>
-
- <target name="embedded" description="o Creates the emdeddable jar">
- <property name="groovy.embeddable.working.dir"
- value="${defaulttargetdir}/embeddable-temp"/>
-
- <!-- Builds embeddable-jar -->
- <mkdir dir="${groovy.embeddable.working.dir}"/>
- <unzip dest="${groovy.embeddable.working.dir}">
- <fileset dir="${targetinstalldir}/lib">
- <include name="groovy*.jar"/>
- </fileset>
- </unzip>
- <unzip dest="${groovy.embeddable.working.dir}">
- <fileset dir="debian/lib">
- <include name="asm*.jar"/>
- <exclude name="asm-attr*.jar"/>
- <exclude name="asm-util*.jar"/>
- <exclude name="asm-analysis*.jar"/>
- </fileset>
- </unzip>
-
- <!-- ASM-LICENSE is missing from the pristine sources, sort this out
- <copy toDir="${groovy.embeddable.working.dir}/META-INF">
- <fileset dir="${basedir}">
- <include name="ASM-LICENSE.txt"/>
- </fileset>
- </copy>
- -->
-
- <!-- Install the groovy LICENSE text and MANIFEST -->
- <copy toDir="${groovy.embeddable.working.dir}/META-INF"
- file="LICENSE.txt"/>
- <copy toDir="${groovy.embeddable.working.dir}/META-INF"
- file="debian/MANIFEST.MF"/>
-
- <jar jarfile="${targetinstalldir}/embeddable/groovy-all-${version}.jar"
- manifest="${groovy.embeddable.working.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${groovy.embeddable.working.dir}"/>
- </jar>
-
-<!-- <delete dir="${groovy.embeddable.working.dir}"/> -->
-
- </target>
-
- <target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}">
- </delete>
- <delete dir="${distdir}">
- </delete>
- </target>
- <target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist">
- </mkdir>
- <copy todir="dist">
- <fileset dir="${defaulttargetdir}" includes="*.jar">
- </fileset>
- <fileset dir="${basedir}" includes="LICENSE*, README*">
- </fileset>
- </copy>
- </target>
- <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
- <fail message="There were test failures.">
- </fail>
- </target>
- <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
- <mkdir dir="${testreportdir}">
- </mkdir>
- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
- <sysproperty key="basedir" value=".">
- </sysproperty>
- <formatter type="xml">
- </formatter>
- <formatter usefile="false" type="plain">
- </formatter>
- <classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${testclassesdir}">
- </pathelement>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- <batchtest todir="${testreportdir}">
- <fileset dir="src/test">
- <include name="**/Uber*.*">
- </include>
- <exclude name="**/SignedJarTest.*">
- </exclude>
- </fileset>
- </batchtest>
- </junit>
- </target>
- <target name="junit-present" unless="Junit.present" depends="init">
- <echo>================================= WARNING ================================</echo>
- <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
- <echo>==========================================================================</echo>
- </target>
- <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
- <mkdir dir="${testclassesdir}">
- </mkdir>
- <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
- <src>
- <pathelement location="src/test">
- </pathelement>
- </src>
- <classpath>
- <path refid="build.classpath">
- </path>
- <pathelement path="${classesdir}">
- </pathelement>
- </classpath>
- </javac>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.properties">
- </include>
- <include name="**/*.xml">
- </include>
- <include name="**/*.xsd">
- </include>
- </fileset>
- </copy>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.*">
- </include>
- <include name="**/groovy*">
- </include>
- </fileset>
- </copy>
- </target>
- <target name="javadoc" description="o Generate javadoc">
- <mkdir dir="${javadocdir}"/>
- <tstamp>
- <format pattern="2003-yyyy" property="year">
- </format>
- </tstamp>
- <javadoc use="true" private="true" destdir="${javadocdir}"
- author="true" version="true" sourcepath="src/main"
- stylesheetfile="debian/javadoc-stylesheet.css"
- packagenames="groovy.*,org.codehaus.groovy.*">
- <classpath>
- <path refid="build.classpath">
- </path>
- </classpath>
- <!-- link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api/"/ -->
- <doctitle><![CDATA[<h1>groovy ${version} API</h1>]]></doctitle>
- <bottom><![CDATA[Copyright © ${year} The Codehaus. All Rights Reserved.]]></bottom>
- </javadoc>
- </target>
-
- <target name="groovy-jdk">
- <mkdir dir="${javadocdir}"/>
- <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes">
- <classpath refid="test.classpath"/>
- </java>
- </target>
-
- <target name="install-maven">
- <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
- </get>
- <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
- </unjar>
- </target>
-</project>
Copied: trunk/groovy/debian/build.xml (from rev 4994, trunk/groovy/build.xml)
===================================================================
--- trunk/groovy/debian/build.xml (rev 0)
+++ trunk/groovy/debian/build.xml 2007-12-12 10:26:12 UTC (rev 4997)
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--build.xml generated by maven from project.xml version 1.0-beta-8
+ on date December 18 2004, time 2246-->
+
+<project default="jar" name="groovy" basedir="..">
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="target/docs/api">
+ </property>
+ <property name="version" value="1.0-beta-8">
+ </property>
+ <property name="final.name" value="groovy-${version}">
+ </property>
+
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ </path>
+
+ <path id="test.classpath">
+ <pathelement path="target/classes"/>
+ <pathelement path="target/test-classes"/>
+ <path refid="build.classpath"/>
+ </path>
+
+
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${libdir}">
+ </mkdir>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
+ </target>
+
+
+ <target name="compile" description="o Compile the code" depends="init">
+ <mkdir dir="${classesdir}">
+ </mkdir>
+ <!-- Compiles the Java classes -->
+ <javac destdir="${classesdir}" debug="true"
+ source="1.5" excludes="**/package.html">
+ <src>
+ <pathelement location="src/main"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ <copy todir="${classesdir}">
+ <fileset dir="src/main">
+ <include name="**/*.properties">
+ </include>
+ <include name="**/*.xml">
+ </include>
+ </fileset>
+ </copy>
+
+ <!-- Compiles the groovy classes -->
+ <copy todir="${classesdir}">
+ <fileset dir="src/main">
+ <include name="**/*.groovy"/>
+ <exclude name="CVS/*"/>
+ </fileset>
+ </copy>
+ <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"
+ classpathref="test.classpath"/>
+ <groovyc destdir="${classesdir}" srcdir="${classesdir}" listfiles="true">
+ <classpath refid="test.classpath"/>
+ </groovyc>
+ </target>
+
+
+ <target name="jar" description="o Create the jar" depends="compile">
+
+ <!-- Builds groovy-xxx.jar -->
+ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+ </jar>
+
+ </target>
+
+ <target name="embedded" description="o Creates the emdeddable jar">
+ <property name="groovy.embeddable.working.dir"
+ value="${defaulttargetdir}/embeddable-temp"/>
+
+ <!-- Builds embeddable-jar -->
+ <mkdir dir="${groovy.embeddable.working.dir}"/>
+ <unzip dest="${groovy.embeddable.working.dir}">
+ <fileset dir="${targetinstalldir}/lib">
+ <include name="groovy*.jar"/>
+ </fileset>
+ </unzip>
+ <unzip dest="${groovy.embeddable.working.dir}">
+ <fileset dir="debian/lib">
+ <include name="asm*.jar"/>
+ <exclude name="asm-attr*.jar"/>
+ <exclude name="asm-util*.jar"/>
+ <exclude name="asm-analysis*.jar"/>
+ </fileset>
+ </unzip>
+
+ <!-- ASM-LICENSE is missing from the pristine sources, sort this out
+ <copy toDir="${groovy.embeddable.working.dir}/META-INF">
+ <fileset dir="${basedir}">
+ <include name="ASM-LICENSE.txt"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!-- Install the groovy LICENSE text and MANIFEST -->
+ <copy toDir="${groovy.embeddable.working.dir}/META-INF"
+ file="LICENSE.txt"/>
+ <copy toDir="${groovy.embeddable.working.dir}/META-INF"
+ file="debian/MANIFEST.MF"/>
+
+ <jar jarfile="${targetinstalldir}/embeddable/groovy-all-${version}.jar"
+ manifest="${groovy.embeddable.working.dir}/META-INF/MANIFEST.MF">
+ <fileset dir="${groovy.embeddable.working.dir}"/>
+ </jar>
+
+<!-- <delete dir="${groovy.embeddable.working.dir}"/> -->
+
+ </target>
+
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
+ </target>
+ <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+ <mkdir dir="dist">
+ </mkdir>
+ <copy todir="dist">
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
+ </copy>
+ </target>
+ <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+ <fail message="There were test failures.">
+ </fail>
+ </target>
+ <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
+ <mkdir dir="${testreportdir}">
+ </mkdir>
+ <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ <batchtest todir="${testreportdir}">
+ <fileset dir="src/test">
+ <include name="**/Uber*.*">
+ </include>
+ <exclude name="**/SignedJarTest.*">
+ </exclude>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING ================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+ <echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
+ <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+ <src>
+ <pathelement location="src/test">
+ </pathelement>
+ </src>
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ <pathelement path="${classesdir}">
+ </pathelement>
+ </classpath>
+ </javac>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.properties">
+ </include>
+ <include name="**/*.xml">
+ </include>
+ <include name="**/*.xsd">
+ </include>
+ </fileset>
+ </copy>
+ <copy todir="${testclassesdir}">
+ <fileset dir="src/test">
+ <include name="**/*.*">
+ </include>
+ <include name="**/groovy*">
+ </include>
+ </fileset>
+ </copy>
+ </target>
+ <target name="javadoc" description="o Generate javadoc">
+ <mkdir dir="${javadocdir}"/>
+ <tstamp>
+ <format pattern="2003-yyyy" property="year">
+ </format>
+ </tstamp>
+ <javadoc use="true" private="true" destdir="${javadocdir}"
+ author="true" version="true" sourcepath="src/main"
+ stylesheetfile="debian/javadoc-stylesheet.css"
+ packagenames="groovy.*,org.codehaus.groovy.*">
+ <classpath>
+ <path refid="build.classpath">
+ </path>
+ </classpath>
+ <!-- link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api/"/ -->
+ <doctitle><![CDATA[<h1>groovy ${version} API</h1>]]></doctitle>
+ <bottom><![CDATA[Copyright © ${year} The Codehaus. All Rights Reserved.]]></bottom>
+ </javadoc>
+ </target>
+
+ <target name="groovy-jdk">
+ <mkdir dir="${javadocdir}"/>
+ <java classname="org.codehaus.groovy.tools.DocGenerator" fork="yes">
+ <classpath refid="test.classpath"/>
+ </java>
+ </target>
+
+ <target name="install-maven">
+ <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
+ </get>
+ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+ </unjar>
+ </target>
+</project>
Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog 2007-12-12 10:25:53 UTC (rev 4996)
+++ trunk/groovy/debian/changelog 2007-12-12 10:26:12 UTC (rev 4997)
@@ -1,8 +1,14 @@
groovy (1.5.0-1) unstable; urgency=low
- * new upstream version
+ * New upstream release
+ * debian/control:
+ + Add libxstream-java to Build-Depends
+ + Add Homepage header
+ + Bump up the Standards-Version to 3.7.3
+ * Add debian/watch, debian/orig-tar.sh to create orig.tar.gz
+ * Move build.xml to debian directory.
- -- Torsten Werner <twerner at debian.org> Wed, 28 Nov 2007 22:58:27 +0100
+ -- Varun Hiremath <varun at debian.org> Wed, 12 Dec 2007 16:04:17 +0530
groovy (0.1.0beta10-3) unstable; urgency=low
Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control 2007-12-12 10:25:53 UTC (rev 4996)
+++ trunk/groovy/debian/control 2007-12-12 10:26:12 UTC (rev 4997)
@@ -2,8 +2,15 @@
Section: contrib/devel
Priority: optional
Maintainer: Marcus Crafter <crafterm at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), bzip2, libasm-java (>= 1.5.2), libbsf-java, libclassworlds-java (>= 1.0.1), libcommons-cli-java (>= 1.0), libcommons-collections3-java (>= 3.1), libcommons-logging-java (>= 1.0.3), junit (>= 3.8.1), libmockobjects-java (>= 0.09), libmx4j-java (>= 2.0.1), libregexp-java (>= 1.2), libservlet2.3-java, sharutils, ant, ant-optional, j2sdk1.4 | j2sdk1.3 | java-virtual-machine
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.0.0), bzip2, libasm-java (>=
+ 1.5.2), libbsf-java, libclassworlds-java (>= 1.0.1),
+ libcommons-cli-java (>= 1.0), libcommons-collections3-java (>= 3.1),
+ libcommons-logging-java (>= 1.0.3), junit (>= 3.8.1),
+ libmockobjects-java (>= 0.09), libmx4j-java (>= 2.0.1),
+ libregexp-java (>= 1.2), libservlet2.3-java, sharutils, ant,
+ ant-optional, j2sdk1.4 | j2sdk1.3 | java-virtual-machine, libxstream-java
+Standards-Version: 3.7.3
+Homepage: http://groovy.codehaus.org/
Package: groovy
Architecture: all
@@ -25,9 +32,7 @@
Groovy can be used as an alternative compiler to javac to generate
standard Java bytecode to be used by any Java project or it can be used
dynamically as an alternative language such as for scripting Java objects,
- templating or writing unit test cases.
- .
- Home page: http://groovy.codehaus.org/
+ templating or writing unit test cases.
Package: groovy-doc
Architecture: all
@@ -47,5 +52,3 @@
templating or writing unit test cases.
.
This package includes the Groovy API javadocs, and examples.
- .
- Home page: http://groovy.codehaus.org/
Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules 2007-12-12 10:25:53 UTC (rev 4996)
+++ trunk/groovy/debian/rules 2007-12-12 10:26:12 UTC (rev 4997)
@@ -3,9 +3,10 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS := mockobjects-core servlet-api jsp-api commons-cli junit4 antlr \
- xstream bsf xercesImpl radeox jline junit
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_JARS := mockobjects-core servlet-api jsp-api commons-cli antlr \
+ xstream bsf xercesImpl jline junit4 xstream
get-orig-source:
-uscan --upstream-version 0 --rename
More information about the pkg-java-commits
mailing list