From ba7bed75477c53136cb7fbf68a58dff23f64f8ae Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 18 Oct 2012 17:15:26 -0400 Subject: fix up the [java] packages that were in [libre] --- java/java-asm2/PKGBUILD | 54 +++++++++++++++++++----------------- java/java-asm2/PKGBUILD-bootstrap | 23 +++++++++++++++ java/java-asm3/PKGBUILD | 49 ++++++++++++++++---------------- java/java-ow-util-ant-tasks/PKGBUILD | 4 +-- java/java-ow-util-ant-tasks/SRCBUILD | 0 5 files changed, 78 insertions(+), 52 deletions(-) mode change 100755 => 100644 java/java-asm2/PKGBUILD create mode 100644 java/java-asm2/PKGBUILD-bootstrap mode change 100755 => 100644 java/java-asm3/PKGBUILD mode change 100755 => 100644 java/java-ow-util-ant-tasks/PKGBUILD mode change 100755 => 100644 java/java-ow-util-ant-tasks/SRCBUILD (limited to 'java') diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD old mode 100755 new mode 100644 index 4853d79c0..45831b033 --- a/java/java-asm2/PKGBUILD +++ b/java/java-asm2/PKGBUILD @@ -2,7 +2,6 @@ _pkgname=asm pkgname=java-asm2 -_pkgver=2 pkgver=2.2.3 pkgrel=4 pkgdesc="An all purpose Java bytecode manipulation and analysis framework." @@ -13,12 +12,13 @@ depends=('java-runtime') makedepends=( apache-ant java-ow-util-ant-tasks + jh ) source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") -_M2_LOCALREPO='/usr/share/maven/repository' +_distdir="$_pkgname-$pkgver/output/dist" _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' -_m2_packages=( +_m2_artifacts=( asm asm-analysis asm-attrs @@ -28,49 +28,51 @@ _m2_packages=( asm-xml asm-all) -build() { +mksource() { cd "$srcdir/$_pkgname-$pkgver" - + rm test/conform/org/objectweb/asm/attrs/StackMapTableSample.data + rm test/conform/cases/*.class mkdir -p test/lib +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + eval `jh mksource test/conform/org/objectweb/asm/signature/signatures.txt` echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties ant dist # This will make package() easier: - cd output/dist/lib + cd "$srcdir/$_distdir/lib" ln -s all/* . } package() { - cd "$srcdir/$_pkgname-$pkgver" - # Install license file + cd "$srcdir/$_pkgname-$pkgver" install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Install documentation - cd output/dist + cd "$srcdir/$_distdir" install -d "$pkgdir/usr/share/doc/$pkgname" cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc" cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples" - - # Install Apache Maven modules - cd lib - install -d "$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" + + # Install the README about the -all files + cd "$srcdir/$_distdir/lib" + install -Dm644 README.txt \ + "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt + + # Install Maven artifacts + export DESTDIR=$pkgdir + for artifact in "${_m2_artifacts[@]}"; do + jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom} # 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 + ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \ + "$pkgdir"/usr/share/java/$_pkgname/ + ln -s $_pkgname/$artifact-$pkgver.jar \ + "$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar done - - # 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 } md5sums=('7a92c87bf067925685cf68dcc0dd8998') diff --git a/java/java-asm2/PKGBUILD-bootstrap b/java/java-asm2/PKGBUILD-bootstrap new file mode 100644 index 000000000..9e896a90e --- /dev/null +++ b/java/java-asm2/PKGBUILD-bootstrap @@ -0,0 +1,23 @@ +# Maintainer: Luke Shumaker + +# "java-asm2" is required to build "java-ow-util-ant-tasks", which is in turn +# required to build "java-asm2". + +. PKGBUILD + +makedepends=(jh) +source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver-bin.zip") +_distdir="$_pkgname-$pkgver" + +provides+=("$pkgname=$pkgver") +pkgname+='-bootstrap' +pkgdesc+=" (prebuilt binary release for bootstrapping purposes)" + +build() { + cd "$srcdir/$_pkgname-$pkgver" + echo "3-clause BSD license; install the non-bootstrap version for full text" > LICENSE.txt + cd "$srcdir/$_distdir/lib" + ln -s all/* . +} + +md5sums=('9bedaa1d00c5b5f1c7fec10a2d2f7142') diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD old mode 100755 new mode 100644 index 7e66a5b5a..3af6902f4 --- a/java/java-asm3/PKGBUILD +++ b/java/java-asm3/PKGBUILD @@ -13,12 +13,13 @@ depends=('java-runtime') makedepends=( apache-ant java-ow-util-ant-tasks + jh ) source=("http://download.forge.objectweb.org/$_pkgname/$_pkgname-$pkgver.tar.gz") -_M2_LOCALREPO='/usr/share/maven/repository' +_distdir="$_pkgname-$pkgver/output/dist" _ow_util_ant_tasks='/usr/share/java/ow_util_ant_tasks.jar' -_m2_packages=( +_m2_artifacts=( asm asm-analysis asm-commons @@ -29,50 +30,50 @@ _m2_packages=( asm-all asm-debug-all) -build() { +mksource() cd "$srcdir/$_pkgname-$pkgver" - rm cobertura.ser # We regenerate this rm examples/jasmin/test/jasmin.jar +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + eval `jh mksource` echo "objectweb.ant.tasks.path $_ow_util_ant_tasks" >> build.properties ant dist # This will make package() easier: - cd output/dist/lib + cd "$srcdir/$_distdir/lib" ln -s all/* . } package() { - cd "$srcdir/$_pkgname-$pkgver" - # Install license file + cd "$srcdir/$_pkgname-$pkgver" install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Install documentation - cd output/dist + cd "$srcdir/$_distdir" install -d "$pkgdir/usr/share/doc/$pkgname" cp -r doc/javadoc/user "$pkgdir/usr/share/doc/$pkgname/javadoc" cp -r examples "$pkgdir/usr/share/doc/$pkgname/examples" - # Install Apache Maven modules - cd lib - install -d "$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" + # Install the README about the -all files + cd "$srcdir/$_distdir/lib" + install -Dm644 README.txt \ + "$pkgdir"/usr/share/java/$_pkgname/README-$pkgver.txt + + # Install Maven artifacts + export DESTDIR=$pkgdir + for artifact in "${_m2_artifacts[@]}"; do + jh mvn-install $_pkgname $artifact $pkgver $artifact-$pkgver.{jar,pom} # 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 + ln -s "$(jh mvn-basename asm $artifact $pkgver).jar" \ + "$pkgdir"/usr/share/java/$_pkgname/ + ln -s $_pkgname/$artifact-$pkgver.jar \ + "$pkgdir"/usr/share/java/$artifact-${pkgver%%.*}.jar done - - # 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 } md5sums=('433024df8176f09922646316e415631c') diff --git a/java/java-ow-util-ant-tasks/PKGBUILD b/java/java-ow-util-ant-tasks/PKGBUILD old mode 100755 new mode 100644 index 023048188..f1add43ea --- a/java/java-ow-util-ant-tasks/PKGBUILD +++ b/java/java-ow-util-ant-tasks/PKGBUILD @@ -13,8 +13,8 @@ source=("http://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}-1-any.src build() { cd "$srcdir/$pkgname-$pkgver" - ln -s /usr/share/java/asm-2.jar externals - ln -s /usr/share/java/xalan.jar externals + ln -s /usr/share/java/asm-2.jar externals/ + ln -s /usr/share/java/xalan.jar externals/ ant jar } diff --git a/java/java-ow-util-ant-tasks/SRCBUILD b/java/java-ow-util-ant-tasks/SRCBUILD old mode 100755 new mode 100644 -- cgit v1.2.3