* Update of jre
* Added aspectj-1.5.0
svn path=/nixpkgs/trunk/; revision=5110
commit8dbf2c38fb2adee4969f8ef7c33230714c75270d
authorMartin Bravenboer <martin.bravenboer@logicblox.com>
dateSun 26 Mar 2006, 03:52 (21 years ago)
parentd88e2ea
pkgs/development/compilers/aspectj/builder.shnew file+27
@@ -0,0 +1,27 @@
1+source $stdenv/setup
2+
3+export JAVA_HOME=$jre
4+
5+cat >> props <<EOF
6+output.dir=$out
7+context.javaPath=$jre
8+EOF
9+
10+ensureDir $out
11+$jre/bin/java -jar $src -text props
12+
13+echo "Removing files at top level"
14+for file in $out/*
15+do
16+ if test -f $file ; then
17+ rm $file
18+ fi
19+done
20+
21+cat >> $out/bin/ajc-env <<EOF
22+#! $SHELL
23+
24+export CLASSPATH=$CLASSPATH:.:/pkg/aspectj/lib/aspectjrt.jar
25+EOF
26+
27+chmod u+x $out/bin/ajc-env
pkgs/development/compilers/aspectj/default.nixnew file+14
@@ -0,0 +1,14 @@
1+{stdenv, fetchurl, jre}:
2+
3+stdenv.mkDerivation {
4+ name = "aspectj-1.5.0";
5+ builder = ./builder.sh;
6+
7+ src = fetchurl {
8+ url = http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/aspectj/aspectj-1.5.0.jar;
9+ md5 = "76d716f699cdd84049323992b21f02fb";
10+ };
11+
12+ inherit jre;
13+ buildInputs = [jre];
14+}
pkgs/development/interpreters/jre/jre-sun-linux.nix+3−3
@@ -4,10 +4,10 @@ assert stdenv.system == "i686-linux";
44
55stdenv.mkDerivation {
66 name = "jre-1.5.0";
7− version = "jre1.5.0_02";
7+ version = "jre1.5.0_06";
88 builder = ./builder.sh;
99 src = fetchurl {
10− url = http://nix.cs.uu.nl/dist/tarballs/AutoDL?BundleId=9986;
11− md5 = "1c9b3bb9670df5ebb5587d2bcba73b3c";
10+ url = "http://jdl.sun.com/webapps/download/AutoDL?BundleId=10336";
11+ md5 = "e0a88dbec9bfe3195794bb652bfc6516";
1212 };
1313}
pkgs/top-level/all-packages.nix+6−2
@@ -710,14 +710,18 @@ rec {
710710 inherit fetchurl stdenv;
711711 };
712712
713+ aspectj =
714+ (import ../development/compilers/aspectj) {
715+ inherit stdenv fetchurl jre;
716+ };
717+
713718 abc =
714719 abcPatchable [];
715720
716721 abcPatchable = patches :
717722 (import ../development/compilers/abc/default.nix) {
718− inherit stdenv fetchurl patches;
723+ inherit stdenv fetchurl patches jre;
719724 apacheAnt = apacheAntBlackdown14;
720− jre = blackdown;
721725 javaCup = import ../development/libraries/java/cup {
722726 inherit stdenv fetchurl;
723727 jdk = blackdown;
pkgs/top-level/build-for-release.nix+1
@@ -8,6 +8,7 @@ let {
88 abc
99 apacheAntBlackdown14
1010 apacheHttpd
11+ aspectj
1112 aterm
1213 autoconf
1314 automake19x