[arch-commits] Commit in apache-ant/trunk (PKGBUILD apache-ant.install)

[Guillaume Alaux]

    Date: Thursday, May 23, 2013 @ 21:50:05
  Author: guillaume
Revision: 186283

Upstream release

Added:
  apache-ant/trunk/apache-ant.install
Modified:
  apache-ant/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   22 +++++++++++++---------
 apache-ant.install |    7 +++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-23 19:15:33 UTC (rev 186282)
+++ PKGBUILD	2013-05-23 19:50:05 UTC (rev 186283)
@@ -3,7 +3,7 @@
 # Contributor: Andrew Wright <andreww at photism.org>
 # Contributor: Paul Mattal <paul at archlinux.org>
 pkgname=apache-ant
-pkgver=1.9.0
+pkgver=1.9.1
 pkgrel=1
 pkgdesc='A java-based build tool'
 arch=('any')
@@ -12,18 +12,23 @@
 depends=('java-environment')
 makedepends=('java-environment' 'apache-ant' 'junit')
 optdepends=('junit: to use the junit tasks')
+install=${pkgname}.install
 source=(http://apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh
-        ${pkgname}.csh)
-sha256sums=('92d21bae9f739388b06087d322fa970945fa7e50ebd720ce4451e84a1f92bbc8'
+        ${pkgname}.csh
+        ${pkgname}.install)
+sha256sums=('550473e1a64b99e6cfa9ba6b9c142318bd1ea0d902e7ba7b33389528a0c1d113'
             '182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
-            '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995')
+            '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
+            '8219443864c2e199e679b2f5521162244fb605732d912a51991ee28e476da907')
 
 _ant_home=/usr/share/${pkgname}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # ant needs HOME to download libs to $HOME/.m2/repository
+  export ANT_OPTS="-Duser.home=${srcdir}"
   ant -Ddest=optional -f fetch.xml
 
   rm lib/optional/junit-4.11.jar
@@ -36,7 +41,6 @@
 
 #check() {
 #  cd "${srcdir}/${pkgname}-${pkgver}"
-#
 #  ant test
 #}
 
@@ -46,10 +50,10 @@
   install -dm755 ${pkgdir}${_ant_home}
 
   install -dm755 ${pkgdir}/etc/${pkgname}
-#  cp -Rp etc/* ${pkgdir}/etc/${pkgname}
-#  rm ${pkgdir}/etc/${pkgname}/ant-bootstrap.jar
-#  ln -s /etc/${pkgname} ${pkgdir}${_ant_home}/etc
-  cp -Rp etc ${pkgdir}/usr/share/${pkgname}
+  cp -Rp etc/* ${pkgdir}/etc/${pkgname}
+  rm ${pkgdir}/etc/${pkgname}/ant-bootstrap.jar
+  # Done in .install for now
+  #ln -s /etc/${pkgname} ${pkgdir}${_ant_home}/etc
 
   install -dm755 ${pkgdir}${_ant_home}/bin
   find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \

Added: apache-ant.install
===================================================================
--- apache-ant.install	                        (rev 0)
+++ apache-ant.install	2013-05-23 19:50:05 UTC (rev 186283)
@@ -0,0 +1,7 @@
+post_install() {
+  ln -s /etc/apache-ant /usr/share/apache-ant/etc
+}
+
+post_upgrade() {
+  post_install
+}