[arch-commits] Commit in apache-ant/repos/extra-any (12 files)

Guillaume Alaux guillaume at archlinux.org
Sat Oct 4 12:20:28 UTC 2014


    Date: Saturday, October 4, 2014 @ 14:20:28
  Author: guillaume
Revision: 223863

archrelease: copy trunk to extra-any

Added:
  apache-ant/repos/extra-any/PKGBUILD
    (from rev 223862, apache-ant/trunk/PKGBUILD)
  apache-ant/repos/extra-any/ant.conf
    (from rev 223862, apache-ant/trunk/ant.conf)
  apache-ant/repos/extra-any/apache-ant.csh
    (from rev 223862, apache-ant/trunk/apache-ant.csh)
  apache-ant/repos/extra-any/apache-ant.install
    (from rev 223862, apache-ant/trunk/apache-ant.install)
  apache-ant/repos/extra-any/apache-ant.sh
    (from rev 223862, apache-ant/trunk/apache-ant.sh)
  apache-ant/repos/extra-any/bin_ant
    (from rev 223862, apache-ant/trunk/bin_ant)
Deleted:
  apache-ant/repos/extra-any/PKGBUILD
  apache-ant/repos/extra-any/ant.conf
  apache-ant/repos/extra-any/apache-ant.csh
  apache-ant/repos/extra-any/apache-ant.install
  apache-ant/repos/extra-any/apache-ant.sh
  apache-ant/repos/extra-any/bin_ant

--------------------+
 PKGBUILD           |  166 +++++++++++++++++++++++++++------------------------
 ant.conf           |    8 +-
 apache-ant.csh     |    2 
 apache-ant.install |   22 +++---
 apache-ant.sh      |    2 
 bin_ant            |   12 +--
 6 files changed, 111 insertions(+), 101 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-04 12:19:30 UTC (rev 223862)
+++ PKGBUILD	2014-10-04 12:20:28 UTC (rev 223863)
@@ -1,78 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-pkgname=apache-ant
-pkgver=1.9.4
-pkgrel=2
-pkgdesc='A java-based build tool'
-arch=('any')
-url='http://ant.apache.org/'
-license=('APACHE')
-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
-        ${pkgname}.install
-        bin_ant
-        ant.conf)
-sha256sums=('ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c'
-            '182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
-            '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
-            '3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3'
-            '29b443ae3af7e246b4ff0b5ec9f023ae95992db1a010a362e70ca7a65a6df461'
-            'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb')
-
-_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
-  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
-
-  ant dist
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}"
-
-  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
-
-  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 ${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 ${pkgdir}/usr/share/java/${pkgname}
-  ln -s /usr/share/java/${pkgname} ${pkgdir}${_ant_home}/lib
-
-  # fix python2 path
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' ${pkgdir}${_ant_home}/bin/runant.py
-
-  # install profile.d script
-  install -dm755 ${pkgdir}/etc/profile.d
-  install -m755 "${srcdir}"/${pkgname}.{csh,sh} ${pkgdir}/etc/profile.d/
-
-  # License says NOTICE file should be redistributed for derivative works
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -dm755 ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 LICENSE NOTICE ${pkgdir}/usr/share/licenses/${pkgname}
-}

