update libre/java-asm{2,3}: symlink all the things!

2 files changed, 62 insertions, 65 deletions

diff --git a/libre/java-asm2/PKGBUILD b/libre/java-asm2/PKGBUILD
index 9f42e977d..4853d79c0 100644
--- a/libre/java-asm2/PKGBUILD
+++ b/libre/java-asm2/PKGBUILD
@@ -2,8 +2,9 @@
 
 _pkgname=asm
 pkgname=java-asm2
+_pkgver=2
 pkgver=2.2.3
-pkgrel=1
+pkgrel=4
 pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
 arch=('any')
 url="http://asm.ow2.org/"
@@ -15,22 +16,29 @@ makedepends=(
 )
 source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
 
+_M2_LOCALREPO='/usr/share/maven/repository'
+_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
+_m2_packages=(
+  asm
+  asm-analysis
+  asm-attrs
+  asm-commons
+  asm-tree
+  asm-util
+  asm-xml
+  asm-all)
+
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
   mkdir -p test/lib
-  echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties
-  ant dist
-}
 
-mvn-install() {
-  group=$1
-  pkg=$2
-  ver=$3
+  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
+  ant dist
 
-  dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver
-  install -d "$dir"
-  cp $pkg-$pkgver.* "$dir"
+  # This will make package() easier:
+  cd output/dist/lib
+  ln -s all/* .
 }
 
 package() {
@@ -47,28 +55,22 @@ package() {
   
   # Install Apache Maven modules
   cd lib
-  mvn-install asm asm $pkgver
-  mvn-install asm asm-analysis $pkgver
-  mvn-install asm asm-attrs $pkgver
-  mvn-install asm asm-commons $pkgver
-  mvn-install asm asm-tree $pkgver
-  mvn-install asm asm-util $pkgver
-  mvn-install asm asm-xml $pkgver
-  cd all
-  mvn-install asm asm-all $pkgver
-
-  # Synlink Maven modules to /usr/share/java
   install -d "$pkgdir"/usr/share/java/asm
-  cd "$pkgdir"
-  find usr/share/maven/repository/asm \
-    -type f -name '*.jar' -printf '/%p\n' | while read jar; do
-    ln -s "$jar" "$pkgdir"/usr/share/java/asm
+  for pkg in "${_m2_packages[@]}"; do
+    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
+    # Create the Maven directory
+    install -d "$pkgdir$dir"
+    # Install the files
+    cp $pkg-$pkgver.* "$pkgdir$dir"
+    # Symlink them to /usr/share/java
+    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
+    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
   done
   
-  # Put the finishing touches on /usr/share/java
-  ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-2.jar
+  # Install a README file about the -all files
   cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+  install -m644 output/dist/lib/all/README.txt \
+    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
 }
 
 md5sums=('7a92c87bf067925685cf68dcc0dd8998')
diff --git a/libre/java-asm3/PKGBUILD b/libre/java-asm3/PKGBUILD
index 2c6a7f933..7e66a5b5a 100644
--- a/libre/java-asm3/PKGBUILD
+++ b/libre/java-asm3/PKGBUILD
@@ -2,8 +2,9 @@
 
 _pkgname=asm
 pkgname=java-asm3
+_pkgver=3
 pkgver=3.3.1
-pkgrel=3
+pkgrel=4.1
 pkgdesc="An all purpose Java bytecode manipulation and analysis framework."
 arch=('any')
 url="http://asm.ow2.org/"
@@ -15,30 +16,31 @@ makedepends=(
 )
 source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz")
 
+_M2_LOCALREPO='/usr/share/maven/repository'
+_ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar'
+_m2_packages=(
+  asm
+  asm-analysis
+  asm-commons
+  asm-parent
+  asm-tree
+  asm-util
+  asm-xml
+  asm-all
+  asm-debug-all)
+
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
   rm cobertura.ser # We regenerate this
   rm examples/jasmin/test/jasmin.jar
 
-  echo 'objectweb.ant.tasks.path /usr/share/java/ow_util_ant_tasks.jar' >> build.properties
+  echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties
   ant dist
-}
-
-# Tests have more dependencies, and I can't be bothered to package them.
-#check() {
-#  cd "$srcdir/$_pkgname-$pkgver"
-#  ant test
-#}
 
-mvn-install() {
-  group=$1
-  pkg=$2
-  ver=$3
-
-  dir="$pkgdir"/usr/share/maven/repository/$group/$pkg/$ver
-  install -d "$dir"
-  cp $pkg-$pkgver.* "$dir"
+  # This will make package() easier:
+  cd output/dist/lib
+  ln -s all/* .
 }
 
 package() {
@@ -55,29 +57,22 @@ package() {
   
   # Install Apache Maven modules
   cd lib
-  mvn-install asm asm $pkgver
-  mvn-install asm asm-analysis $pkgver
-  mvn-install asm asm-commons $pkgver
-  mvn-install asm asm-parent $pkgver
-  mvn-install asm asm-tree $pkgver
-  mvn-install asm asm-util $pkgver
-  mvn-install asm asm-xml $pkgver
-  cd all
-  mvn-install asm asm-all $pkgver
-  mvn-install asm asm-debug-all $pkgver
-
-  # Synlink Maven modules to /usr/share/java
   install -d "$pkgdir"/usr/share/java/asm
-  cd "$pkgdir"
-  find usr/share/maven/repository/asm \
-    -type f -name '*.jar' -printf '/%p\n' | while read jar; do
-    ln -s "$jar" "$pkgdir"/usr/share/java/asm
+  for pkg in "${_m2_packages[@]}"; do
+    dir="$_M2_LOCALREPO"/asm/$pkg/$pkgver
+    # Create the Maven directory
+    install -d "$pkgdir$dir"
+    # Install the files
+    cp $pkg-$pkgver.* "$pkgdir$dir"
+    # Symlink them to /usr/share/java
+    ln -s "$dir"/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/asm/
+    ln -s asm/$pkg-$pkgver.jar "$pkgdir"/usr/share/java/$pkg-$_pkgver.jar
   done
   
-  # Put the finishing touches on /usr/share/java
-  ln -s "asm/asm-$pkgver.jar" "$pkgdir"/usr/share/java/asm-3.jar
+  # Install a README file about the -all files
   cd "$srcdir/$_pkgname-$pkgver"
-  install -m644 output/dist/lib/all/README.txt "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
+  install -m644 output/dist/lib/all/README.txt \
+    "$pkgdir"/usr/share/java/asm/README-$pkgver.txt
 }
 
 md5sums=('433024df8176f09922646316e415631c')