[pkg-java] r3567 - in trunk/maven2: . debian
trygvis-guest at alioth.debian.org
trygvis-guest at alioth.debian.org
Sat Jun 2 19:20:40 UTC 2007
Author: trygvis-guest
Date: 2007-06-02 19:20:40 +0000 (Sat, 02 Jun 2007)
New Revision: 3567
Added:
trunk/maven2/debian/build.properties
Removed:
trunk/maven2/debian/libcommons-openpgp-java-doc.doc-base
Modified:
trunk/maven2/
trunk/maven2/debian/
trunk/maven2/debian/build.xml
trunk/maven2/debian/changelog
trunk/maven2/debian/control
trunk/maven2/debian/rules
Log:
o Committing my work. Getting ready to build in my pbuilder.
Property changes on: trunk/maven2
___________________________________________________________________
Name: svn:ignore
+ README.txt
bootstrap*
build*
ci.sh
maven-*
pom.xml
Property changes on: trunk/maven2/debian
___________________________________________________________________
Name: svn:ignore
+ stamp-*
Added: trunk/maven2/debian/build.properties
===================================================================
--- trunk/maven2/debian/build.properties (rev 0)
+++ trunk/maven2/debian/build.properties 2007-06-02 19:20:40 UTC (rev 3567)
@@ -0,0 +1,14 @@
+classpath.compile = \
+ /usr/share/java/bsh.jar:\
+ /usr/share/java/commons-cli.jar:\
+ /usr/share/java/commons-lang.jar:\
+ /usr/share/java/doxia-sink-api.jar:\
+ /usr/share/java/libplexus-utils.jar:\
+ /usr/share/java/modello-core.jar:\
+ /usr/share/java/modello-plugin-xml.jar:\
+ /usr/share/java/modello-plugin-xpp3.jar:\
+ /usr/share/java/plexus-classworlds.jar:\
+ /usr/share/java/plexus-container-default.jar:\
+ /usr/share/java/plexus-interactivity-api.jar:\
+ /usr/share/java/plexus-utils.jar:\
+ /usr/share/java/wagon-provider-api.jar
Modified: trunk/maven2/debian/build.xml
===================================================================
--- trunk/maven2/debian/build.xml 2007-06-02 16:45:36 UTC (rev 3566)
+++ trunk/maven2/debian/build.xml 2007-06-02 19:20:40 UTC (rev 3567)
@@ -32,6 +32,14 @@
<target name="package" depends="jar,javadoc"/>
+ <property file="debian/build.properties"/>
+ <!--
+ maven-script/maven-script-beanshell/src/main/java:maven-script/maven-script-ant/src/main/java:
+ -->
+ <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java:maven-plugin-descriptor/src/main/java:maven-artifact-test/src/main/java"/>
+ <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources"/>
+ <property name="maven.sourceRoots" value="${maven.mainSourceRoots}:${maven.generatedSourceRoots}"/>
+
<target name="init">
<property name="src.dir" value="."/>
<property name="build.dir" value="build"/>
@@ -39,14 +47,41 @@
<property name="jar" value="${build.dir}/${package}-${version}.jar"/>
<property name="javadoc.dir" value="${build.dir}/doc/api"/>
<echo message="Classpath: ${java.class.path}" />
+ <echo message="Compile classpath: ${classpath.compile}" />
</target>
-<target name="compile" depends="init">
+<target name="generate-sources">
+ <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/maven-ant-helper/maven-ant-helper.jar"/>
+ <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="java" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-reader" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-writer" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="java" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-reader" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-writer" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-model/src/main/mdo/maven.mdo" plugin="java" output="maven-model/build/generated-sources" version="4.0.0"/>
+ <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-reader" output="maven-model/build/generated-sources" version="4.0.0"/>
+ <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-writer" output="maven-model/build/generated-sources" version="4.0.0"/>
+ <modello model="maven-profile/profiles.mdo" plugin="java" output="maven-profile/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-profile/profiles.mdo" plugin="xpp3-reader" output="maven-profile/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-profile/profiles.mdo" plugin="xpp3-writer" output="maven-profile/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="java" output="maven-settings/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-reader" output="maven-settings/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="java" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-reader" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-writer" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-reader" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+ <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
+</target>
+
+<target name="compile" depends="init, generate-sources">
<mkdir dir="${build.dir}"/>
- <javac srcdir="${src.dir}"
- destdir="${build.dir}"
- debug="on">
- <include name="**/*.java"/>
+ <javac
+ srcdir="${maven.sourceRoots}"
+ classpath="${classpath.compile}"
+ destdir="${build.dir}"
+ debug="on">
</javac>
</target>
@@ -54,21 +89,13 @@
<delete file="${jar}"/>
<jar jarfile="${build.dir}/${package}${jar.suffix}"
- basedir="${build.dir}"
- includes="**/*.class,**/*.properties" />
+ basedir="${build.dir}"/>
</target>
<target name="javadoc" depends="init">
<mkdir dir="${javadoc.dir}"/>
- <javadoc
- packagenames="org.apache.commons.openpgp,org.apache.commons.openpgp.ant"
- sourcepath="src/main/java"
- destdir="${javadoc.dir}"
- author="true"
- version="true"
- windowtitle="${package} API"
- doctitle="${package} - ${version}"
- classpath="${java.class.path}" >
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="${maven.sourceRoots}"/>
</javadoc>
</target>
Modified: trunk/maven2/debian/changelog
===================================================================
--- trunk/maven2/debian/changelog 2007-06-02 16:45:36 UTC (rev 3566)
+++ trunk/maven2/debian/changelog 2007-06-02 19:20:40 UTC (rev 3567)
@@ -1,4 +1,4 @@
-maven (2.0.6-0.1) unstable; urgency=low
+maven2 (2.0.6-1) unstable; urgency=low
* Initial release. (Closes: XXXXXXX)
Modified: trunk/maven2/debian/control
===================================================================
--- trunk/maven2/debian/control 2007-06-02 16:45:36 UTC (rev 3566)
+++ trunk/maven2/debian/control 2007-06-02 19:20:40 UTC (rev 3567)
@@ -7,7 +7,8 @@
libbcpg-java, libbcpg-java-doc,
libbcprov-java, libbcprov-java-doc,
classpath-doc,
- libcommons-cli-java
+ libcommons-cli-java,
+ libwagon-java
Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
Standards-Version: 3.7.2
Deleted: trunk/maven2/debian/libcommons-openpgp-java-doc.doc-base
===================================================================
--- trunk/maven2/debian/libcommons-openpgp-java-doc.doc-base 2007-06-02 16:45:36 UTC (rev 3566)
+++ trunk/maven2/debian/libcommons-openpgp-java-doc.doc-base 2007-06-02 19:20:40 UTC (rev 3567)
@@ -1,9 +0,0 @@
-Document: maven
-Title: Documentation for Maven, a software project management and comprehension tool
-Author: Maven developers
-Abstract: Maven is a software project management and comprehension tool.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/maven/index.html
-Files: /usr/share/doc/maven/*
Modified: trunk/maven2/debian/rules
===================================================================
--- trunk/maven2/debian/rules 2007-06-02 16:45:36 UTC (rev 3566)
+++ trunk/maven2/debian/rules 2007-06-02 19:20:40 UTC (rev 3567)
@@ -5,20 +5,15 @@
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' ' | sed 's/-[0-9]*$$//')
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
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/junit.jar \
- $(shell find /usr/share/java -type f -name 'wagon*' -print) \
- $(shell find /usr/share/java -type f -name 'plexus*' -print) \
- /usr/share/java/libplexus-utils.jar \
- /usr/share/java/commons-lang.jar \
- /usr/share/java/commons-cli.jar \
- /usr/share/java/ant-launcher.jar \
- /usr/share/java/ant.jar \
- /usr/share/java/bsh.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar \
+ /usr/share/java/junit.jar \
+ /usr/share/java/commons-cli.jar \
+ /usr/share/java/ant-launcher.jar \
+ /usr/share/java/ant.jar \
+ /usr/share/java/bsh.jar \
# TODO - all of the build-depends above must be copied into control
@@ -29,10 +24,6 @@
API_DOCS := build/doc/api
SVN := http://svn.apache.org/repos/asf/maven/components/tags/maven-$(VERSION)
-
-test22:
- echo $(DEB_JARS)
-
get-orig-source:
echo "Getting version $(VERSION) from $(SVN)"
mkdir orig_tmp
@@ -40,11 +31,10 @@
svn export -q $(SVN) $(PACKAGE) && \
tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz $(PACKAGE)
rm -rf orig_tmp
-
binary-post-install/$(PACKAGE)::
- dh_install -p$(PACKAGE) build/$(PACKAGE)-$(VERSION).jar usr/share/java && \
- dh_link -p$(PACKAGE) usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar; \
+ dh_install -p$(PACKAGE) build/$(PACKAGE)-$(VERSION).jar usr/share/java
+ dh_link -p$(PACKAGE) usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
binary-post-install/$(PACKAGE)-doc::
#dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)
More information about the pkg-java-commits
mailing list