[pkg-java] r3557 - in trunk/plexus-container-default: . debian
trygvis-guest at alioth.debian.org
trygvis-guest at alioth.debian.org
Wed May 30 03:28:05 UTC 2007
Author: trygvis-guest
Date: 2007-05-30 03:28:05 +0000 (Wed, 30 May 2007)
New Revision: 3557
Added:
trunk/plexus-container-default/debian/build.properties
Modified:
trunk/plexus-container-default/
trunk/plexus-container-default/debian/
trunk/plexus-container-default/debian/build.xml
trunk/plexus-container-default/debian/changelog
trunk/plexus-container-default/debian/rules
Log:
o Switching the build to use the maven-ant-helper package.
Property changes on: trunk/plexus-container-default
___________________________________________________________________
Name: svn:ignore
+ build
build.log
integration-tests
pom.xml
src
test-fodder
Property changes on: trunk/plexus-container-default/debian
___________________________________________________________________
Name: svn:ignore
+ lib*
stamp-*
files
.ant-targets-build.xml
Added: trunk/plexus-container-default/debian/build.properties
===================================================================
--- trunk/plexus-container-default/debian/build.properties (rev 0)
+++ trunk/plexus-container-default/debian/build.properties 2007-05-30 03:28:05 UTC (rev 3557)
@@ -0,0 +1,5 @@
+classpath.compile=/usr/share/java/plexus-classworlds.jar:\
+ /usr/share/java/plexus-utils.jar:\
+ /usr/share/java/plexus-component-api.jar:\
+ /usr/share/java/junit.jar
+classpath.test=
Modified: trunk/plexus-container-default/debian/build.xml
===================================================================
--- trunk/plexus-container-default/debian/build.xml 2007-05-30 03:22:36 UTC (rev 3556)
+++ trunk/plexus-container-default/debian/build.xml 2007-05-30 03:28:05 UTC (rev 3557)
@@ -1,89 +1,25 @@
<?xml version="1.0"?>
-<!--
- This build.xml file was written for the Debian build of plexus-container-default.
- This file copyright (c) Paul Cager <paul-debian at home.paulcager.org>
+<project name="pkg-java" default="package" basedir="..">
- This software and documentation is provided "as is," and
- the copyright holders and contributing author(s) make no
- representations or warranties, express or implied, including
- but not limited to, warranties of merchantability or fitness
- for any particular purpose or that the use of the software or
- documentation will not infringe any third party patents,
- copyrights, trademarks or other rights.
+ <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="/home/trygvis/dev/org.debian.svn/pkg-java/trunk/maven-ant-helper-1.0/maven-build.xml"/>
+ <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- The copyright holders and contributing author(s) will not be
- liable for any direct, indirect, special or consequential damages
- arising out of any use of the software or documentation, even if
- advised of the possibility of such damage.
+ <target name="clean">
+ <ant target="clean" antfile="${maven.build.xml}" dir="."/>
+ </target>
- Permission is hereby granted to use, copy, modify, and distribute
- this source code, or portions hereof, documentation and executables,
- for any purpose, without fee, subject to the following restrictions:
+ <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>
- 1. The origin of this source code must not be misrepresented.
- 2. Altered versions must be plainly marked as such and must
- not be misrepresented as being the original source.
- 3. This Copyright notice may not be removed or altered from any
- source or altered source distribution.
--->
-
-<project name="plexus-container-default" default="package" basedir="..">
-
-<target name="package" depends="jar,javadoc"/>
-
-<target name="init">
- <property name="src.dir" value="src"/>
- <property name="build.dir" value="build"/>
- <property name="jar" value="${build.dir}/${package}-${version}.jar"/>
- <property name="javadoc.dir" value="${build.dir}/doc/api"/>
- <echo message="Classpath: ${java.class.path}" />
-</target>
-
-<target name="compile" depends="init">
- <mkdir dir="${build.dir}"/>
- <javac srcdir="${src.dir}/main"
- destdir="${build.dir}"
- includes="**/*.java"
- debug="on"
- />
-</target>
-
-<target name="jar" depends="compile">
- <delete file="${jar}"/>
-
- <jar jarfile="${jar}"
- basedir="${build.dir}"
- includes="**/*.class,**/*.properties"
- />
-</target>
-
-<target name="javadoc" depends="init">
- <mkdir dir="${javadoc.dir}"/>
- <javadoc packagenames="org.codehaus.plexus.*"
- sourcepath="${src.dir}/main/java"
- destdir="${javadoc.dir}"
- author="true"
- version="true"
- windowtitle="${package} API"
- doctitle="${package} - ${version}"
- classpath="${java.class.path}"
- >
- <link packagelistLoc="/usr/share/doc/libplexus-classworlds-java/api"
- href="/usr/share/doc/libplexus-classworlds-java/api/" />
- <link packagelistLoc="/usr/share/doc/classpath-doc/api"
- href="/usr/share/doc/classpath-doc/api/" />
- <link packagelistLoc="/usr/share/doc/libplexus-utils-java/api"
- href="/usr/share/doc/libplexus-utils-java/api/" />
- <link packagelistLoc="/usr/share/doc/libplexus-component-api-java/api"
- href="/usr/share/doc/libplexus-component-api-java/api/" />
- <link packagelistLoc="/usr/share/doc/junit-doc/javadoc"
- href="/usr/share/doc/junit-doc/javadoc/" />
-
- </javadoc>
-</target>
-
-<target name="clean" depends="init">
- <delete dir="${build.dir}"/>
-</target>
+ <target name="javadoc">
+ <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
+ </target>
</project>
Modified: trunk/plexus-container-default/debian/changelog
===================================================================
--- trunk/plexus-container-default/debian/changelog 2007-05-30 03:22:36 UTC (rev 3556)
+++ trunk/plexus-container-default/debian/changelog 2007-05-30 03:28:05 UTC (rev 3557)
@@ -1,4 +1,4 @@
-plexus-container-default (1.0+svn6351-1) unstable; urgency=low
+plexus-container-default (1.0-alpha-9-stable-1-1) unstable; urgency=low
* Initial release. (Closes: #413522)
Modified: trunk/plexus-container-default/debian/rules
===================================================================
--- trunk/plexus-container-default/debian/rules 2007-05-30 03:22:36 UTC (rev 3556)
+++ trunk/plexus-container-default/debian/rules 2007-05-30 03:28:05 UTC (rev 3557)
@@ -5,24 +5,18 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g")
JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
-#DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 \
- /usr/share/java/plexus-classworlds.jar \
- /usr/share/java/libplexus-utils.jar \
- /usr/share/java/plexus-component-api.jar \
- /usr/share/java/junit.jar
-DEB_ANT_BUILD_TARGET := package
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar $(ANT_HOME)/lib/ant-junit.jar /usr/share/java/junit.jar
+DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := ./debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS := -DartifactId=$(PACKAGE) -Dversion=$(VERSION)
#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
-API_DOCS := build/doc/api
-SVN := http://svn.codehaus.org/plexus/plexus-containers/trunk/plexus-container-default
+API_DOCS := build/javadoc
+SVN := http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-container-default-$(VERSION)
REVISION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
-
get-orig-source:
echo "Getting revision $(REVISION) from $(SVN)"
mkdir orig_tmp
@@ -30,14 +24,10 @@
svn export -q -r $(REVISION) $(SVN) $(PACKAGE) && \
tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
rm -rf orig_tmp
-
-makebuilddir/lib$(PACKAGE)-java::
- echo "build/$(PACKAGE)-$(VERSION).jar usr/share/java" >debian/lib$(PACKAGE)-java.install
- echo "/usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar" >debian/lib$(PACKAGE)-java.links
+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;
-makebuilddir/lib$(PACKAGE)-java-doc::
- echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
-
-cleanbuilddir/lib$(PACKAGE)-java::
- cd debian && rm -f lib$(PACKAGE)-java-doc.install lib$(PACKAGE)-java.links lib$(PACKAGE)-java.install
+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