Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9c883894411bb35c0c901f9b2c4af74bcc74abb5
commit 9c883894411bb35c0c901f9b2c4af74bcc74abb5 Author: Miklos Vajna <vmik...@frugalware.org> Date: Tue May 31 22:30:53 2016 +0200 bcprov-154-1-x86_64 - 151 -> 154 - drop fancy ant build.xml which doesn't work anymore and just build manually diff --git a/source/devel-extra/bcprov/FrugalBuild b/source/devel-extra/bcprov/FrugalBuild index 20102c4..0e809d3 100644 --- a/source/devel-extra/bcprov/FrugalBuild +++ b/source/devel-extra/bcprov/FrugalBuild @@ -1,36 +1,46 @@ # Compiling Time: 0.72 SBU -# Contributor: kikadf <kikadf...@gmail.com> +# Maintainer: kikadf <kikadf...@gmail.com> # Contributor: bouleetbil <bouleet...@frogdev.info> pkgname=bcprov -pkgver=151 +pkgver=154 pkgrel=1 pkgdesc="Java cryptography APIs." url="http://www.bouncycastle.org/java.html" -makedepends=(${makedepends[@]} 'junit') _F_archive_name="$pkgname-jdk15on" Finclude openjava +makedepends=(${makedepends[@]} 'junit') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://www.bouncycastle.org/latest_releases.html | Flasttar" -source=(http://downloads.bouncycastle.org/java/$_F_archive_name-$pkgver.tar.gz build.xml - http://www.bouncycastle.org/download/lcrypto-jdk15on-$pkgver.tar.gz) -sha1sums=('95e59ad2492598d729cfc559b480c3f172de5dc3' \ - 'd188bcc7b3c1212fc1f272dad6afec391fb203d6' \ - '872c8ac7e070c3059ca5ba626ec9238de2e8a377') +source=(http://www.bouncycastle.org/download/bcprov-jdk15on-${pkgver}.tar.gz) +sha1sums=('346c4e0d14285a2f92ab404e1d2b3bc7a2245680') -build() { +build() +{ Fcd - mkdir -p classes || Fdie + # Unzip source mkdir -p src || Fdie - Fextract src.zip || Fdie - mv org src/ || Fdie - mv ../lcrypto-jdk15on-$pkgver/src/org/bouncycastle/crypto/test/cavp src/org/bouncycastle/crypto/test/ || Fdie - #building - cp $Fsrcdir/build.xml build.xml || Fdie - antflags="-Dproject.name=${pkgname} jar" - Fant ${antflags} - #installing - Fjar dist/${pkgname}.jar + unzip -qq src.zip -d src/ || Fdie + + # Remove provided binaries + find . -type f -name "*.class" -exec rm -f {} \; + find . -type f -name "*.jar" -exec rm -f {} \; + + pushd src + export CLASSPATH=/usr/share/java/junit/junit.jar + javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java") || Fdie + jarfile="../bcprov.jar" + # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream + files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')" + files="$files $(find . -type f -path '*/org/bouncycastle/util/test/*.class')" + test ! -d classes && mf="" \ + || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`" + test -n "$mf" && jar cfm $jarfile $mf $files \ + || jar cf $jarfile $files + popd + + Fjar ${pkgname}.jar } +# optimization OK diff --git a/source/devel-extra/bcprov/build.xml b/source/devel-extra/bcprov/build.xml deleted file mode 100644 index 95b0b14..0000000 --- a/source/devel-extra/bcprov/build.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--- - notes: Call using the following: Fant -Dpackage.name=${package name} ---> -<project name="Frugalware" default="jar" basedir="."> - <property name="src" value="src"/> - <property name="build" value="build"/> - <property name="dist" value="dist"/> - - <property name="pkg" value="${package.name}"/> - <property name="jar" value="${project.name}.jar"/> - - <!-- Override any defined properties --> - <property file="build.properties"/> - - <target name="init"> - <tstamp/> - <mkdir dir="${build}"/> - <mkdir dir="${dist}"/> - <mkdir dir="${dist}/doc"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="${src}" destdir="${build}" classpath="${classpath}" encoding="ISO-8859-1"/> - </target> - - <target name="manifest" depends="init"> - <manifest file="${build}/MANIFEST.MF" mode="update"> - <attribute name="Built-By" value="Frugalware"/> - </manifest> - </target> - - <target name="jar" depends="compile,manifest"> - <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF"> - <fileset dir="${build}"/> - </jar> - </target> - - <target name="javadoc" depends="compile"> - <javadoc sourcepath="${src}" destdir="${dist}/doc" packagenames="${pkg}" encoding="ISO-8859-1"/> - </target> - - <target name="clean"> - <delete dir="${build}"/> - <delete dir="${dist}"/> - </target> -</project> _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git