[ant] 08/17: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Jan 12 14:39:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit 2cb8c3c42abe09b5981ab788ce5c0be35f13db8c
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jan 12 14:07:21 2017 +0100
Build with the DH sequencer instead of CDBS
---
debian/changelog | 1 +
debian/control | 1 -
debian/rules | 68 ++++++++++++++++++++++----------------------------------
3 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93216ad..7120bc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ant (1.9.8-2) UNRELEASED; urgency=medium
* Team upload.
+ * Build with the DH sequencer instead of CDBS
* Removed activation.jar and inetlib.jar from the build classpath
* Fixed a typo in the man pages
* Removed 0006-fix-ANT_HOME-path.patch (not required)
diff --git a/debian/control b/debian/control
index 8cbed92..fb8bbb2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders: Matthias Klose <doko at debian.org>,
James Page <james.page at canonical.com>,
Emmanuel Bourg <ebourg at apache.org>
Build-Depends: antlr,
- cdbs (>= 0.4.8),
debhelper (>= 10),
default-jdk,
gcj-native-helper,
diff --git a/debian/rules b/debian/rules
index d52fa17..bd1fef6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,4 @@
#!/usr/bin/make -f
-# debian/rules file for ant (uses cdbs)
-
-#export DH_VERBOSE=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
# hardening
export AOT_GCJFLAGS=$(shell dpkg-buildflags --get CFLAGS)
@@ -23,14 +18,16 @@ export BOOTJAVAC_OPTS=-source 1.5 -target 1.5 -nowarn
# needed for building with bootstrap ant
export ANT_HOME := bootstrap
-VERSION := $(DEB_UPSTREAM_VERSION)
+VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*//')
DATE := $(shell dpkg-parsechangelog --show-field Date)
TODAY := $(shell date --date='$(DATE)' --utc +'%B %-d %Y')
DEPENDENCIES := antlr bcel bsf commons-logging javax.mail jdepend junit junit4 hamcrest-core log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch
-build-ant: stamp-build-ant
-stamp-build-ant:
+%:
+ dh $@ --with maven-repo-helper
+
+override_dh_auto_configure:
# Link the dependencies in lib/optional
mkdir -p lib/optional
for DEPENDENCY in $(DEPENDENCIES); do \
@@ -42,30 +39,20 @@ stamp-build-ant:
/bin/sh bootstrap.sh
# the rest
/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -propertyfile debian/ant.properties -DTODAY='${TODAY}' jars test-jar
- touch stamp-build-ant
-build-ant-doc: stamp-build-ant-doc
-stamp-build-ant-doc:
+override_dh_auto_build-arch:
+override_dh_auto_build-indep:
/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -propertyfile debian/ant.properties javadocs
- touch $@
-install/ant-doc:: build-ant-doc
- -rm -f manual/LICENSE
+override_dh_installdocs:
+ dh_installdocs --exclude=manual/LICENSE
-install/ant:: build-ant
- dh_install -pant
+override_mh_install:
+ # Override mh_install to install extra links in /usr/share/ant/lib/
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
- mkdir -p debian/ant/usr/share/ant/bin
- install -m 755 src/script/ant debian/ant/usr/share/ant/bin
- install -m 755 src/script/antRun debian/ant/usr/share/ant/bin
- install -m 755 src/script/*.pl debian/ant/usr/share/ant/bin
-install/ant-optional:: build-ant
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
@@ -86,27 +73,24 @@ install/ant-optional:: build-ant
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
-ifeq ($(with_gcj_native),yes)
-install/ant-gcj:: install/ant
- dh_install -pant
- dh_nativejava -pant-gcj
-endif
+override_dh_install-indep:
+ dh_install -i
+ 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
+ mkdir -p debian/ant/usr/share/ant/bin
+ install -m 755 src/script/ant debian/ant/usr/share/ant/bin
+ install -m 755 src/script/antRun debian/ant/usr/share/ant/bin
+ install -m 755 src/script/*.pl debian/ant/usr/share/ant/bin
+
+override_dh_link-arch:
ifeq ($(with_gcj_native),yes)
-install/ant-optional-gcj:: install/ant-optional
- dh_install -pant-optional
+ dh_nativejava -pant-gcj
dh_nativejava -pant-optional-gcj
endif
-clean::
- -rm -f gjdoc_rawcomment.cache
- -rm -rf bin bootstrap build lib/*.jar lib/optional/*.jar
- -rm -f stamp-build-ant
- -rm -f stamp-build-ant-doc
- -rm -rf debian/tmp
- mh_clean
-
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
-
+override_dh_auto_clean:
+ rm -Rf bin build bootstrap lib/optional/*.jar
+get-orig-source:
+ -uscan --download-current-version --force-download --rename --repack --compression xz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git
More information about the pkg-java-commits
mailing list