From 7e75cb7cc452cf305a252329af4ed44531689553 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue, 6 Sep 2005 00:00:22 +0000
Subject: [PATCH] Added ecj (The Eclipse Compiler for Java) to Nix. This means
 that Java 5.0 code can now be compiled and run in Nix (the J2RE 5.0 was
 already available without deployment problems).

Also, I need ecj to checkout its behaviour and warnings as a second
reference (javac).


svn path=/nixpkgs/trunk/; revision=3783
---
 pkgs/development/compilers/ecj/builder.sh  | 21 +++++++++++++++++++++
 pkgs/development/compilers/ecj/default.nix | 13 +++++++++++++
 pkgs/system/all-packages-generic.nix       |  5 +++++
 pkgs/system/populate-cache.nix             |  2 ++
 4 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/compilers/ecj/builder.sh
 create mode 100644 pkgs/development/compilers/ecj/default.nix

diff --git a/pkgs/development/compilers/ecj/builder.sh b/pkgs/development/compilers/ecj/builder.sh
new file mode 100644
index 00000000000..67297e2fd87
--- /dev/null
+++ b/pkgs/development/compilers/ecj/builder.sh
@@ -0,0 +1,21 @@
+. $stdenv/setup
+
+unzip $src
+cd jdtcoresrc
+ant -f compilejdtcorewithjavac.xml
+
+mkdir -p $out/share/ecj
+mv ecj.jar $out/share/ecj
+
+mkdir -p $out/bin
+
+cat >> $out/bin/ecj <<EOF
+#! /bin/sh
+
+export JAVA_HOME=$j2re
+export LANG="en_US"
+
+$j2re/bin/java -cp $out/share/ecj/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main \$@
+EOF
+
+chmod u+x $out/bin/ecj
diff --git a/pkgs/development/compilers/ecj/default.nix b/pkgs/development/compilers/ecj/default.nix
new file mode 100644
index 00000000000..a0428608d16
--- /dev/null
+++ b/pkgs/development/compilers/ecj/default.nix
@@ -0,0 +1,13 @@
+{stdenv, fetchurl, unzip, ant, j2re}: 
+
+stdenv.mkDerivation {
+  name = "ecj-3.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/R-3.1-200506271435/eclipse-sourceBuild-srcIncluded-3.1.zip;
+    md5 = "19ad65d52005da5eaa1d3687b3a50de2";
+  };
+
+  inherit j2re;
+  buildInputs = [unzip ant j2re];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 873502502cd..a1e725daaaa 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -482,6 +482,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  ecj = (import ../development/compilers/ecj) {
+    inherit fetchurl stdenv unzip j2re;
+    ant  = apacheAntBlackdown14;
+  };
+
   blackdown = (import ../development/compilers/blackdown) {
     inherit fetchurl stdenv;
   };
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index 9dd5c325b59..88d20f40299 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -110,6 +110,8 @@ let {
     blackdown
     apacheAntBlackdown14
     jikes
+    ecj
+    j2re
     jetty
   ;};