summaryrefslogtreecommitdiff
path: root/java/apache-ant
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-07-12 22:53:11 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-07-12 22:53:11 -0300
commite14736ca7ac051726b587d8fdb8368be502a9109 (patch)
tree6a40b3b2de9bf45e8f31ba5fd45ee8f2615bd4ae /java/apache-ant
parente6e169990bdfc35fb6151f148510bf3f0da1dc1e (diff)
parent360a407f262ac47087ff29718465fbfc7765cb73 (diff)
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'java/apache-ant')
-rw-r--r--java/apache-ant/PKGBUILD56
1 files changed, 34 insertions, 22 deletions
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index 77e0dfe94..dfda3c28d 100644
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -3,52 +3,55 @@
# Contributor: Andrew Wright <andreww@photism.org>
pkgname=apache-ant
-pkgver=1.8.4
+pkgver=1.9.1
+pkgdesc="A Java-based build tool"
+license=('Apache' 'custom:BSD3')
+url="http://ant.apache.org/"
provides=("apache-ant-libre=$pkgver")
replaces=("apache-ant-libre")
conflicts=("apache-ant-libre")
-pkgrel=1.1
-pkgdesc="A Java-based build tool"
+pkgrel=3
arch=('any')
-license=('Apache')
-url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('jh')
+
_mirror=http://archive.apache.org/dist
source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
${pkgname}.sh ${pkgname}.csh)
-depends=('java-environment')
# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
declare -A _opts
_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
_opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
-_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar'
+_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
+_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::bsf.jar'
#_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
_opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar'
+_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
_opts[jython]='Python with <script> task;/opt/jython/jython.jar'
#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar'
+_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
+_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
+_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
+_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
+_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
+_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
for pkg in "${!_opts[@]}"; do
optdepends+=("$pkg: ${_opts[$pkg]%;*}")
makedepends+=("$pkg")
+ _jars+="${_opts[$pkg]#*;} "
done
build() {
@@ -59,9 +62,9 @@ build() {
mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin
cd "${srcdir}"/${pkgname}-${pkgver}
- # Symlink to external optional libraries
- for jar in ${_opts[@]#*;}; do
- ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
+ # Symlink to external optional libraries/
+ for jar in $_jars; do
+ ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}`
done
# Build
source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var
@@ -87,8 +90,8 @@ package() {
# Fix python2 path
sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
# Symlink to external optional libraries
- for jar in ${_opts[@]#*;}; do
- ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}`
+ for jar in $_jars; do
+ ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}`
done
## Symlink the /opt distribution to the normal places
@@ -96,15 +99,24 @@ package() {
install -d "${pkgdir}"/usr/share/doc/${pkgname}
install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+ cd "${pkgdir}"/${ANT_HOME}/lib
+ for pom in *.pom; do
+ a=${pom%.pom}
+ base=$(jh mvn-basename org.apache.ant $a $pkgver)
+ install -d "${pkgdir}${base%/*}"
+ ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
+ ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+ done
+
cd "${pkgdir}"/${ANT_HOME}
for prog in bin/*; do
- ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+ ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
done
ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
}
-md5sums=('c474fa9d0c35a24037c23b6e476862c1'
+md5sums=('39771fd8b4ba87cd77ff6f27001cce4e'
'bd63c881be406f515fc4d22635e8326a'
'aaa615512cbe1ed7f3b62c1ff46802f8')