[arch-commits] Commit in eclipse-ecj/trunk (PKGBUILD ecj)

[Allan McRae]

    Date: Friday, May 8, 2009 @ 12:35:33
  Author: allan
Revision: 38468

build without gcc-gcj

Modified:
  eclipse-ecj/trunk/PKGBUILD
  eclipse-ecj/trunk/ecj

----------+
 PKGBUILD |   57 +++++++++++++--------------------------------------------
 ecj      |   12 ++----------
 2 files changed, 15 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-08 16:09:59 UTC (rev 38467)
+++ PKGBUILD	2009-05-08 16:35:33 UTC (rev 38468)
@@ -1,55 +1,24 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=eclipse-ecj
-pkgver=3.3.2
-pkgrel=2
-_date=200802211800
+pkgver=3.4.2
+pkgrel=1
+_date=200902111700
 pkgdesc="Eclipse java bytecode compiler"
 arch=('i686' 'x86_64')
 license=('EPL')
 url="http://www.eclipse.org/"
-depends=('gcc-gcj')
-makedepends=('apache-ant')
-source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc.zip
-	ecj
-        ecj-gccmain.diff)
-md5sums=('c1d89b9de8170fc91e30c3a02002244f'
-         'c72fe244e4d4b7a3c437604805b988ff'
-         '2cc746a12da0978aef2ae504a208fd6f')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc-${pkgver}.zip
+	ecj)
+md5sums=('c50acc9a39d410188ffc729fdf99af2a'
+         '263d673f04a1ac93e1a7550ffdd970bc')
 
 build() {
-  patch -Np3 -i ${startdir}/src/ecj-gccmain.diff || return 1
-
-  rm -rf org/eclipse/jdt/internal/compiler/{tool,apt}
-  mkdir -p build/bin
-  cp -a org build/bin/
-  find build/bin -name '*.java' > build/bin/sources
-  gcj -v -d build/bin -C -g -I/usr/lib/ant.jar -Ibuild/bin `cat build/bin/sources` || return 1
-
-  rm -f build/bin/sources
-  find build/bin -name '*.java' -delete || return 1
-  find build/bin -name '*.html' -delete || return 1
-
-  mkdir -p build/bootstrap
-  gjar -c -C build/bin org -f build/bootstrap/eclipse-ecj.jar || return 1
-
-  rm -rf build/bin
-  mkdir build/bin
-  cp -a org build/bin/
-
-  gij -classpath build/bootstrap/eclipse-ecj.jar:/usr/lib/ant.jar \
-      org.eclipse.jdt.internal.compiler.batch.Main \
-      -bootclasspath /usr/share/java/libgcj-4.3.jar build/bin || return 1
-
-  find build/bin -name '*.java' -delete || return 1
-  find build/bin -name '*.html' -delete || return 1
-
-  mkdir -p build/dist
-  gjar -c -C build/bin org -f build/dist/eclipse-ecj.jar || return 1
-
-  install -m755 -d ${startdir}/pkg/usr/share/java
-  install -m755 -d ${startdir}/pkg/usr/bin
-  install -m644 build/dist/eclipse-ecj.jar ${startdir}/pkg/usr/share/java/ || return 1
-  install -m755 ecj ${startdir}/pkg/usr/bin/ || return 1
+  ant
+  install -Dm755 ecj.jar $pkgdir/usr/share/java/eclipse-ecj.jar
+  install -Dm755 ecj ${startdir}/pkg/usr/bin/ecj
 }

Modified: ecj
===================================================================
--- ecj	2009-05-08 16:09:59 UTC (rev 38467)
+++ ecj	2009-05-08 16:35:33 UTC (rev 38468)
@@ -1,17 +1,9 @@
 #! /bin/sh
-case "$*" in
-  *-bootclasspath*) ;;
-  *)
-    if [ ! -f /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/rt.jar ]; then
-      bcoption="-bootclasspath /usr/share/java/libgcj-4.3.jar"
-    fi
-esac
-
 case $CLASSPATH in
   */usr/share/java/eclipse-ecj.jar*) ;;
   *) CLASSPATH=${CLASSPATH:+$CLASSPATH:}/usr/share/java/eclipse-ecj.jar
 esac
 export CLASSPATH
 
-exec /usr/bin/gij \
-  org.eclipse.jdt.internal.compiler.batch.Main $bcoption ${1+"$@"}
+exec ${JAVA_HOME}/bin/java \
+  org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}