[arch-commits] Commit in apache-ant/repos/extra-any (8 files)
Guillaume Alaux
guillaume at archlinux.org
Wed Mar 7 20:43:31 UTC 2012
Date: Wednesday, March 7, 2012 @ 15:43:30
Author: guillaume
Revision: 152656
archrelease: copy trunk to extra-any
Added:
apache-ant/repos/extra-any/PKGBUILD
(from rev 152655, apache-ant/trunk/PKGBUILD)
apache-ant/repos/extra-any/ant_diagnostics.patch
(from rev 152655, apache-ant/trunk/ant_diagnostics.patch)
apache-ant/repos/extra-any/apache-ant.csh
(from rev 152655, apache-ant/trunk/apache-ant.csh)
apache-ant/repos/extra-any/apache-ant.sh
(from rev 152655, apache-ant/trunk/apache-ant.sh)
Deleted:
apache-ant/repos/extra-any/PKGBUILD
apache-ant/repos/extra-any/ant_diagnostics.patch
apache-ant/repos/extra-any/apache-ant.csh
apache-ant/repos/extra-any/apache-ant.sh
-----------------------+
PKGBUILD | 107 ++++++++++++++++++++++++------------------------
ant_diagnostics.patch | 46 ++++++++++----------
apache-ant.csh | 4 -
apache-ant.sh | 6 +-
4 files changed, 82 insertions(+), 81 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2012-03-07 20:39:49 UTC (rev 152655)
+++ PKGBUILD 2012-03-07 20:43:30 UTC (rev 152656)
@@ -1,53 +0,0 @@
-# $Id$
-# Contributor: Andrew Wright <andreww at photism.org>
-# Maintainer: Paul Mattal <paul at archlinux.org>
-
-pkgname=apache-ant
-pkgver=1.8.2
-pkgrel=2
-pkgdesc="A java-based build tool"
-arch=('any')
-license=('APACHE')
-url="http://ant.apache.org/"
-depends=('java-environment')
-optdepends=('junit: to jave junit on the classpath in javac tasks')
-source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
- ${pkgname}.sh ${pkgname}.csh
- ant_diagnostics.patch)
-md5sums=('9e9ae9fc7352960191489a1286fb0928'
- '593ee6ebd9b8ec321534a028e686880f'
- '475b684eb8202c09cbb51496cd8ee1e0'
- 'cbaab423be40a6e63f0fde901b91eb50')
-
-package() {
- # install profile.d script
- install -dm755 "${pkgdir}"/etc/profile.d
- install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
-
- # Get the ANT_HOME env var
- source "${srcdir}"/${pkgname}.sh
-
- cd "${srcdir}"/${pkgname}-${pkgver}
- install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
-
- install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
- cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
-
- # Do not copy Windows .bat/.cmd files
- find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
- -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
-
- # symlink to junit so it's on the javac build path for ant
- # matches behavior on ubuntu 9 and makes sense for compatibility
- # http://bugs.archlinux.org/task/15229
- ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
-
- # fix python2 path
- sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
-
- # The license says the NOTICE file should be redistributed for derivative
- # works, so lets supply it.
- 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 152655, apache-ant/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2012-03-07 20:43:30 UTC (rev 152656)
@@ -0,0 +1,54 @@
+# $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.8.3
+pkgrel=1
+pkgdesc="A java-based build tool"
+arch=('any')
+license=('APACHE')
+url="http://ant.apache.org/"
+depends=('java-environment')
+optdepends=('junit: to jave junit on the classpath in javac tasks')
+source=(http://archive.apache.org/dist/ant/binaries/${pkgname}-${pkgver}-bin.tar.bz2
+ ${pkgname}.sh ${pkgname}.csh
+ ant_diagnostics.patch)
+md5sums=('f5959aff4ab061cac37ff1f84f3b874a'
+ '593ee6ebd9b8ec321534a028e686880f'
+ '475b684eb8202c09cbb51496cd8ee1e0'
+ 'cbaab423be40a6e63f0fde901b91eb50')
+
+package() {
+ # install profile.d script
+ install -dm755 "${pkgdir}"/etc/profile.d
+ install -m755 "${srcdir}"/${pkgname}.{csh,sh} "${pkgdir}"/etc/profile.d/
+
+ # Get the ANT_HOME env var
+ source "${srcdir}"/${pkgname}.sh
+
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ install -dm755 "${pkgdir}"/${ANT_HOME}/{bin,lib}
+
+ install -m644 ./lib/*.jar "${pkgdir}"/${ANT_HOME}/lib
+ cp -Rp ./etc "${pkgdir}"/${ANT_HOME}
+
+ # Do not copy Windows .bat/.cmd files
+ find ./bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+ -exec install -m755 {} "${pkgdir}"/${ANT_HOME}/bin \;
+
+ # symlink to junit so it's on the javac build path for ant
+ # matches behavior on ubuntu 9 and makes sense for compatibility
+ # http://bugs.archlinux.org/task/15229
+ ln -sf /usr/share/java/junit.jar "${pkgdir}"/usr/share/java/apache-ant/lib/
+
+ # fix python2 path
+ sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/usr/share/java/apache-ant/bin/runant.py
+
+ # The license says the NOTICE file should be redistributed for derivative
+ # works, so lets supply it.
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
+ install -m644 LICENSE NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}
+}
Deleted: ant_diagnostics.patch
===================================================================
--- ant_diagnostics.patch 2012-03-07 20:39:49 UTC (rev 152655)
+++ ant_diagnostics.patch 2012-03-07 20:43:30 UTC (rev 152656)
@@ -1,23 +0,0 @@
---- a/src/main/org/apache/tools/ant/Diagnostics.java
-+++ b/src/main/org/apache/tools/ant/Diagnostics.java
-@@ -179,7 +179,10 @@
- * @param clazz the class to get the information from.
- * @since Ant 1.8.0
- */
-- private static URL getClassLocation(Class clazz) {
-+ private static URL getClassLocation(Class clazz) {
-+ if (clazz.getProtectionDomain().getCodeSource() == null) {
-+ return null;
-+ }
- return clazz.getProtectionDomain().getCodeSource().getLocation();
- }
-
-@@ -241,7 +244,7 @@
- }
- Transformer transformer = null;
- try {
-- transformer = transformerFactory.newTransformer();
-+ transformer = transformerFactory.newTransformer();
- } catch (Exception e) {
- // ignore
- ignoreThrowable(e);
Copied: apache-ant/repos/extra-any/ant_diagnostics.patch (from rev 152655, apache-ant/trunk/ant_diagnostics.patch)
===================================================================
--- ant_diagnostics.patch (rev 0)
+++ ant_diagnostics.patch 2012-03-07 20:43:30 UTC (rev 152656)
@@ -0,0 +1,23 @@
+--- a/src/main/org/apache/tools/ant/Diagnostics.java
++++ b/src/main/org/apache/tools/ant/Diagnostics.java
+@@ -179,7 +179,10 @@
+ * @param clazz the class to get the information from.
+ * @since Ant 1.8.0
+ */
+- private static URL getClassLocation(Class clazz) {
++ private static URL getClassLocation(Class clazz) {
++ if (clazz.getProtectionDomain().getCodeSource() == null) {
++ return null;
++ }
+ return clazz.getProtectionDomain().getCodeSource().getLocation();
+ }
+
+@@ -241,7 +244,7 @@
+ }
+ Transformer transformer = null;
+ try {
+- transformer = transformerFactory.newTransformer();
++ transformer = transformerFactory.newTransformer();
+ } catch (Exception e) {
+ // ignore
+ ignoreThrowable(e);
Deleted: apache-ant.csh
===================================================================
--- apache-ant.csh 2012-03-07 20:39:49 UTC (rev 152655)
+++ apache-ant.csh 2012-03-07 20:43:30 UTC (rev 152656)
@@ -1,2 +0,0 @@
-setenv ANT_HOME /usr/share/java/apache-ant
-setenv PATH ${PATH}:${ANT_HOME}/bin
Copied: apache-ant/repos/extra-any/apache-ant.csh (from rev 152655, apache-ant/trunk/apache-ant.csh)
===================================================================
--- apache-ant.csh (rev 0)
+++ apache-ant.csh 2012-03-07 20:43:30 UTC (rev 152656)
@@ -0,0 +1,2 @@
+setenv ANT_HOME /usr/share/java/apache-ant
+setenv PATH ${PATH}:${ANT_HOME}/bin
Deleted: apache-ant.sh
===================================================================
--- apache-ant.sh 2012-03-07 20:39:49 UTC (rev 152655)
+++ apache-ant.sh 2012-03-07 20:43:30 UTC (rev 152656)
@@ -1,3 +0,0 @@
-export ANT_HOME=/usr/share/java/apache-ant
-export PATH=$PATH:$ANT_HOME/bin
-
Copied: apache-ant/repos/extra-any/apache-ant.sh (from rev 152655, apache-ant/trunk/apache-ant.sh)
===================================================================
--- apache-ant.sh (rev 0)
+++ apache-ant.sh 2012-03-07 20:43:30 UTC (rev 152656)
@@ -0,0 +1,3 @@
+export ANT_HOME=/usr/share/java/apache-ant
+export PATH=$PATH:$ANT_HOME/bin
+
More information about the arch-commits
mailing list