* Update of jre

* Added aspectj-1.5.0


svn path=/nixpkgs/trunk/; revision=5110
This commit is contained in:
Martin Bravenboer 2006-03-26 03:52:55 +00:00
parent d88e2ea70f
commit 8dbf2c38fb
5 changed files with 51 additions and 5 deletions

View File

@ -0,0 +1,27 @@
source $stdenv/setup
export JAVA_HOME=$jre
cat >> props <<EOF
output.dir=$out
context.javaPath=$jre
EOF
ensureDir $out
$jre/bin/java -jar $src -text props
echo "Removing files at top level"
for file in $out/*
do
if test -f $file ; then
rm $file
fi
done
cat >> $out/bin/ajc-env <<EOF
#! $SHELL
export CLASSPATH=$CLASSPATH:.:/pkg/aspectj/lib/aspectjrt.jar
EOF
chmod u+x $out/bin/ajc-env

View File

@ -0,0 +1,14 @@
{stdenv, fetchurl, jre}:
stdenv.mkDerivation {
name = "aspectj-1.5.0";
builder = ./builder.sh;
src = fetchurl {
url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.0.jar;
md5 = "76d716f699cdd84049323992b21f02fb";
};
inherit jre;
buildInputs = [jre];
}

View File

@ -4,10 +4,10 @@ assert stdenv.system == "i686-linux";
stdenv.mkDerivation {
name = "jre-1.5.0";
version = "jre1.5.0_02";
version = "jre1.5.0_06";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/AutoDL?BundleId=9986;
md5 = "1c9b3bb9670df5ebb5587d2bcba73b3c";
url = "http://jdl.sun.com/webapps/download/AutoDL?BundleId=10336";
md5 = "e0a88dbec9bfe3195794bb652bfc6516";
};
}

View File

@ -710,14 +710,18 @@ rec {
inherit fetchurl stdenv;
};
aspectj =
(import ../development/compilers/aspectj) {
inherit stdenv fetchurl jre;
};
abc =
abcPatchable [];
abcPatchable = patches :
(import ../development/compilers/abc/default.nix) {
inherit stdenv fetchurl patches;
inherit stdenv fetchurl patches jre;
apacheAnt = apacheAntBlackdown14;
jre = blackdown;
javaCup = import ../development/libraries/java/cup {
inherit stdenv fetchurl;
jdk = blackdown;

View File

@ -8,6 +8,7 @@ let {
abc
apacheAntBlackdown14
apacheHttpd
aspectj
aterm
autoconf
automake19x