summaryrefslogtreecommitdiff
path: root/java/ecj-bootstrap/files
diff options
context:
space:
mode:
Diffstat (limited to 'java/ecj-bootstrap/files')
-rw-r--r--java/ecj-bootstrap/files/build.sh79
-rw-r--r--java/ecj-bootstrap/files/ecj-patch-Main.java21
-rw-r--r--java/ecj-bootstrap/files/patch-encoding32
-rw-r--r--java/ecj-bootstrap/files/patch-gcjant22
4 files changed, 0 insertions, 154 deletions
diff --git a/java/ecj-bootstrap/files/build.sh b/java/ecj-bootstrap/files/build.sh
deleted file mode 100644
index fb9722a52772..000000000000
--- a/java/ecj-bootstrap/files/build.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-# taken from eclipse.spec of
-# <fedora mirror>/fedora/core/5/source/SRPMS/eclipse-3.1.2-1jpp_13fc.src.rpm
-# for fedora mirror, please consult following site.
-# http://fedora.redhat.com/download/mirrors.html
-
- # Bootstrapping is 3 parts:
- # 0. Patch ecj.zip
- # 1. Build ecj with gcj -C
- # 2. Build ecj with gcj-built ecj ("javac")
- # 3. Re-build ecj with output of 2.
-
- # Patch ecj.zip first
- rm -rf tmp
- mkdir tmp
- unzip -qq -d tmp jdtcoresrc/src/ecj.zip
- cd tmp
- patch < ../../files/ecj-patch-Main.java
- zip -r ../jdtcoresrc/src/ecj.zip *
- cd ..
-
- # Unzip the "stable compiler" source into a temp dir and build it.
- # Note: we don't want to build the CompilerAdapter.
-
- rm -rf ecj-bootstrap-tmp
- mkdir ecj-bootstrap-tmp
- unzip -qq -d ecj-bootstrap-tmp jdtcoresrc/src/ecj.zip
- rm -f ecj-bootstrap-tmp/org/eclipse/jdt/core/JDTCompilerAdapter.java
-
- # 1a. Build ecj with gcj -C
- cd ecj-bootstrap-tmp
- for f in `find . -name '*.java' | cut -c 3-`; do
- ${GCJ} -Wno-deprecated -C $f
- done
- find . -name '*.class' -or -name '*.properties' -or -name '*.rsc' |\
- xargs ${JAR} cf ../ecj-bootstrap.jar
- cd ..
-
- # Delete our modified ecj and restore the backup
- rm -rf ecj-bootstrap-tmp
-
- # 1b. Natively-compile it
-
- ${GCJ} -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic -o ecj-bootstrap.jar.so ecj-bootstrap.jar
-
- ${GCJDBTOOL} -n ecj-bootstrap.db 30000
- ${GCJDBTOOL} -a ecj-bootstrap.db ecj-bootstrap.jar ecj-bootstrap.jar.so
-
- # 2a. Build ecj
- export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH
- export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db"
- ${ANT} -Dbuild.compiler=gcj -buildfile jdtcoresrc/compilejdtcorewithjavac.xml
-
- ${GCJ} -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar
-
- ${GCJDBTOOL} -n jdtcoresrc/ecj.db 30000
- ${GCJDBTOOL} -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar jdtcoresrc/ecj.jar.so
-
- # Remove our gcj-built ecj
- rm ecj-bootstrap.db ecj-bootstrap.jar ecj-bootstrap.jar.so
-
- # To enSURE we're not using any pre-compiled ecj on the build system, set this
- export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db"
-
- # 3. Use this ecj to rebuild itself
- export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH
- ${ANT} -Dbuild.compiler=gcj -buildfile jdtcoresrc/compilejdtcore.xml
-
- # Natively-compile it
- ${GCJ} -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \
- -o ecj.jar.so ecj.jar
- ${GCJDBTOOL} -n ecj.db 30000
- ${GCJDBTOOL} -a ecj.db ecj.jar ecj.jar.so
- export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db"
- rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so
-
- # Creating native executable
- ${GCJ} -O2 -g -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch --main=org.eclipse.jdt.internal.compiler.batch.Main -o ecj-bootstrap-gcj ecj.jar
diff --git a/java/ecj-bootstrap/files/ecj-patch-Main.java b/java/ecj-bootstrap/files/ecj-patch-Main.java
deleted file mode 100644
index 80c93af6ff65..000000000000
--- a/java/ecj-bootstrap/files/ecj-patch-Main.java
+++ /dev/null
@@ -1,21 +0,0 @@
-Dirty hack...recognize sun.boot.class.path for implicit bootclasspath.
-
---- org/eclipse/jdt/internal/compiler/batch/Main.java Fri Aug 4 15:14:29 2006
-+++ org/eclipse/jdt/internal/compiler/batch/Main.java Fri Aug 4 16:04:13 2006
-@@ -2448,6 +2448,16 @@
- }
- }
- }
-+
-+ /*
-+ * Handle sun.boot.class.path
-+ */
-+ String sunboot = System.getProperty("sun.boot.class.path");
-+ File sunbootclasspath = new File (sunboot);
-+ FileSystem.Classpath classpath = FileSystem.getClasspath(
-+ sunbootclasspath.getAbsolutePath(),
-+ null, false, null);
-+ if (classpath != null) {bootclasspaths.add(classpath);}
- }
- final int classpathsSize = classpaths.size();
- if (classpaths.size() != 0) {
diff --git a/java/ecj-bootstrap/files/patch-encoding b/java/ecj-bootstrap/files/patch-encoding
deleted file mode 100644
index f3a2d16eee91..000000000000
--- a/java/ecj-bootstrap/files/patch-encoding
+++ /dev/null
@@ -1,32 +0,0 @@
-A workaround for running ant with gcj.
-
---- jdtcoresrc/compilejdtcorewithjavac.xml~ Fri Jun 30 08:20:48 2006
-+++ jdtcoresrc/compilejdtcorewithjavac.xml Wed Aug 2 23:09:35 2006
-@@ -15,7 +15,7 @@
- <delete dir="${destdir}"/>
- <mkdir dir="${destdir}"/>
-
-- <property name="compilerArg" value="-encoding ISO-8859-1" />
-+ <property name="compilerArg" value="-encoding=ISO-8859-1" />
- <property name="javacSource" value="1.3" />
- <property name="javacTarget" value="1.2" />
- <property name="javacDebugInfo" value="on" />
---- jdtcoresrc/compilejdtcore.xml~ Fri Jun 30 08:20:48 2006
-+++ jdtcoresrc/compilejdtcore.xml Wed Aug 2 23:11:00 2006
-@@ -25,14 +25,14 @@
- </condition>
- </fail>
-
-- <condition property="compilerArg" value="-encoding ISO-8859-1">
-+ <condition property="compilerArg" value="-encoding=ISO-8859-1">
- <equals arg1="${build.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />
- </condition>
-
- <echo message="compilerArg ${compilerArg}"/>
- <echo message="build compiler ${build.compiler}"/>
-
-- <property name="compilerArg" value="-encoding ISO-8859-1" />
-+ <property name="compilerArg" value="-encoding=ISO-8859-1" />
- <property name="javacSource" value="1.3" />
- <property name="javacTarget" value="1.2" />
- <property name="javacDebugInfo" value="on" />
diff --git a/java/ecj-bootstrap/files/patch-gcjant b/java/ecj-bootstrap/files/patch-gcjant
deleted file mode 100644
index 0581579cfcb6..000000000000
--- a/java/ecj-bootstrap/files/patch-gcjant
+++ /dev/null
@@ -1,22 +0,0 @@
-a workaround for running ant with gcj. ant+gcj
-somehow doesn't find ecj.jar.
-
---- jdtcoresrc/compilejdtcore.xml~ Thu Aug 3 00:17:48 2006
-+++ jdtcoresrc/compilejdtcore.xml Thu Aug 3 00:19:33 2006
-@@ -14,16 +14,6 @@
- <delete dir="${destdir}"/>
- <mkdir dir="${destdir}"/>
-
-- <condition property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter">
-- <available file="ecj.jar" />
-- </condition>
-- <fail message="The Eclipse compiler (ecj.jar) cannot be found.">
-- <condition>
-- <not>
-- <equals arg1="${build.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />
-- </not>
-- </condition>
-- </fail>
-
- <condition property="compilerArg" value="-encoding=ISO-8859-1">
- <equals arg1="${build.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />