Skip to content
Snippets Groups Projects
Commit a387983b authored by Jakub Jirutka's avatar Jakub Jirutka :flag_ua:
Browse files

community/apache-ant: remove "return 1" from abuild

parent 1efc5728
No related branches found
No related tags found
No related merge requests found
...@@ -4,13 +4,12 @@ ...@@ -4,13 +4,12 @@
pkgname=apache-ant pkgname=apache-ant
pkgver=1.10.3 pkgver=1.10.3
pkgrel=0 pkgrel=0
pkgdesc="A java-based build tool." pkgdesc="A java-based build tool"
url="http://ant.apache.org/" url="http://ant.apache.org/"
arch="noarch" arch="noarch"
options="!check" # Needs itself for testing. options="!check" # Needs itself for testing.
license="Apache-2.0" license="Apache-2.0"
depends="openjdk8-jre-base" depends="openjdk8-jre-base"
makedepends=""
source="http://archive.apache.org/dist/ant/binaries/$pkgname-$pkgver-bin.tar.bz2" source="http://archive.apache.org/dist/ant/binaries/$pkgname-$pkgver-bin.tar.bz2"
builddir="$srcdir/$pkgname-$pkgver" builddir="$srcdir/$pkgname-$pkgver"
...@@ -32,25 +31,25 @@ package() { ...@@ -32,25 +31,25 @@ package() {
install -dm755 "$destdir"/bin install -dm755 "$destdir"/bin
rm bin/*.bat bin/*.cmd rm bin/*.bat bin/*.cmd
install -m755 bin/* "$destdir"/bin || return 1 install -m755 bin/* "$destdir"/bin
install -dm755 "$pkgdir"/usr/bin install -dm755 "$pkgdir"/usr/bin
ln -sf $_anthome/bin/ant "$pkgdir"/usr/bin/ant || return 1 ln -sf $_anthome/bin/ant "$pkgdir"/usr/bin/ant
cp -r etc "$destdir"/ || return 1 cp -r etc "$destdir"/
install -dm755 "$destdir"/lib install -dm755 "$destdir"/lib
install -m644 lib/*.jar "$destdir"/lib || return 1 install -m644 lib/*.jar "$destdir"/lib
# symlink to junit so it's on the javac build path for ant # symlink to junit so it's on the javac build path for ant
# matches behavior on ubuntu 9 and makes sense for compatibility # matches behavior on ubuntu 9 and makes sense for compatibility
# http://bugs.archlinux.org/task/15229 # http://bugs.archlinux.org/task/15229
ln -sf ../../junit.jar "$destdir"/lib/junit.jar || return 1 ln -sf ../../junit.jar "$destdir"/lib/junit.jar
# The license says the NOTICE file should be redistributed for # The license says the NOTICE file should be redistributed for
# derivative works, so lets supply it. # derivative works, so lets supply it.
local file; for file in LICENSE NOTICE; do local file; for file in LICENSE NOTICE; do
install -m644 -D $file "$pkgdir"/usr/share/licenses/$pkgname/$file || return 1 install -m644 -D $file "$pkgdir"/usr/share/licenses/$pkgname/$file
done done
install -m644 -D $pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh install -m644 -D $pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment