[oe-commits] org.oe.dev merge of '5ae815d03c9ef1f749d3938f74dbd8e73c455921'
woglinde2 commit
oe at amethyst.openembedded.net
Sat Jul 26 22:27:09 UTC 2008
merge of '5ae815d03c9ef1f749d3938f74dbd8e73c455921'
and '8a3d387dc07aa9256e0f2ed81a4e1c1242fdfa6e'
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: f944cf093b8eb3ce5357167c0748be22d8b10af7
ViewMTN: http://monotone.openembedded.org/revision/info/f944cf093b8eb3ce5357167c0748be22d8b10af7
Files:
1
packages/classpath/classpath-native.inc
packages/ecj/ecj-bootstrap-native_3.3.bb
packages/ecj/ecj-bootstrap-native_3.3.2.bb
packages/ecj/ecj-initial_3.3.bb
packages/ecj/ecj-initial_3.3.2.bb
packages/classpath/classpath-initial_0.93.bb
Diffs:
#
# mt diff -r5ae815d03c9ef1f749d3938f74dbd8e73c455921 -rf944cf093b8eb3ce5357167c0748be22d8b10af7
#
#
#
# patch "packages/classpath/classpath-native.inc"
# from [ce05671105e08fb6217f1907cf4202d41ebfd512]
# to [f1053899930127b54417bca6f25818bdf90a200e]
#
============================================================
--- packages/classpath/classpath-native.inc ce05671105e08fb6217f1907cf4202d41ebfd512
+++ packages/classpath/classpath-native.inc f1053899930127b54417bca6f25818bdf90a200e
@@ -10,9 +10,13 @@ inherit autotools native
inherit autotools native
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
+
+# Note: the --with-ecj options seems redundant but is
+# for compatibility with older classpath versions.
EXTRA_OECONF = "\
+ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
--with-glibj \
- --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
--with-fastjar=fastjar \
--enable-local-sockets \
--disable-alsa \
#
# mt diff -r8a3d387dc07aa9256e0f2ed81a4e1c1242fdfa6e -rf944cf093b8eb3ce5357167c0748be22d8b10af7
#
#
#
# rename "packages/ecj/ecj-bootstrap-native_3.3.bb"
# to "packages/ecj/ecj-bootstrap-native_3.3.2.bb"
#
# rename "packages/ecj/ecj-initial_3.3.bb"
# to "packages/ecj/ecj-initial_3.3.2.bb"
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-initial_3.3.bb"
# content [b410a403c3f29b5239ebde0751e23e02f0d3409a]
#
# patch "packages/classpath/classpath-initial_0.93.bb"
# from [dcbd137250c9fd6e2ca0ca88afc7404e9ede289c]
# to [e8d4723f96ff6828015eafcabc845d6122cf304f]
#
# patch "packages/ecj/ecj-initial_3.3.2.bb"
# from [b410a403c3f29b5239ebde0751e23e02f0d3409a]
# to [b62ca6b6be5ba0eb2884b571d54eec89895f48a5]
#
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
+++ packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/classpath/classpath-initial_0.93.bb dcbd137250c9fd6e2ca0ca88afc7404e9ede289c
+++ packages/classpath/classpath-initial_0.93.bb e8d4723f96ff6828015eafcabc845d6122cf304f
@@ -5,7 +5,7 @@ DESCRIPTION="Java1.4-compatible GNU Clas
DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
-PR = "r0"
+PR = "r2"
DEPENDS = "zip-native fastjar-native jikes-native"
@@ -25,4 +25,3 @@ EXTRA_OECONF = "\
--with-native-libdir=${STAGING_LIBDIR}/classpath-initial \
--includedir=${STAGING_INCDIR}/classpath-initial \
"
-
============================================================
--- packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
+++ packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
@@ -10,7 +10,7 @@ SRC_URI = "\
DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
SRC_URI = "\
- http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \
file://ecj.in \
"
More information about the Openembedded-commits
mailing list