Date: Sunday, January 19, 2014 @ 18:50:06 Author: guillaume Revision: 204428
FS#37649 - Set ant to use LOCALCLASSPATH for optdeps Added: apache-ant/trunk/ant.conf apache-ant/trunk/bin_ant Modified: apache-ant/trunk/PKGBUILD ----------+ PKGBUILD | 27 ++++++++++----------------- ant.conf | 4 ++++ bin_ant | 6 ++++++ 3 files changed, 20 insertions(+), 17 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-01-19 16:29:00 UTC (rev 204427) +++ PKGBUILD 2014-01-19 17:50:06 UTC (rev 204428) @@ -4,7 +4,7 @@ # Contributor: Paul Mattal <[email protected]> pkgname=apache-ant pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='A java-based build tool' arch=('any') url='http://ant.apache.org/' @@ -16,11 +16,15 @@ source=(http://apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2 ${pkgname}.sh ${pkgname}.csh - ${pkgname}.install) + ${pkgname}.install + bin_ant + ant.conf) sha256sums=('eb9306e8b8322bb09b78cc3d8e288398f9cb657d76ffc61ee3fb175e786e8365' '182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718' '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995' - '37602eb618da3948e4b9334f1641fdc8372543a4014da37f6c5548ced8992fa2') + '37602eb618da3948e4b9334f1641fdc8372543a4014da37f6c5548ced8992fa2' + '0823bf8d512c970f540ccad86045bc6a4a98de8cc036b00a36bd01550ee67b20' + 'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb') _ant_home=/usr/share/${pkgname} @@ -59,24 +63,13 @@ find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ -exec install -m755 {} ${pkgdir}${_ant_home}/bin \; - install -dm755 ${pkgdir}/usr/bin - ln -s ${_ant_home}/bin/ant ${pkgdir}/usr/bin/ant + install -Dm755 ${srcdir}/bin_ant ${pkgdir}/usr/bin/ant + install -Dm644 ${srcdir}/ant.conf ${pkgdir}/etc/apache-ant/ant.conf install -dm755 ${pkgdir}/usr/share/java/${pkgname} - install -m644 lib/*.jar \ - ../lib/optional/*.jar \ - ${pkgdir}/usr/share/java/${pkgname} + install -m644 lib/*.jar ${pkgdir}/usr/share/java/${pkgname} ln -s /usr/share/java/${pkgname} ${pkgdir}${_ant_home}/lib - # Provided - # http://bugs.archlinux.org/task/15229 - rm ${pkgdir}/usr/share/java/${pkgname}/junit-4.11.jar - ln -sf ../junit.jar ${pkgdir}/usr/share/java/apache-ant/ - rm ${pkgdir}/usr/share/java/${pkgname}/hamcrest-core-1.3.jar - ln -sf ../hamcrest-core.jar ${pkgdir}/usr/share/java/apache-ant/ - # Should not be in package - rm ${pkgdir}/usr/share/java/${pkgname}/maven-artifact-ant-*-dep.jar - # fix python2 path sed -i 's|/usr/bin/python|/usr/bin/python2|' ${pkgdir}${_ant_home}/bin/runant.py Added: ant.conf =================================================================== --- ant.conf (rev 0) +++ ant.conf 2014-01-19 17:50:06 UTC (rev 204428) @@ -0,0 +1,4 @@ +# Apache Ant start script configuration file + +# Optional jars and their dependencies +OPT_JAR_LIST=/usr/share/java/junit.jar Added: bin_ant =================================================================== --- bin_ant (rev 0) +++ bin_ant 2014-01-19 17:50:06 UTC (rev 204428) @@ -0,0 +1,6 @@ +#!/bin/sh + +. /etc/apache-ant/ant.conf + +export LOCALCLASSPATH=${OPT_JAR_LIST} +/usr/share/apache-ant/bin/ant $@ Property changes on: apache-ant/trunk/bin_ant ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property
