summaryrefslogtreecommitdiff
path: root/java/java-asm2
diff options
context:
space:
mode:
Diffstat (limited to 'java/java-asm2')
-rw-r--r--java/java-asm2/PKGBUILD6
-rw-r--r--java/java-asm2/PKGBUILD-bootstrap1
-rw-r--r--java/java-asm2/common.sh22
3 files changed, 18 insertions, 11 deletions
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 3541c20ab..71bc0f303 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -5,8 +5,7 @@ pkgver=2.2.3
####
-pkgrel=5
-_checksource_ignore=('test/conform/org/objectweb/asm/signature/signatures.txt')
+pkgrel=6
mksource() {
cd "$srcdir/$_pkgname-$pkgver"
@@ -15,4 +14,5 @@ mksource() {
mkdir -p test/lib
}
-md5sums=('7a92c87bf067925685cf68dcc0dd8998')
+mkmd5sums=('7a92c87bf067925685cf68dcc0dd8998')
+md5sums=('c2119ab39618cb49ca4e4ad74344b488')
diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap
index 9e896a90e..cbe29bb34 100644
--- a/java/java-asm2/PKGBUILD-bootstrap
+++ b/java/java-asm2/PKGBUILD-bootstrap
@@ -7,6 +7,7 @@
makedepends=(jh)
source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip")
+unset mksource
_distdir="$_pkgname-$pkgver"
provides+=("$pkgname=$pkgver")
diff --git a/java/java-asm2/common.sh b/java/java-asm2/common.sh
index 6a664c9ff..ef4547696 100644
--- a/java/java-asm2/common.sh
+++ b/java/java-asm2/common.sh
@@ -13,21 +13,21 @@ makedepends=(
java-ow-util-ant-tasks
jh
)
-source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
+source=("libre://$pkgname-$pkgver.tar.gz")
+mksource=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
_distdir="$_pkgname-$pkgver/output/dist"
_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
build() {
cd "$srcdir/$_pkgname-$pkgver"
- eval `jh mksource ${_checksource_ignore[@]}`
echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
ant dist
# This will make package() easier:
cd "$srcdir/$_distdir/lib"
- ln -s all/* .
+ ln -sf all/* .
}
package() {
@@ -48,12 +48,18 @@ package() {
# Install Maven artifacts
export DESTDIR=$pkgdir
- for artifact in $(ls *.jar|sed 's/-[0-9.]*\.jar$//'); do
- jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom}
- # Symlink them to /usr/share/java
- ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
+ for artifact in $(printf '%s\n' *.pom|sed 's/-[0-9.]*\.pom$//'); do
+ if [[ -f $artifact-$pkgver.jar ]]; then
+ # This artifact has a jar file
+ jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{pom,jar}
+ # Symlink them to /usr/share/java
+ ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \
"$pkgdir"/usr/share/java/$_pkgname/
- ln -s $_pkgname/$artifact-$pkgver.jar \
+ ln -s $_pkgname/$artifact-$pkgver.jar \
"$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar
+ else
+ # This artifact is just a pom
+ jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.pom
+ fi
done
}