[pkg-java] r5029 - trunk/groovy/debian
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Fri Dec 14 13:06:30 UTC 2007
Author: varun-guest
Date: 2007-12-14 13:06:29 +0000 (Fri, 14 Dec 2007)
New Revision: 5029
Added:
trunk/groovy/debian/ant.properties
Modified:
trunk/groovy/debian/build.xml
trunk/groovy/debian/changelog
trunk/groovy/debian/control
trunk/groovy/debian/groovy.install
trunk/groovy/debian/rules
Log:
* Use sun-java60jdk to build - include the buggy *.groovy files again
as they build now.
* Write a new build.xml file.
Added: trunk/groovy/debian/ant.properties
===================================================================
--- trunk/groovy/debian/ant.properties (rev 0)
+++ trunk/groovy/debian/ant.properties 2007-12-14 13:06:29 UTC (rev 5029)
@@ -0,0 +1,4 @@
+class.dir=target/classes
+source.dir=src/main
+jar.name=target/groovy.jar
+javadoc.dir=target/docs/api
Modified: trunk/groovy/debian/build.xml
===================================================================
--- trunk/groovy/debian/build.xml 2007-12-14 11:04:12 UTC (rev 5028)
+++ trunk/groovy/debian/build.xml 2007-12-14 13:06:29 UTC (rev 5029)
@@ -1,268 +1,50 @@
<?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="${project.name}" basedir="..">
-<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.5">
- </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-->
+ <patternset id="compiler.resources">
+ <include name="**/?*.properties" />
+ <include name="**/?*.xml" />
+ <include name="**/?*.png" />
+ <include name="**/?*.html" />
+ </patternset>
- <available property="Junit.present" classname="junit.framework.Test">
- </available>
+ <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}"
+ deprecation="true" debug="true" optimize="false"/>
- <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>
+ <taskdef name="groovyc"
+ classname="org.codehaus.groovy.ant.Groovyc"
+ classpath="${class.dir}"/>
+ <groovyc destdir="${class.dir}" srcdir="${source.dir}" listfiles="true" />
- <!-- Compiles the groovy classes -->
- <copy todir="${classesdir}">
- <fileset dir="src/main">
- <include name="**/*.groovy"/>
- <exclude name="CVS/*"/>
+ <copy todir="${class.dir}">
+ <fileset dir="${source.dir}">
+ <patternset refid="compiler.resources" />
</fileset>
</copy>
-
- <!-- BUG! exception in phase 'conversion' in source unit -->
- <!-- Deleting these files before compilation becasue of the above -->
- <delete file="${classesdir}/groovy/ui/ConsoleView.groovy" />
- <delete file="${classesdir}/groovy/ui/view/BasicContentPane.groovy" />
-
- <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>
-
+ <jar jarfile="${jar.name}" excludes="**/package.html, **/*.groovy"
+ basedir="${class.dir}" />
</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/"/ -->
+ <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>
-
- <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-14 11:04:12 UTC (rev 5028)
+++ trunk/groovy/debian/changelog 2007-12-14 13:06:29 UTC (rev 5029)
@@ -3,14 +3,15 @@
[ Varun Hiremath ]
* New upstream release
* debian/control:
- + Add libxstream-java to Build-Depends
+ + Add sun-java6-jdk, libxstream-java to Build-Depends
+ Add Homepage, Vcs-{Svn, Browser} headers
+ Bump up the Standards-Version to 3.7.3
+ + Add Suggests for the binary and doc packages
* Add debian/watch, debian/orig-tar.sh to create orig.tar.gz
- * Move build.xml to debian directory.
- * Exclude ConsoleView.groovy and BasicContentPane.groovy from compiling
- because of BUG: exception in phase 'conversion' in source unit.
- * debian/rules: call javadoc
+ * Write a new debian/build.xml and add debian/ant.properties
+ * debian/rules:
+ + call javadoc to build docs
+ + use sun-java6-jdk to build
* Clean up javadoc installation.
[ Torsten Werner ]
Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control 2007-12-14 11:04:12 UTC (rev 5028)
+++ trunk/groovy/debian/control 2007-12-14 13:06:29 UTC (rev 5029)
@@ -3,13 +3,12 @@
Priority: optional
Maintainer: Marcus Crafter <crafterm at debian.org>
Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: bzip2, libasm2-java, libbsf-java,
- libclassworlds-java (>= 1.0.1), libcommons-cli-java (>= 1.0),
- libcommons-collections3-java (>= 3.1), libcommons-logging-java (>=
- 1.0.3), junit4, libmockobjects-java (>= 0.09), libmx4j-java
- (>= 2.0.1), libregexp-java (>= 1.2), libservlet2.4-java,
- ant, ant-optional, java-gcj-compat-dev, libxstream-java, libjline-java,
- tofrodos
+Build-Depends-Indep: ant-optional, sun-java6-jdk, bzip2, libasm2-java,
+ libbsf-java, libclassworlds-java (>= 1.0.1), libcommons-cli-java (>=
+ 1.0), libcommons-collections3-java (>= 3.1), libcommons-logging-java
+ (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libmx4j-java (>=
+ 2.0.1), libregexp-java (>= 1.2), libservlet2.4-java, libxstream-java,
+ libjline-java, tofrodos
Standards-Version: 3.7.3
Homepage: http://groovy.codehaus.org/
Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/groovy/
@@ -23,6 +22,7 @@
junit4, libmockobjects-java (>= 0.09), libmx4j-java (>= 2.0.1),
libregexp-java (>= 1.2), libservlet2.4-java, libjline-java
java-gcj-compat | java-virtual-machine
+Suggests: groovy-doc
Description: Agile dynamic language for the Java Virtual Machine
Groovy is an agile dynamic language for the JVM combining lots of great
features from languages like Python, Ruby and Smalltalk and making them
@@ -41,6 +41,7 @@
Section: contrib/doc
Architecture: all
Depends: ${misc:Depends}
+Suggests: groovy
Description: Agile dynamic language for the Java Virtual Machine
Groovy is an agile dynamic language for the JVM combining lots of great
features from languages like Python, Ruby and Smalltalk and making them
Modified: trunk/groovy/debian/groovy.install
===================================================================
--- trunk/groovy/debian/groovy.install 2007-12-14 11:04:12 UTC (rev 5028)
+++ trunk/groovy/debian/groovy.install 2007-12-14 13:06:29 UTC (rev 5029)
@@ -5,4 +5,3 @@
src/bin/java2groovy /usr/share/groovy/bin/
src/bin/startGroovy /usr/share/groovy/bin/
src/conf/* /usr/share/groovy/conf/
-target/*.jar /usr/share/groovy/lib/
Modified: trunk/groovy/debian/rules
===================================================================
--- trunk/groovy/debian/rules 2007-12-14 11:04:12 UTC (rev 5028)
+++ trunk/groovy/debian/rules 2007-12-14 13:06:29 UTC (rev 5029)
@@ -3,23 +3,24 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/java-6-sun
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_JARS := mockobjects-core servlet-api jsp-api commons-cli antlr \
- xstream bsf xercesImpl jline junit4 xstream jline
+DEB_JARS := mockobjects-core servlet-api jsp-api commons-cli antlr \
+ xstream bsf xercesImpl jline junit4 xstream jline asm2 \
+ asm2-util asm2-tree asm2-analysis
-VERSION := 1.5
-
binary-install/groovy::
fromdos debian/groovy/usr/share/groovy/bin/*
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, at GROOVYJAR@,groovy-$(VERSION).jar," \
+ -e"s, at GROOVYJAR@,groovy-$(DEB_UPSTREAM_VERSION).jar," \
debian/groovy/usr/share/groovy/bin/startGroovy
dh_link -pgroovy \
- /usr/share/groovy/lib/groovy-$(VERSION).jar \
+ /usr/share/groovy/lib/groovy-$(DEB_UPSTREAM_VERSION).jar \
/usr/share/java/groovy.jar
get-orig-source:
More information about the pkg-java-commits
mailing list