Author: ebourg-guest
Date: 2014-01-06 22:02:02 +0000 (Mon, 06 Jan 2014)
New Revision: 17641
Modified:
trunk/ant/debian/changelog
trunk/ant/debian/rules
Log:
Remove the version's -SNAPSHOT suffix by setting the version explicitely when
calling mh_installjar instead of altering the original pom files
Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog 2014-01-06 16:31:00 UTC (rev 17640)
+++ trunk/ant/debian/changelog 2014-01-06 22:02:02 UTC (rev 17641)
@@ -4,7 +4,10 @@
* Standards-Version updated to 3.9.5 (no changes)
* Switch to debhelper level 9
* Updated the description of 0008-junit4-replace-assumeFalse.patch
- * debian/rules: Improved the clean target to allow rebuilds
+ * debian/rules:
+ - Improved the clean target to allow rebuilds
+ - Remove the version's -SNAPSHOT suffix by setting the version explicitely
+ when calling mh_installjar instead of altering the original pom files
* Use XZ compression for the upstream tarball
* Documented the -silent flag in the man page (new in Ant 1.9.0)
Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules 2014-01-06 16:31:00 UTC (rev 17640)
+++ trunk/ant/debian/rules 2014-01-06 22:02:02 UTC (rev 17641)
@@ -44,8 +44,6 @@
ln -sf /usr/share/java/xml-apis.jar
$(DEB_BUILDDIR)/bootstrap/lib/xml-apis.jar
ln -sf /usr/share/java/xercesImpl.jar
$(DEB_BUILDDIR)/bootstrap/lib/xercesImpl.jar
/bin/sh bootstrap.sh
- # remove -SNAPSHOT from the versions in the Maven poms
- perl -p -i -e 's/-SNAPSHOT//g' `find src/etc/poms/ -name pom.xml`
# the rest
/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5
-Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile
debian/ant.properties jars test-jar
ln -sf /usr/share/java/xml-apis.jar $(DEB_BUILDDIR)/lib/xml-apis.jar
@@ -62,9 +60,9 @@
install/ant:: build-ant
dh_install -pant
- mh_installpoms -pant --set-version=$(VERSION)
- mh_installjar -pant -l src/etc/poms/ant/pom.xml build/lib/ant.jar
/usr/share/ant/lib/ant.jar
- mh_installjar -pant -l src/etc/poms/ant-launcher/pom.xml
build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
+ mh_installpoms -pant -e$(VERSION)
+ mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant/pom.xml
build/lib/ant.jar /usr/share/ant/lib/ant.jar
+ mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant-launcher/pom.xml
build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
dh_install -pant build/lib/ant-bootstrap.jar /usr/share/ant/etc/
# Installing these files does not work with dh_install because of
# the file permissions
@@ -76,29 +74,29 @@
install/ant-optional:: build-ant
dh_install -pant-optional src/etc/ant-update.xsl /usr/share/ant/etc/
dh_install -pant-optional src/etc/checkstyle /usr/share/ant/etc/
- mh_installpoms -pant-optional --set-version=$(VERSION)
- mh_installjar -pant-optional -l src/etc/poms/ant-antlr/pom.xml
build/lib/ant-antlr.jar /usr/share/ant/lib/ant-antlr.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-apache-bcel/pom.xml
build/lib/ant-apache-bcel.jar /usr/share/ant/lib/ant-apache-bcel.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-apache-bsf/pom.xml
build/lib/ant-apache-bsf.jar /usr/share/ant/lib/ant-apache-bsf.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-apache-log4j/pom.xml
build/lib/ant-apache-log4j.jar /usr/share/ant/lib/ant-apache-log4j.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-apache-oro/pom.xml
build/lib/ant-apache-oro.jar /usr/share/ant/lib/ant-apache-oro.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-apache-regexp/pom.xml
build/lib/ant-apache-regexp.jar /usr/share/ant/lib/ant-apache-regexp.jar
- mh_installjar -pant-optional -l
src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar
/usr/share/ant/lib/ant-apache-resolver.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-apache-xalan2/pom.xml
build/lib/ant-apache-xalan2.jar /usr/share/ant/lib/ant-apache-xalan2.jar
- mh_installjar -pant-optional -l
src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar
/usr/share/ant/lib/ant-commons-logging.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-commons-net/pom.xml
build/lib/ant-commons-net.jar /usr/share/ant/lib/ant-commons-net.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-javamail/pom.xml
build/lib/ant-javamail.jar /usr/share/ant/lib/ant-javamail.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-jdepend/pom.xml
build/lib/ant-jdepend.jar /usr/share/ant/lib/ant-jdepend.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml
build/lib/ant-jmf.jar /usr/share/ant/lib/ant-jmf.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml
build/lib/ant-jsch.jar /usr/share/ant/lib/ant-jsch.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml
build/lib/ant-junit.jar /usr/share/ant/lib/ant-junit.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml
build/lib/ant-swing.jar /usr/share/ant/lib/ant-swing.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-testutil/pom.xml
build/lib/ant-testutil.jar /usr/share/ant/lib/ant-testutil.jar
- mh_installjar -pant-optional -l src/etc/poms/ant-junit4/pom.xml
build/lib/ant-junit4.jar /usr/share/ant/lib/ant-junit4.jar
- #mh_installjar -pant-optional src/etc/poms/ant-jai/pom.xml
ant-jai/build/ant-jai-$(VERSION).jar
- #mh_installjar -pant-optional src/etc/poms/ant-netrexx/pom.xml
ant-netrexx/build/ant-netrexx-$(VERSION).jar
- #mh_installjar -pant-optional src/etc/poms/ant-starteam/pom.xml
ant-starteam/build/ant-starteam-$(VERSION).jar
- #mh_installjar -pant-optional src/etc/poms/ant-weblogic/pom.xml
ant-weblogic/build/ant-weblogic-$(VERSION).jar
+ mh_installpoms -pant-optional -e$(VERSION)
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-antlr/pom.xml build/lib/ant-antlr.jar
/usr/share/ant/lib/ant-antlr.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-bcel/pom.xml build/lib/ant-apache-bcel.jar
/usr/share/ant/lib/ant-apache-bcel.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-bsf/pom.xml build/lib/ant-apache-bsf.jar
/usr/share/ant/lib/ant-apache-bsf.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-log4j/pom.xml build/lib/ant-apache-log4j.jar
/usr/share/ant/lib/ant-apache-log4j.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-oro/pom.xml build/lib/ant-apache-oro.jar
/usr/share/ant/lib/ant-apache-oro.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-regexp/pom.xml build/lib/ant-apache-regexp.jar
/usr/share/ant/lib/ant-apache-regexp.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar
/usr/share/ant/lib/ant-apache-resolver.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-apache-xalan2/pom.xml build/lib/ant-apache-xalan2.jar
/usr/share/ant/lib/ant-apache-xalan2.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar
/usr/share/ant/lib/ant-commons-logging.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-commons-net/pom.xml build/lib/ant-commons-net.jar
/usr/share/ant/lib/ant-commons-net.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-javamail/pom.xml build/lib/ant-javamail.jar
/usr/share/ant/lib/ant-javamail.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-jdepend/pom.xml build/lib/ant-jdepend.jar
/usr/share/ant/lib/ant-jdepend.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-jmf/pom.xml build/lib/ant-jmf.jar
/usr/share/ant/lib/ant-jmf.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-jsch/pom.xml build/lib/ant-jsch.jar
/usr/share/ant/lib/ant-jsch.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-junit/pom.xml build/lib/ant-junit.jar
/usr/share/ant/lib/ant-junit.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-swing/pom.xml build/lib/ant-swing.jar
/usr/share/ant/lib/ant-swing.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-testutil/pom.xml build/lib/ant-testutil.jar
/usr/share/ant/lib/ant-testutil.jar
+ mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-junit4/pom.xml build/lib/ant-junit4.jar
/usr/share/ant/lib/ant-junit4.jar
+ #mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-jai/pom.xml ant-jai/build/ant-jai-$(VERSION).jar
+ #mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-netrexx/pom.xml ant-netrexx/build/ant-netrexx-$(VERSION).jar
+ #mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-starteam/pom.xml ant-starteam/build/ant-starteam-$(VERSION).jar
+ #mh_installjar -pant-optional -l -e$(VERSION)
src/etc/poms/ant-weblogic/pom.xml ant-weblogic/build/ant-weblogic-$(VERSION).jar
ifeq ($(with_gcj_native),yes)
install/ant-gcj:: install/ant
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
