[pkg-java] r11323 - in trunk/maven-debian-helper: bin debian maven-packager-utils/src/main/resources share/cdbs/1/class
Ludovic Claude
ludovicc-guest at alioth.debian.org
Wed Dec 30 23:14:58 UTC 2009
Author: ludovicc-guest
Date: 2009-12-30 23:14:58 +0000 (Wed, 30 Dec 2009)
New Revision: 11323
Modified:
trunk/maven-debian-helper/bin/mh_make
trunk/maven-debian-helper/bin/mh_resolve_dependencies
trunk/maven-debian-helper/debian/changelog
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
Log:
* Make the package more version agnostic. Versions are discovered
at runtime
* mh_make has a new option, --from-svn, to download automatically
the sources from a SVN repository and generate the Debian packaging
for the project.
* Add apt-file to Recommends: as it's used by mh_lspoms
(Closes: #542511)
Modified: trunk/maven-debian-helper/bin/mh_make
===================================================================
--- trunk/maven-debian-helper/bin/mh_make 2009-12-30 23:11:14 UTC (rev 11322)
+++ trunk/maven-debian-helper/bin/mh_make 2009-12-30 23:14:58 UTC (rev 11323)
@@ -1,6 +1,6 @@
#!/bin/bash -e
-MH_VERSION=0.6
+MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
. /usr/share/maven-repo-helper/mh_lib.sh
syntax()
@@ -12,6 +12,10 @@
echo -e "Options:"
echo -e "\t-h --help: show this text"
echo -e "\t-V --version: show the version"
+ echo -e "\t--from-svn=<svn url>: download the source code from the SVN"
+ echo -e "\t repository before building the Debian packaging. Use a tagged"
+ echo -e "\t branch of the source code, for example"
+ echo -e "\t http://svn.apache.org/repos/asf/felix/releases/org.osgi.core-1.2.0/"
echo -e "\t-p<package> --package=<package>: name of the source package"
echo -e "\t-b<package> --bin-package=<package>: name of the binary package"
echo -e "\t-t<true|false> --run-tests=<true|false>: include or not the tests"
@@ -22,7 +26,7 @@
exit 1
}
-ARGS="p package b bin-package t run-tests d javadoc a ant v verbose" parseargs "$@"
+ARGS="p package b bin-package t run-tests d javadoc a ant v verbose from-svn" parseargs "$@"
if [ -z "$DEBFULLNAME" ]; then
echo "Please define the environment variable DEBFULLNAME, e.g."
@@ -46,9 +50,13 @@
RUN_TESTS=$(getarg t run-tests)
GEN_JAVADOC=$(getarg d javadoc)
ANT=$(getarg a ant)
+FROM_SVN=$(getarg from-svn)
if [ -z "$PACKAGE" ]; then
PACKAGE="$(basename $(pwd))"
+ if [ -n "$FROM_SVN" ]; then
+ PACKAGE=$(basename $FROM_SVN | sed 's/-[0-9].*//' )
+ fi
echo "Enter the name of the new Debian source package. If empty, it will defaults to $PACKAGE"
read -p ">" USER_PACKAGE
if [ -n "$USER_PACKAGE" ]; then
@@ -83,6 +91,11 @@
fi
fi
+if [ -n "$FROM_SVN" ]; then
+ svn export $FROM_SVN $PACKAGE
+ cd $PACKAGE
+fi
+
if [ ! -e debian/${BIN_PACKAGE}.substvars ]; then
java -cp /usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar org.debian.maven.packager.DependenciesSolver --package="$BIN_PACKAGE" ${ANT:--ant} --maven-repo=/usr/share/maven-repo
fi
@@ -93,7 +106,7 @@
mh_patchpoms -p$BIN_PACKAGE --keep-pom-version
-mvn org.debian.maven:maven-packager-utils:$MH_VERSION:generate -Demail="$DEBEMAIL" -Dpackager="$DEBFULLNAME" -DpackagerLicense="$DEBLICENSE" -Dpackage="$PACKAGE" -Dbin.package="$BIN_PACKAGE" -DrunTests="$RUN_TESTS" -DgenerateJavadoc="$GEN_JAVADOC" -Dmaven.repo.local=/usr/share/maven-repo ${ANT:+-DpackageType=ant} --offline
+mvn org.debian.maven:maven-packager-utils:$MH_VERSION:generate -Demail="$DEBEMAIL" -Dpackager="$DEBFULLNAME" -DpackagerLicense="$DEBLICENSE" -Dpackage="$PACKAGE" -Dbin.package="$BIN_PACKAGE" -DrunTests="$RUN_TESTS" -DgenerateJavadoc="$GEN_JAVADOC" -Dmaven.repo.local=/usr/share/maven-repo ${ANT:+-DpackageType=ant} ${FROM_SVN:+-DdownloadUrl=scm:svn:$FROM_SVN} --offline
rm -f debian/*.substvars
Modified: trunk/maven-debian-helper/bin/mh_resolve_dependencies
===================================================================
--- trunk/maven-debian-helper/bin/mh_resolve_dependencies 2009-12-30 23:11:14 UTC (rev 11322)
+++ trunk/maven-debian-helper/bin/mh_resolve_dependencies 2009-12-30 23:14:58 UTC (rev 11323)
@@ -1,6 +1,6 @@
#!/bin/bash
-MH_VERSION=0.6
+MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
. /usr/share/maven-repo-helper/mh_lib.sh
syntax()
Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog 2009-12-30 23:11:14 UTC (rev 11322)
+++ trunk/maven-debian-helper/debian/changelog 2009-12-30 23:14:58 UTC (rev 11323)
@@ -1,11 +1,21 @@
-maven-debian-helper (0.7) UNRELEASED; urgency=low
+maven-debian-helper (0.7) unstable; urgency=low
+ [Ludovic Claude]
+ * Make the package more version agnostic. Versions are discovered
+ at runtime
+ * mh_make has a new option, --from-svn, to download automatically
+ the sources from a SVN repository and generate the Debian packaging
+ for the project.
+ * Add apt-file to Recommends: as it's used by mh_lspoms
+ (Closes: #542511)
+
+ [Michael Koch]
* Add Recommends: apt-file to maven-debian-helper (Closes: #542511).
* Build-Depends on debhelper (>= 7).
* Added myself to Uploaders.
* Updated Standards-Version to 3.8.3.
- -- Michael Koch <konqueror at gmx.de> Wed, 04 Nov 2009 17:19:08 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net> Thu, 17 Dec 2009 20:09:00 +0100
maven-debian-helper (0.6) unstable; urgency=low
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm 2009-12-30 23:11:14 UTC (rev 11322)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm 2009-12-30 23:14:58 UTC (rev 11323)
@@ -18,8 +18,7 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps#if (!$buildJars.isEmpty()) #end
-#printJars($buildJars)
+DEB_JARS := ant-nodeps #if (!$buildJars.isEmpty()) #printJars($buildJars)#end $space
DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
#if ($generateJavadoc)
Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2009-12-30 23:11:14 UTC (rev 11322)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2009-12-30 23:14:58 UTC (rev 11323)
@@ -34,7 +34,7 @@
# nonstandard Maven installations.
MAVEN_HOME = /usr/share/maven2
-MAVEN_DEBIAN_VERSION = 0.6
+MAVEN_DEBIAN_VERSION = $(shell ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
# The home directory of the Java Runtime Environment (JRE) or Java Development
# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2009-12-30 23:11:14 UTC (rev 11322)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2009-12-30 23:14:58 UTC (rev 11323)
@@ -2,6 +2,7 @@
# Copyright © 2003 Stefan Gybas <sgybas at debian.org>
# Copyright © 2008 Torsten Werner <twerner at debian.org>
+# Copyright © 2009 Ludovic Claude <ludovic.claude at laposte.net>
# Description: Builds and cleans packages which have an Maven pom.xml file
#
# This program is free software; you can redistribute it and/or
More information about the pkg-java-commits
mailing list