Copied: apache-ant/repos/extra-any/PKGBUILD (from rev 223862, apache-ant/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-10-04 12:20:28 UTC (rev 223863)
@@ -0,0 +1,88 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+pkgbase=apache-ant
+pkgname=('apache-ant' 'apache-ant-doc')
+pkgver=1.9.4
+pkgrel=3
+arch=('any')
+url='http://ant.apache.org/'
+license=('APACHE')
+makedepends=('java-environment' 'apache-ant' 'junit')
+source=(http://apache.org/dist/ant/source/${pkgbase}-${pkgver}-src.tar.bz2
+        apache-ant.sh
+        apache-ant.csh
+        apache-ant.install
+        bin_ant
+        ant.conf)
+sha256sums=('ac594ff7dcd461ebb3e607493af7682f84b1ceaa0621e17ec6367b8d2c410a1c'
+            '182b9212610790966d3a018d3cbab2e5327dd9fd11dc15dd1f377853216f5718'
+            '919a3ab1acae1d0d190fe6e0034b00975caab40e55359a720bfccd098fe2d995'
+            '3de451d0f963ba96e83f4e068a8325e3d4fc42b1e5c4818e9d7962ed4f5393b3'
+            '29b443ae3af7e246b4ff0b5ec9f023ae95992db1a010a362e70ca7a65a6df461'
+            'b86ce60f61cbd85a9faa61d698b0fc4607f1ff375cd15673aee57f053012eacb')
+
+_ant_home=/usr/share/${pkgbase}
+
+build() {
+  cd "${srcdir}/${pkgbase}-${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
+  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
+
+  ant dist
+}
+
+package_apache-ant() {
+  pkgdesc='A java-based build tool'
+  depends=('java-environment')
+  optdepends=('junit: to use the junit tasks')
+  install=apache-ant.install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}"
+
+  install -dm755 "${pkgdir}${_ant_home}"
+
+  install -dm755 "${pkgdir}/etc/${pkgbase}"
+  cp -Rp etc/* "${pkgdir}/etc/${pkgbase}"
+  rm "${pkgdir}/etc/${pkgbase}/ant-bootstrap.jar"
+  ln -s /etc/${pkgbase} "${pkgdir}${_ant_home}/etc"
+
+  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 "${srcdir}/bin_ant"  "${pkgdir}/usr/bin/ant"
+  install -Dm644 "${srcdir}/ant.conf" "${pkgdir}/etc/apache-ant/ant.conf"
+
+  install -dm755 "${pkgdir}/usr/share/java/${pkgbase}"
+  install -m644 lib/*.jar "${pkgdir}/usr/share/java/${pkgbase}"
+  ln -s /usr/share/java/${pkgbase} "${pkgdir}${_ant_home}/lib"
+
+  # fix python2 path
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}${_ant_home}/bin/runant.py"
+
+  # install profile.d script
+  install -dm755 "${pkgdir}/etc/profile.d"
+  install -m755 "${srcdir}"/apache-ant.{csh,sh} "${pkgdir}/etc/profile.d/"
+
+  # License says NOTICE file should be redistributed for derivative works
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  install -dm755 "${pkgdir}/usr/share/licenses/${pkgbase}"
+  install -m644 LICENSE NOTICE "${pkgdir}/usr/share/licenses/${pkgbase}"
+}
+
+package_apache-ant-doc() {
+  pkgdesc='Apache Ant build tool documentation'
+
+  install -dm755 "${pkgdir}/usr/share/doc/${pkgbase}"
+  cp -r "${srcdir}"/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}/manual/* \
+    "${pkgdir}/usr/share/doc/${pkgbase}/"
+}

Deleted: ant.conf
===================================================================
--- ant.conf	2014-10-04 12:19:30 UTC (rev 223862)
+++ ant.conf	2014-10-04 12:20:28 UTC (rev 223863)
@@ -1,4 +0,0 @@
-# Apache Ant start script configuration file
-
-# Optional jars and their dependencies
-OPT_JAR_LIST=/usr/share/java/junit.jar

Copied: apache-ant/repos/extra-any/ant.conf (from rev 223862, apache-ant/trunk/ant.conf)
===================================================================
--- ant.conf	                        (rev 0)
+++ ant.conf	2014-10-04 12:20:28 UTC (rev 223863)
@@ -0,0 +1,4 @@
+# Apache Ant start script configuration file
+
+# Optional jars and their dependencies
+OPT_JAR_LIST=/usr/share/java/junit.jar

Deleted: apache-ant.csh
===================================================================
--- apache-ant.csh	2014-10-04 12:19:30 UTC (rev 223862)
+++ apache-ant.csh	2014-10-04 12:20:28 UTC (rev 223863)
@@ -1 +0,0 @@
-setenv ANT_HOME /usr/share/apache-ant

Copied: apache-ant/repos/extra-any/apache-ant.csh (from rev 223862, apache-ant/trunk/apache-ant.csh)
===================================================================
--- apache-ant.csh	                        (rev 0)
+++ apache-ant.csh	2014-10-04 12:20:28 UTC (rev 223863)
@@ -0,0 +1 @@
+setenv ANT_HOME /usr/share/apache-ant

Deleted: apache-ant.install
===================================================================
--- apache-ant.install	2014-10-04 12:19:30 UTC (rev 223862)
+++ apache-ant.install	2014-10-04 12:20:28 UTC (rev 223863)
@@ -1,11 +0,0 @@
-post_install() {
-  # Small fix after mistake in previous package version
-  if [ -e /usr/share/apache-ant/etc/apache-ant ]
-  then
-    unlink /usr/share/apache-ant/etc/apache-ant
-  fi
-}
-
-post_upgrade() {
-  post_install
-}

Copied: apache-ant/repos/extra-any/apache-ant.install (from rev 223862, apache-ant/trunk/apache-ant.install)
===================================================================
--- apache-ant.install	                        (rev 0)
+++ apache-ant.install	2014-10-04 12:20:28 UTC (rev 223863)
@@ -0,0 +1,11 @@
+post_install() {
+  # Small fix after mistake in previous package version
+  if [ -e /usr/share/apache-ant/etc/apache-ant ]
+  then
+    unlink /usr/share/apache-ant/etc/apache-ant
+  fi
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: apache-ant.sh
===================================================================
--- apache-ant.sh	2014-10-04 12:19:30 UTC (rev 223862)
+++ apache-ant.sh	2014-10-04 12:20:28 UTC (rev 223863)
@@ -1 +0,0 @@
-export ANT_HOME=/usr/share/apache-ant

Copied: apache-ant/repos/extra-any/apache-ant.sh (from rev 223862, apache-ant/trunk/apache-ant.sh)
===================================================================
--- apache-ant.sh	                        (rev 0)
+++ apache-ant.sh	2014-10-04 12:20:28 UTC (rev 223863)
@@ -0,0 +1 @@
+export ANT_HOME=/usr/share/apache-ant

Deleted: bin_ant
===================================================================
--- bin_ant	2014-10-04 12:19:30 UTC (rev 223862)
+++ bin_ant	2014-10-04 12:20:28 UTC (rev 223863)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-. /etc/apache-ant/ant.conf
-
-export LOCALCLASSPATH=${OPT_JAR_LIST}
-/usr/share/apache-ant/bin/ant "$@"

Copied: apache-ant/repos/extra-any/bin_ant (from rev 223862, apache-ant/trunk/bin_ant)
===================================================================
--- bin_ant	                        (rev 0)
+++ bin_ant	2014-10-04 12:20:28 UTC (rev 223863)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. /etc/apache-ant/ant.conf
+
+export LOCALCLASSPATH=${OPT_JAR_LIST}
+/usr/share/apache-ant/bin/ant "$@"



More information about the arch-commits mailing list