This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit f270545c29a851860445a9f8622b3807368b03c7
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Jan 12 11:18:04 2017 +0100
Link the build dependencies to lib/optional as expected by the build and removed the classpath tweaks
---
debian/changelog | 2 ++
debian/patches/0002-do-not-build-test-jars.patch | 19 -------------------
debian/patches/0007-use-build.classpath.patch | 19 -------------------
debian/patches/series | 2 --
debian/rules | 15 ++++++++++-----
5 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0566ac5..6a3a378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ant (1.9.8-2) UNRELEASED; urgency=medium
* Fixed a typo in the man pages
* Removed 0006-fix-ANT_HOME-path.patch (not required)
* Removed 0008-junit4-replace-assumeFalse.patch
+ * Link the build dependencies to lib/optional as expected by the build
+ and removed the classpath tweaks
-- Emmanuel Bourg <ebourg at apache.org> Wed, 11 Jan 2017 17:46:06 +0100
diff --git a/debian/patches/0002-do-not-build-test-jars.patch b/debian/patches/0002-do-not-build-test-jars.patch
deleted file mode 100644
index 718bf47..0000000
--- a/debian/patches/0002-do-not-build-test-jars.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Thu, 11 Mar 2010 21:50:05 +0100
-Subject: [PATCH] do not build test jars
-
----
- build.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/build.xml
-+++ b/build.xml
-@@ -887,7 +887,7 @@
- ===================================================================
- -->
- <target name="dist-lite"
-- depends="jars,test-jar"
-+ depends="jars"
- description="--> creates a minimum distribution to run Apache Ant">
-
- <mkdir dir="${dist.dir}"/>
diff --git a/debian/patches/0007-use-build.classpath.patch b/debian/patches/0007-use-build.classpath.patch
deleted file mode 100644
index f88f866..0000000
--- a/debian/patches/0007-use-build.classpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Thu, 11 Mar 2010 21:50:13 +0100
-Subject: [PATCH] use ${build.classpath}
-
----
- build.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/build.xml
-+++ b/build.xml
-@@ -129,7 +129,7 @@
- ===================================================================
- -->
- <path id="classpath">
-- <fileset dir="lib/optional" includes="*.jar"/>
-+ <pathelement path="${build.classpath}"/>
- </path>
-
- <path id="tests-classpath">
diff --git a/debian/patches/series b/debian/patches/series
index 77eb504..a74bc14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-0002-do-not-build-test-jars.patch
-0007-use-build.classpath.patch
0009-reproducible-timestamp-task.patch
0010-reproducible-javadoc-task.patch
0011-reproducible-propertyfile-task.patch
diff --git a/debian/rules b/debian/rules
index 01626b5..adf3c42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,24 +28,29 @@ export ANT_HOME := bootstrap
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
-JAR_PATH := /usr/share/java
-CLASSPATH := ${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/javax.mail.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-resolver-1.2.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar:${JAR_PATH}/junit4.jar
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:
+ # Link the dependencies in lib/optional
+ mkdir -p lib/optional
+ for DEPENDENCY in $(DEPENDENCIES); do \
+ ln -s /usr/share/java/$$DEPENDENCY.jar lib/optional/$$DEPENDENCY.jar; \
+ done
+
# doing bootstrapping
install -d bootstrap/lib
/bin/sh bootstrap.sh
# 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 -DTODAY='${TODAY}' jars test-jar
+ /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:
- /bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties javadocs
+ /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
@@ -103,7 +108,7 @@ endif
clean::
-rm -f gjdoc_rawcomment.cache
- -rm -rf bin bootstrap build lib/*.jar
+ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git