[pkg-java] r7460 - trunk/plexus-containers/debian
twerner at alioth.debian.org
twerner at alioth.debian.org
Sat Nov 29 17:36:15 UTC 2008
Author: twerner
Date: 2008-11-29 17:36:15 +0000 (Sat, 29 Nov 2008)
New Revision: 7460
Added:
trunk/plexus-containers/debian/ant.properties
trunk/plexus-containers/debian/maven-build.xml
Removed:
trunk/plexus-containers/debian/build.properties
Modified:
trunk/plexus-containers/debian/
trunk/plexus-containers/debian/build.xml
trunk/plexus-containers/debian/changelog
trunk/plexus-containers/debian/rules
Log:
UNRELEASED
* Initial release. (Closes: #507272)
Property changes on: trunk/plexus-containers/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Copied: trunk/plexus-containers/debian/ant.properties (from rev 7459, trunk/plexus-containers/debian/build.properties)
===================================================================
--- trunk/plexus-containers/debian/ant.properties (rev 0)
+++ trunk/plexus-containers/debian/ant.properties 2008-11-29 17:36:15 UTC (rev 7460)
@@ -0,0 +1,7 @@
+classpath.compile=/usr/share/java/classworlds.jar:\
+ /usr/share/java/plexus-utils.jar:\
+ /usr/share/java/plexus-component-api.jar:\
+ /usr/share/java/junit.jar
+classpath.test=
+javadoc.dir=build/api
+maven.test.skip=true
Property changes on: trunk/plexus-containers/debian/ant.properties
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/plexus-containers/debian/build.properties
===================================================================
--- trunk/plexus-containers/debian/build.properties 2008-11-29 16:55:19 UTC (rev 7459)
+++ trunk/plexus-containers/debian/build.properties 2008-11-29 17:36:15 UTC (rev 7460)
@@ -1,6 +0,0 @@
-classpath.compile=/usr/share/java/classworlds.jar:\
- /usr/share/java/plexus-utils.jar:\
- /usr/share/java/plexus-component-api.jar:\
- /usr/share/java/junit.jar
-classpath.test=
-javadoc.dir=build/api
Modified: trunk/plexus-containers/debian/build.xml
===================================================================
--- trunk/plexus-containers/debian/build.xml 2008-11-29 16:55:19 UTC (rev 7459)
+++ trunk/plexus-containers/debian/build.xml 2008-11-29 17:36:15 UTC (rev 7460)
@@ -1,24 +1,41 @@
<?xml version="1.0"?>
+
+<project name="plexus-containers" default="package" basedir="..">
+
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-<project name="pkg-java" default="package" basedir="..">
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean"
+ antfile="${basedir}/debian/maven-build.xml" dir="@{dir}"/>
+ </sequential>
+ </macrodef>
- <property file="debian/build.properties"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
- <property name="maven.test.exclude" value="**/PlexusHierarchyTest.java"/>
- <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+ <macrodef name="packagemodule">
+ <attribute name="dir"/>
+ <attribute name="artifactId"/>
+ <sequential>
+ <ant target="package" antfile="${basedir}/debian/maven-build.xml" dir="@{dir}">
+ <property name="artifactId" value="@{artifactId}"/>
+ </ant>
+ </sequential>
+ </macrodef>
- <target name="clean">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- </target>
+ <target name="clean">
+ <delete dir="build"/>
+ <cleanmodule dir="plexus-container-default"/>
+ </target>
- <target name="package">
- <ant target="package" antfile="${maven.build.xml}" dir=".">
- <property name="artifactId" value="${artfiactId}"/>
- </ant>
- <copy file="build/plexus-container-default-${version}.jar" tofile="build/plexus-container-default-1.0.jar"/>
- </target>
+ <target name="package">
+ <packagemodule dir="plexus-container-default"
+ artifactId="plexus-container-default"/>
+ </target>
- <target name="javadoc">
- <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
- </target>
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="plexus-container-default/src/main/java/"/>
+ </javadoc>
+ </target>
+
</project>
Modified: trunk/plexus-containers/debian/changelog
===================================================================
--- trunk/plexus-containers/debian/changelog 2008-11-29 16:55:19 UTC (rev 7459)
+++ trunk/plexus-containers/debian/changelog 2008-11-29 17:36:15 UTC (rev 7460)
@@ -1,5 +1,6 @@
plexus-containers (1.0~beta2-1) unstable; urgency=low
- * Initial release. (Closes: #xxxxxx)
+ UNRELEASED
+ * Initial release. (Closes: #507272)
-- Torsten Werner <twerner at debian.org> Sat, 29 Nov 2008 17:32:07 +0100
Added: trunk/plexus-containers/debian/maven-build.xml
===================================================================
--- trunk/plexus-containers/debian/maven-build.xml (rev 0)
+++ trunk/plexus-containers/debian/maven-build.xml 2008-11-29 17:36:15 UTC (rev 7460)
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+
+<project name="pkg-java" default="package" basedir="..">
+
+ <target name="init">
+ <available property="available.resources" file="src/main/resources"/>
+
+ <fail unless="artifactId" message="Missing required property: artifactId"/>
+ <fail unless="version" message="Missing required property: version"/>
+ <fail unless="basedir" message="Missing required property: basedir"/>
+
+ <echo message="Compile classpath: ${classpath.full.compile}"/>
+ <echo message="Test classpath: ${classpath.full.test}"/>
+ </target>
+
+ <!--
+ | LIFECYCLE: Clean
+ |-->
+
+ <target name="clean">
+ <delete dir="${build.directory}"/>
+ </target>
+
+ <!--
+ | LIFECYCLE: jar
+ |
+ | This mimics the default Maven build life-cycle: http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
+ |-->
+
+ <target name="process-resources" depends="init" if="available.resources">
+ <mkdir dir="${build.outputDirectory}"/>
+ <copy todir="${build.outputDirectory}">
+ <fileset dir="src/main/resources"/>
+ </copy>
+ </target>
+
+ <target name="compile" depends="process-resources">
+ <mkdir dir="${build.outputDirectory}"/>
+ <mkdir dir="${build.directory}/generated-sources"/>
+ <javac
+ destdir="${build.outputDirectory}"
+ classpath="${classpath.compile}"
+ nowarn="true"
+ source="1.5" target="1.5"
+ debug="on">
+ <src path="${build.sourceDirectory}"/>
+ <src path="${build.directory}/generated-sources"/>
+ </javac>
+ </target>
+
+ <target name="process-test-resources" depends="compile" unless="maven.test.skip">
+ <mkdir dir="${build.testOutputDirectory}"/>
+ <copy todir="${build.testOutputDirectory}">
+ <fileset dir="src/test/resources"/>
+ </copy>
+ </target>
+
+ <target name="test-compile" depends="process-test-resources" unless="maven.test.skip">
+ <mkdir dir="${build.testOutputDirectory}"/>
+ <javac
+ destdir="${build.testOutputDirectory}"
+ classpath="${classpath.full.test}"
+ nowarn="true"
+ source="1.5" target="1.5"
+ debug="on">
+ <src path="${build.testSourceDirectory}"/>
+ </javac>
+ </target>
+
+ <target name="test" depends="test-compile" unless="maven.test.skip">
+ <mkdir dir="${build.directory}/test-output"/>
+ <junit printsummary="yes" haltonfailure="no"> <!-- fork="yes" forkmode="once" -->
+ <sysproperty key="basedir" value="${basedir}"/>
+ <classpath>
+ <pathelement path="${classpath.full.test}"/>
+ </classpath>
+
+ <formatter type="plain"/>
+ <batchtest todir="${build.directory}/test-output">
+ <fileset dir="${build.testSourceDirectory}">
+ <include name="**/*Test.java"/>
+ <exclude name="**/Abstract*"/>
+ <exclude name="${maven.test.exclude}"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="package" depends="test">
+<!--
+ <delete file="${jar}"/>
+
+ <mkdir dir="${build.directory}/META-INF/maven/org.codehaus.modello/modello-core" />
+ <copy file="./modello-core/pom.xml" todir="${build.directory}/META-INF/maven/org.codehaus.modello/modello-core" />
+-->
+ <jar jarfile="${build.directory}/${artifactId}-${version}.jar"
+ basedir="${build.outputDirectory}"/>
+ </target>
+
+ <!--
+ | Javadoc
+ |-->
+
+ <target name="javadoc">
+ <mkdir dir="${javadoc.dir}"/>
+ <javadoc
+ packagenames="org.codehaus.*"
+ sourcepath="${build.sourceDirectory}"
+ destdir="${javadoc.dir}"
+ author="true"
+ version="true"
+ windowtitle="${package} API"
+ doctitle="${package} - ${version}"
+ classpath="${classpath.full.compile}" >
+ </javadoc>
+ </target>
+</project>
Modified: trunk/plexus-containers/debian/rules
===================================================================
--- trunk/plexus-containers/debian/rules 2008-11-29 16:55:19 UTC (rev 7459)
+++ trunk/plexus-containers/debian/rules 2008-11-29 17:36:15 UTC (rev 7460)
@@ -6,18 +6,21 @@
PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g")
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps junit
+DEB_JARS := commons-cli maven2 plexus-classworlds plexus-utils
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dversion=$(VERSION)
API_DOCS := build/api
+MODULES := component-metadata container-default
get-orig-source:
uscan --force-download --rename
binary-post-install/lib$(PACKAGE)-java::
- dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar;
+ for MODULE in $(MODULES); do \
+ dh_install -plib$(PACKAGE)-java plexus-$$MODULE/build/plexus-$$MODULE-$(VERSION).jar usr/share/java; \
+ dh_link -plib$(PACKAGE)-java usr/share/java/plexus-$$MODULE-$(VERSION).jar usr/share/java/plexus-$$MODULE.jar; \
+ done
binary-post-install/lib$(PACKAGE)-java-doc::
dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
More information about the pkg-java-commits
mailing list