[pkg-java] r8903 - trunk/modello/debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Mon Jul 6 21:41:15 UTC 2009
Author: ludovicc-guest
Date: 2009-07-06 21:41:14 +0000 (Mon, 06 Jul 2009)
New Revision: 8903
Added:
trunk/modello/debian/libmodello-java.poms
trunk/modello/debian/maven.rules
Modified:
trunk/modello/debian/build.properties
trunk/modello/debian/build.xml
trunk/modello/debian/changelog
trunk/modello/debian/control
trunk/modello/debian/orig-tar.sh
trunk/modello/debian/rules
Log:
* New version
Modified: trunk/modello/debian/build.properties
===================================================================
--- trunk/modello/debian/build.properties 2009-07-06 21:39:00 UTC (rev 8902)
+++ trunk/modello/debian/build.properties 2009-07-06 21:41:14 UTC (rev 8903)
@@ -1,9 +1,11 @@
classpath.compile=\
/usr/share/java/plexus-container-default.jar:\
+ /usr/share/java/plexus-compiler-api.jar:\
+ /usr/share/java/plexus-compiler-javac.jar:\
/usr/share/java/plexus-utils.jar:\
- ${basedir}/modello-db-keywords/build/modello-db-keywords-${version}.jar:\
${basedir}/modello-core/build/modello-core-${version}.jar:\
- ${basedir}/modello-plugins/modello-plugin-store/build/modello-plugin-store-${version}.jar:\
+ ${basedir}/modello-plugins/modello-plugin-java/build/modello-plugin-java-${version}.jar:\
${basedir}/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.jar
classpath.test=
javadoc.dir=build/api
+maven.test.skip=true
Modified: trunk/modello/debian/build.xml
===================================================================
--- trunk/modello/debian/build.xml 2009-07-06 21:39:00 UTC (rev 8902)
+++ trunk/modello/debian/build.xml 2009-07-06 21:41:14 UTC (rev 8903)
@@ -1,93 +1,67 @@
<?xml version="1.0"?>
-
+
<project name="pkg-java" default="package" basedir="..">
-
+
<property file="debian/build.properties"/>
- <property name="maven.test.skip" value="true"/>
+ <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
<property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
+
<macrodef name="cleanmodule">
- <attribute name="dir"/>
+ <attribute name="dir"/>
<sequential>
- <ant target="clean"
- antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="@{dir}"/>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
</sequential>
</macrodef>
<macrodef name="packagemodule">
- <attribute name="dir"/>
- <attribute name="artifactId"/>
+ <attribute name="dir"/>
<sequential>
- <ant target="package"
- antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="@{dir}">
- <property name="artifactId" value="@{artifactId}"/>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
</ant>
</sequential>
</macrodef>
<target name="clean">
<delete dir="build"/>
- <cleanmodule dir="modello-test"/>
- <cleanmodule dir="modello-core"/>
- <cleanmodule dir="modello-db-keywords"/>
- <cleanmodule dir="modello-maven-plugin"/>
- <cleanmodule dir="modello-plugins/modello-plugin-converters"/>
- <cleanmodule dir="modello-plugins/modello-plugin-dom4j"/>
- <cleanmodule dir="modello-plugins/modello-plugin-jdom"/>
- <cleanmodule dir="modello-plugins/modello-plugin-jpox"/>
- <cleanmodule dir="modello-plugins/modello-plugin-plexus-registry"/>
- <cleanmodule dir="modello-plugins/modello-plugin-stax"/>
- <cleanmodule dir="modello-plugins/modello-plugin-store"/>
- <cleanmodule dir="modello-plugins/modello-plugin-xdoc"/>
- <cleanmodule dir="modello-plugins/modello-plugin-xml"/>
- <cleanmodule dir="modello-plugins/modello-plugin-xpp3"/>
- <cleanmodule dir="modello-plugins/modello-plugin-xsd"/>
+ <cleanmodule dir="modello-core"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-java"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-converters"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-dom4j"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-jdom"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-stax"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-xdoc"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-xml"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-xpp3"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-xsd"/>
</target>
<target name="package">
- <packagemodule dir="modello-test" artifactId="modello-test"/>
- <packagemodule dir="modello-core" artifactId="modello-core"/>
- <packagemodule dir="modello-db-keywords"
- artifactId="modello-db-keywords"/>
- <packagemodule dir="modello-maven-plugin"
- artifactId="modello-maven-plugin"/>
- <packagemodule dir="modello-plugins/modello-plugin-converters"
- artifactId="modello-plugin-converters"/>
- <packagemodule dir="modello-plugins/modello-plugin-xml"
- artifactId="modello-plugin-xml"/>
- <packagemodule dir="modello-plugins/modello-plugin-dom4j"
- artifactId="modello-plugin-dom4j"/>
- <packagemodule dir="modello-plugins/modello-plugin-jdom"
- artifactId="modello-plugin-jdom"/>
- <packagemodule dir="modello-plugins/modello-plugin-store"
- artifactId="modello-plugin-store"/>
- <packagemodule dir="modello-plugins/modello-plugin-jpox"
- artifactId="modello-plugin-jpox"/>
- <packagemodule dir="modello-plugins/modello-plugin-plexus-registry"
- artifactId="modello-plugin-plexus-registry"/>
- <packagemodule dir="modello-plugins/modello-plugin-stax"
- artifactId="modello-plugin-stax"/>
- <packagemodule dir="modello-plugins/modello-plugin-xdoc"
- artifactId="modello-plugin-xdoc"/>
- <packagemodule dir="modello-plugins/modello-plugin-xpp3"
- artifactId="modello-plugin-xpp3"/>
- <packagemodule dir="modello-plugins/modello-plugin-xsd"
- artifactId="modello-plugin-xsd"/>
+ <packagemodule dir=""/>
+ <packagemodule dir="modello-core"/>
+ <packagemodule dir="modello-plugins/modello-plugin-java"/>
+ <packagemodule dir="modello-plugins/modello-plugin-converters"/>
+ <packagemodule dir="modello-plugins/modello-plugin-xml"/>
+ <packagemodule dir="modello-plugins/modello-plugin-dom4j"/>
+ <packagemodule dir="modello-plugins/modello-plugin-jdom"/>
+ <packagemodule dir="modello-plugins/modello-plugin-stax"/>
+ <packagemodule dir="modello-plugins/modello-plugin-xdoc"/>
+ <packagemodule dir="modello-plugins/modello-plugin-xpp3"/>
+ <packagemodule dir="modello-plugins/modello-plugin-xsd"/>
</target>
<target name="javadoc">
<javadoc destdir="${javadoc.dir}">
- <packageset dir="modello-test/src/main/java/"/>
- <packageset dir="modello-core/src/main/java/"/>
- <packageset dir="modello-db-keywords/src/main/java/"/>
- <packageset dir="modello-maven-plugin/src/main/java/"/>
+ <packageset dir="modello-core/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-java/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-converters/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-dom4j/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-jdom/src/main/java/"/>
- <packageset dir="modello-plugins/modello-plugin-jpox/src/main/java/"/>
- <packageset dir="modello-plugins/modello-plugin-plexus-registry/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-stax/src/main/java/"/>
- <packageset dir="modello-plugins/modello-plugin-store/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-xdoc/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-xml/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-xpp3/src/main/java/"/>
Modified: trunk/modello/debian/changelog
===================================================================
--- trunk/modello/debian/changelog 2009-07-06 21:39:00 UTC (rev 8902)
+++ trunk/modello/debian/changelog 2009-07-06 21:41:14 UTC (rev 8903)
@@ -1,3 +1,24 @@
+modello (1.0.1-2) unstable; urgency=low
+
+ * New upstream release.
+ * Add myself to Uploaders.
+ * Add descriptors for the Maven repository
+ * Remove modello-maven-plugin from this package as it was missing some
+ essential Maven descriptors, move it in a separate package
+ (modello-maven-plugin), remove modello-test from the build as well.
+ * Add Depends: for libmodello-java and libplexus-build-api-java
+ * Add a Build-Depends-Indep dependency on maven-repo-helper and
+ libplexus-build-api-java
+ * Remove the dependency on maven2, as it was needed only for the modello
+ plugin, replace it by a Recommends:
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * debian/rules: add java plugin, remove jpox,plexus-registry,store plugins,
+ remove base module db-keywords
+ * update build.properties and build.xml for the new version
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Mon, 06 Jul 2009 22:37:50 +0100
+
modello (1.0-alpha-21-3) unstable; urgency=low
* Change debian/rules to really use default-jdk.
Modified: trunk/modello/debian/control
===================================================================
--- trunk/modello/debian/control 2009-07-06 21:39:00 UTC (rev 8902)
+++ trunk/modello/debian/control 2009-07-06 21:41:14 UTC (rev 8903)
@@ -2,13 +2,13 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: ant-optional, classpath-doc, default-jdk, junit,
+Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Torsten Werner <twerner at debian.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ classpath-doc, junit, libplexus-containers-java-doc, libplexus-utils-java-doc,
libplexus-compiler-api-java, libplexus-compiler-javac-java,
- libplexus-container-default-java, libplexus-container-default-java-doc,
- libplexus-utils-java, libplexus-utils-java-doc, libplexus-velocity-java,
- maven-ant-helper, maven2, velocity
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
+ libplexus-build-api-java, libplexus-containers-java
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/modello
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/modello/
@@ -16,8 +16,9 @@
Package: libmodello-java
Architecture: all
-Depends: ${misc:Depends}
-Suggests: libmodello-java-doc
+Depends: ${misc:Depends}, libplexus-build-api-java, libplexus-containers-java
+Recommends: libmaven2-core-java
+Suggests: maven2, libmodello-java-doc
Description: a Data Model toolkit in use by the Maven 2 Project
Once a DataModel is defined, the toolkit can be used to generate any of the
following at compile time.
@@ -27,10 +28,6 @@
* XML to Java Pojos Reader. (provided via xpp3, stax or dom4j)
* XDOC documentation of the DataModel.
* XML Schema to validate the DataModel.
- * Java Model to Prevayler Store (actually this plugin is in the
- sandbox).
- * Java Model to JPOX Store.
- * Java Model to JPOX Mapping.
.
Modello is used to build the maven system.
@@ -48,10 +45,6 @@
* XML to Java Pojos Reader. (provided via xpp3, stax or dom4j)
* XDOC documentation of the DataModel.
* XML Schema to validate the DataModel.
- * Java Model to Prevayler Store (actually this plugin is in the
- sandbox).
- * Java Model to JPOX Store.
- * Java Model to JPOX Mapping.
.
Modello is used to build the maven system.
.
Added: trunk/modello/debian/libmodello-java.poms
===================================================================
--- trunk/modello/debian/libmodello-java.poms (rev 0)
+++ trunk/modello/debian/libmodello-java.poms 2009-07-06 21:41:14 UTC (rev 8903)
@@ -0,0 +1,12 @@
+pom.xml --no-parent
+modello-core/pom.xml
+modello-plugins/pom.xml
+modello-plugins/modello-plugin-converters/pom.xml
+modello-plugins/modello-plugin-dom4j/pom.xml
+modello-plugins/modello-plugin-java/pom.xml
+modello-plugins/modello-plugin-jdom/pom.xml
+modello-plugins/modello-plugin-stax/pom.xml
+modello-plugins/modello-plugin-xdoc/pom.xml
+modello-plugins/modello-plugin-xml/pom.xml
+modello-plugins/modello-plugin-xpp3/pom.xml
+modello-plugins/modello-plugin-xsd/pom.xml
Added: trunk/modello/debian/maven.rules
===================================================================
--- trunk/modello/debian/maven.rules (rev 0)
+++ trunk/modello/debian/maven.rules 2009-07-06 21:41:14 UTC (rev 8903)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+
Modified: trunk/modello/debian/orig-tar.sh
===================================================================
--- trunk/modello/debian/orig-tar.sh 2009-07-06 21:39:00 UTC (rev 8902)
+++ trunk/modello/debian/orig-tar.sh 2009-07-06 21:41:14 UTC (rev 8903)
@@ -1,10 +1,13 @@
#!/bin/sh -e
-TAR=../modello_$2.orig.tar.gz
-DIR=modello-$2
+VERSION=$2
+TAR=../modello_$VERSION.orig.tar.gz
+DIR=modello-$VERSION
TAG=modello-$2
svn export https://svn.codehaus.org/modello/tags/$TAG $DIR
+rm -rf $DIR/modello-maven-plugin
+rm -rf $DIR/modello-test
tar -c -z -f $TAR $DIR
rm -rf $DIR ../$TAG
Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules 2009-07-06 21:39:00 UTC (rev 8902)
+++ trunk/modello/debian/rules 2009-07-06 21:41:14 UTC (rev 8903)
@@ -2,33 +2,34 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g")
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps junit maven2 plexus-compiler-api \
- plexus-compiler-javac plexus-velocity velocity
+DEB_JARS := ant-nodeps junit plexus-build-api plexus-compiler-api \
+ plexus-compiler-javac plexus-velocity plexus-utils velocity
DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := ./debian/build.xml
+DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := build/api
-BASE_MODULES := core db-keywords maven-plugin test
-PLUGINS := converters dom4j jdom jpox plexus-registry stax store xdoc \
+BASE_MODULES := core
+PLUGINS := converters dom4j java jdom stax xdoc \
xml xpp3 xsd
get-orig-source:
- uscan --force-download
+ uscan --force-download --download-version $(VERSION) --rename
binary-post-install/lib$(PACKAGE)-java::
- for MODULE in $(BASE_MODULES); do \
- dh_install -plib$(PACKAGE)-java modello-$$MODULE/build/$(PACKAGE)-$$MODULE-$(VERSION).jar usr/share/java; \
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$$MODULE-$(VERSION).jar usr/share/java/$(PACKAGE)-$$MODULE.jar; \
+ mh_installpoms -plib$(PACKAGE)-java
+ set -e; for MODULE in $(BASE_MODULES); do \
+ mh_installjar -plib$(PACKAGE)-java -l modello-$$MODULE/pom.xml modello-$$MODULE/build/$(PACKAGE)-$$MODULE-$(VERSION).jar; \
done
- for MODULE in $(PLUGINS); do \
- dh_install -plib$(PACKAGE)-java modello-plugins/modello-plugin-$$MODULE/build/$(PACKAGE)-plugin-$$MODULE-$(VERSION).jar usr/share/java; \
- dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-plugin-$$MODULE-$(VERSION).jar usr/share/java/$(PACKAGE)-plugin-$$MODULE.jar; \
+ set -e; for MODULE in $(PLUGINS); do \
+ mh_installjar -plib$(PACKAGE)-java -l modello-plugins/modello-plugin-$$MODULE/pom.xml modello-plugins/modello-plugin-$$MODULE/build/$(PACKAGE)-plugin-$$MODULE-$(VERSION).jar; \
done
binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc build/api usr/share/doc/lib$(PACKAGE)-java
+ dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+
+clean::
+ -rm -rf debian/tmp
Property changes on: trunk/modello/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list