[arch-commits] CVS update of extra/devel/eclipse-ecj (PKGBUILD ecj-gccmain.diff)

[Jan de Groot]

    Date: Friday, June 29, 2007 @ 16:50:11
  Author: jgc
    Path: /home/cvs-extra/extra/devel/eclipse-ecj

Modified: PKGBUILD (1.5 -> 1.6) ecj-gccmain.diff (1.1 -> 1.2)

upgpkg: eclipse-ecj 3.3-1
new compiler version. Build procedure overlooked from debian


------------------+
 PKGBUILD         |   55 +++++++++++++++++++++++++++++++++++------------------
 ecj-gccmain.diff |    3 --
 2 files changed, 38 insertions(+), 20 deletions(-)


Index: extra/devel/eclipse-ecj/PKGBUILD
diff -u extra/devel/eclipse-ecj/PKGBUILD:1.5 extra/devel/eclipse-ecj/PKGBUILD:1.6
--- extra/devel/eclipse-ecj/PKGBUILD:1.5	Mon Apr 30 06:04:36 2007
+++ extra/devel/eclipse-ecj/PKGBUILD	Fri Jun 29 16:50:11 2007
@@ -1,39 +1,58 @@
-# $Id: PKGBUILD,v 1.5 2007/04/30 10:04:36 jgc Exp $
+# $Id: PKGBUILD,v 1.6 2007/06/29 20:50:11 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=eclipse-ecj
-pkgver=3.2.2
-pkgrel=2
-_date=200702121330
+pkgver=3.3
+pkgrel=1
+_date=200706251500
 pkgdesc="Eclipse java bytecode compiler"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.eclipse.org/"
 depends=('gcc-gcj')
-makedepends=('unzip' 'fastjar')
+makedepends=('unzip' 'fastjar' 'apache-ant')
 source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/ecjsrc.zip
 	ecj
-	ecj-gccmain.diff
+        ecj-gccmain.diff
 	epl.txt)
-md5sums=('f9d7b548658c84231b00fada8d4b4f1b' '607bda786cb80c0043c345c23e445f33'
-         '53045a27f00dd0049ece32e020b9e1f6' '4b688fceee37da7af4595211695a48b3')
+md5sums=('9e1fc1c86c85e72df5e141069b82041d'
+         '607bda786cb80c0043c345c23e445f33'
+         '2cc746a12da0978aef2ae504a208fd6f'
+         '4b688fceee37da7af4595211695a48b3')
 
 build() {
   patch -Np3 -i ${startdir}/src/ecj-gccmain.diff || return 1
-  rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java
-  rm -rf org/eclipse/jdt/core/internal/antadapter
 
-  for i in `find org/ -name '*.java'`; do
-    echo "gcj -C ${i}"
-    gcj -C ${i} || return 1
-  done
+  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`
 
-  find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \
-    xargs fastjar cf eclipse-ecj.jar
+  rm -f build/bin/sources
+  find build/bin -name '*.java' -exec rm -f {} \;
+  find build/bin -name '*.html' -exec rm -f {} \;
+
+  mkdir -p build/bootstrap
+  fastjar -c -C build/bin . -f build/bootstrap/eclipse-ecj.jar
+
+  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.2*.jar build/bin
+
+  find build/bin -name '*.java' -exec rm -f {} \;
+  find build/bin -name '*.html' -exec rm -f {} \;
+
+  mkdir -p build/dist
+  fastjar -c -C build/bin . -f build/dist/eclipse-ecj.jar
 
   mkdir -p ${startdir}/pkg/usr/share/java
   mkdir -p ${startdir}/pkg/usr/bin
-  install -m644 eclipse-ecj.jar ${startdir}/pkg/usr/share/java/
+  install -m644 build/dist/eclipse-ecj.jar ${startdir}/pkg/usr/share/java/
   install -m755 ecj ${startdir}/pkg/usr/bin/
   mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
   install -m644 ${startdir}/src/epl.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/
Index: extra/devel/eclipse-ecj/ecj-gccmain.diff
diff -u extra/devel/eclipse-ecj/ecj-gccmain.diff:1.1 extra/devel/eclipse-ecj/ecj-gccmain.diff:1.2
--- extra/devel/eclipse-ecj/ecj-gccmain.diff:1.1	Mon Apr 30 06:04:36 2007
+++ extra/devel/eclipse-ecj/ecj-gccmain.diff	Fri Jun 29 16:50:11 2007
@@ -1,7 +1,7 @@
 diff -urN ./src~/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java ./src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
 --- ./src~/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java	1970-01-01 01:00:00.000000000 +0100
 +++ ./src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/batch/GCCMain.java	2007-03-03 19:55:20.000000000 +0100
-@@ -0,0 +1,495 @@
+@@ -0,0 +1,494 @@
 +/**
 + * 
 + */
@@ -348,7 +348,6 @@
 +						this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
 +				}
 +				this.destinationPath = arg;
-+				this.generatePackagesStructure = true;
 +			} else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
 +				classpath = getArgument(currentArg);
 +			} else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$