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

[Guillaume Alaux]

    Date: Wednesday, March 13, 2013 @ 23:22:37
  Author: guillaume
Revision: 179994

upgpkg: apache-ant 1.9.0-1

Upstream release

Modified:
  apache-ant/trunk/PKGBUILD

----------+
 PKGBUILD |   74 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-13 21:40:20 UTC (rev 179993)
+++ PKGBUILD	2013-03-13 22:22:37 UTC (rev 179994)
@@ -3,62 +3,72 @@
 # Contributor: Andrew Wright <andreww at photism.org>
 # Contributor: Paul Mattal <paul at archlinux.org>
 pkgname=apache-ant
-pkgver=1.8.4
+pkgver=1.9.0
 pkgrel=1
-pkgdesc="A java-based build tool"
+pkgdesc='A java-based build tool'
 arch=('any')
-url="http://ant.apache.org/"
+url='http://ant.apache.org/'
 license=('APACHE')
 depends=('java-environment')
-makedepends=('java-environment' 'xalan-java' 'junit' 'apache-ant')
-optdepends=('junit: to jave junit on the classpath in javac tasks')
-#http://apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
-source=(http://apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+makedepends=('java-environment' 'apache-ant' 'junit')
+optdepends=('junit: to use the junit tasks')
+source=(http://apache.org/dist/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh
         ${pkgname}.csh)
-md5sums=('561838e665e5dc185dde9d220fce1336'
-         'dbfa1e8dd4bab2f5821f5abe50835c83'
-         'b3f67824043b6fb00667bb7a4007af42')
+sha256sums=('92d21bae9f739388b06087d322fa970945fa7e50ebd720ce4451e84a1f92bbc8'
+            '182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
+            '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995')
 
 _ant_home=/usr/share/${pkgname}
 
-#build() {
-#  cd "${srcdir}/${pkgname}-${pkgver}"
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-#  ant -Ddest=optional -f fetch.xml
+  ant -Ddest=optional -f fetch.xml
 
-#  ln -s /usr/share/java/junit.jar lib/optional/junit.jar
-#  ./bootstrap.sh
+  rm lib/optional/junit-4.11.jar
+  ln -s /usr/share/java/junit.jar lib/optional/junit-4.11.jar
+  rm lib/optional/hamcrest-core-1.3.jar
+  ln -s /usr/share/java/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar
 
-#  mkdir ${srcdir}/.m2
-#  ./bootstrap/bin/ant -Ddest=optional -Ddest.dir=${srcdir}/.m2 -f fetch.xml
-#  ./bootstrap/bin/ant -f fetch.xml -nouserlib -Ddest=optional
+  ant dist
+}
 
-#  sh build.sh dist
-
-#  ant dist
+#check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+#
+#  ant test
 #}
 
 package() {
-#  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}"
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}"
 
-  install -dm755 ${pkgdir}/${_ant_home}/bin
-  cp -Rp etc ${pkgdir}/${_ant_home}
-  find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
-    -exec install -m755 {} ${pkgdir}/${_ant_home}/bin \;
+  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}
+
+  install -dm755 ${pkgdir}${_ant_home}/bin
+  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 ${pkgdir}/usr/share/java/${pkgname}
-  install -m644 lib/*.jar ${pkgdir}/usr/share/java/${pkgname}
-  ln -s /usr/share/java/${pkgname} ${pkgdir}/${_ant_home}/lib
-
-  # Symlink to junit so it's on the javac build path
+  install -m644 lib/*.jar \
+                ../lib/optional/*.jar \
+                ${pkgdir}/usr/share/java/${pkgname}
+  ln -s /usr/share/java/${pkgname} ${pkgdir}${_ant_home}/lib
+  # Provided
   # http://bugs.archlinux.org/task/15229
-  # http://ant.apache.org/manual/install.html#optionalTasks
+  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/
 
   # fix python2 path
   sed -i 's|/usr/bin/python|/usr/bin/python2|' ${pkgdir}${_ant_home}/bin/runant.py