[Angstrom-devel] Backport candidates from .dev
Koen Kooi
k.kooi at student.utwente.nl
Thu Jan 24 17:17:07 CET 2008
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Koen Kooi schreef:
| Hi,
|
| There are some interesting updates in .dev that would benefit going into
| the stable branch:
|
| * java updates
The list AIUI:
for i in cacao classpath ecj jamvm jikes midpath swt ; do mtn log $i
- --to df475b842adf853bad8285bda460dd5b55117eb2 --no-graph --no-merges
- --diffs ; done > /tmp/java.diff.txt
- -----------------------------------------------------------------
Revision: eed8e44709b0135c476bb86fd537e46917805a76
Ancestor: 064319b05c0251cfa2d1def4325e42275591282f
Author: thebohemian at openembedded.org
Date: 2008-01-21T00:35:18
Branch: org.openembedded.dev
Added files:
~ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
Modified files:
~ packages/cacao/cacao_0.98+hg20071001.bb
ChangeLog:
cacao: Fix cache flushing.
~ - removed workaround patch
~ - added real fix OABI and EABI compliant cacheflushing
============================================================
- --- packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
125e26e26224355531392be2ba7990afaadd8f15
+++ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
125e26e26224355531392be2ba7990afaadd8f15
@@ -0,0 +1,18 @@
+diff -r df1b780317c3 src/vm/jit/arm/asmpart.S
+--- a/src/vm/jit/arm/asmpart.S Thu Jan 17 01:01:35 2008 +0100
++++ b/src/vm/jit/arm/asmpart.S Mon Jan 21 00:14:41 2008 +0100
+@@ -323,10 +323,11 @@ asm_cacheflush:
+ mov a1, #0xff000000
+ #endif
+
++#if defined(__ARM_EABI__)
++ swi 0x0
++ ldmfd sp!, {r7}
++#else
+ swi sys_cacheflush
+-
+-#if defined(__ARM_EABI__)
+- ldmfd sp!, {r7}
+ #endif
+
+ mov pc, lr
============================================================
- --- packages/cacao/cacao_0.98+hg20071001.bb
ab5bff912c3f54f9c37573994562c9a793c71e6f
+++ packages/cacao/cacao_0.98+hg20071001.bb
6b579068c4284eea4bb711e240a0e1ff839a8583
@@ -1,12 +1,12 @@ require cacao.inc
~ require cacao.inc
- -PR = "r6"
+PR = "r7"
~ SRC_URI = "\
http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518
\
~ file://cacao-0.98+svn-libdir.diff;patch=1 \
~ file://cacao-0.98+svn-classpath_var.patch;patch=1 \
- - file://cacao-0.98+hg-arm-cacheflush-workaround.patch;patch=1 \
+ file://cacao-0.98+hg-arm-cacheflush-fix.patch;patch=1 \
~ file://cacao-0.98+hg-attachthread.patch;patch=1 \
~ "
- -----------------------------------------------------------------
Revision: b1835c42933e0c943d142d1781f5b360a057294b
Ancestor: 157be493d58806df1aa6f89ba3922778bf6d6302
Author: thebohemian at openembedded.org
Date: 2008-01-18T21:42:28
Branch: org.openembedded.dev
Modified files:
~ packages/cacao/cacao.inc
ChangeLog:
cacao: Small fix.
~ - removed superfluous configure argument
~ - has no effect on binaries so not adjusting PR
============================================================
- --- packages/cacao/cacao.inc 51c2d3e8fe9d317751a001037be7b6061a61b276
+++ packages/cacao/cacao.inc d5877a75f76a7482e5d34fd43c05a01d531486f0
@@ -19,7 +19,6 @@ EXTRA_OECONF = "\
~ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) ==
'soft']} \
~ --enable-debug \
~ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
- - --with-classpath-libdir=${STAGING_LIBDIR}/classpath \
~ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
~ --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
~ --with-target-classpath-classes=${datadir}/classpath/glibj.zip \
- -----------------------------------------------------------------
Revision: 776a345f052c5352efa0a810830a321456747f8a
Ancestor: 7be93ec190abd097c5467d4e78bd0e244dfb1a14
Author: thebohemian at openembedded.org
Date: 2008-01-16T16:08:33
Branch: org.openembedded.dev
Modified files:
~ packages/cacao/cacao_0.98+hg20071001.bb
~ packages/cacao/cacaoh-native.inc
~ packages/cacao/files/cacao-0.98+hg-attachthread.patch
ChangeLog:
cacaoh-native: Small cleanup in include file.
cacao: Added N800 quirk and a patch to fix AttachCurrentThread behavior.
============================================================
- --- packages/cacao/cacao_0.98+hg20071001.bb
d618915c42d4979c7f29cc99c5014d3bc2d99c50
+++ packages/cacao/cacao_0.98+hg20071001.bb
ab5bff912c3f54f9c37573994562c9a793c71e6f
@@ -1,6 +1,6 @@ require cacao.inc
~ require cacao.inc
- -PR = "r5"
+PR = "r6"
~ SRC_URI = "\
http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518
\
@@ -14,3 +14,9 @@ EXTRA_OECONF += "\
~ --enable-annotations \
~ "
+# Quirks for Nokia N800:
+# - with mfloat-abi=softfp the runtime fails to run anything
+# - without --enable-softfloat it cannot find files within Jars
+TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp
- -mfloat-abi=soft"
+
+EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
============================================================
- --- packages/cacao/cacaoh-native.inc
b5ccb2775f6560095089e77316fc173dd4abc9c5
+++ packages/cacao/cacaoh-native.inc
21cb933b74df6d2ac41c9593d5df8f193f74b51a
@@ -8,8 +8,7 @@ PR = "r1"
~ PR = "r1"
- -inherit autotools
- -inherit native
+inherit autotools native
~ EXTRA_OECONF = " \
~ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
============================================================
- --- packages/cacao/files/cacao-0.98+hg-attachthread.patch
8c2c1d3d004946d41425dd8ce6e7c4602fa41437
+++ packages/cacao/files/cacao-0.98+hg-attachthread.patch
4aaacaa58d869f91cd245871bcad90a6ec0c72c1
@@ -1,12 +1,89 @@
- -diff -r d8fe2c3ba284 src/threads/native/threads.c
- ---- a/src/threads/native/threads.c Sun Dec 30 17:43:35 2007 +0100
- -+++ b/src/threads/native/threads.c Wed Jan 02 16:41:57 2008 +0100
- -@@ -1432,6 +1432,8 @@ bool threads_attach_current_thread(JavaV
+# Makes the JNI function AttachCurrentThread work properly.
+
+Index: cacao-0.98+hg20071001/src/mm/boehm-gc/include/gc.h
+===================================================================
+--- cacao-0.98+hg20071001.orig/src/mm/boehm-gc/include/gc.h 2008-01-15
14:45:41.000000000 +0100
++++ cacao-0.98+hg20071001/src/mm/boehm-gc/include/gc.h 2008-01-15
14:46:30.000000000 +0100
+@@ -905,6 +905,8 @@
+ /* in returned list. */
+ extern void GC_thr_init GC_PROTO((void));/* Needed for Solaris/X86 */
- - threads_thread_set_object(thread, (java_handle_t *) t);
++extern void GC_thr_init_foreign GC_PROTO((void));/* Needed for
Solaris/X86 */
++
+ #endif /* THREADS && !SRC_M3 */
- -+ threads_set_current_threadobject(thread);
+ #if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) &&
!defined(__CYGWIN__)
+Index: cacao-0.98+hg20071001/src/mm/boehm-gc/pthread_support.c
+===================================================================
+--- cacao-0.98+hg20071001.orig/src/mm/boehm-gc/pthread_support.c
2008-01-15 14:45:41.000000000 +0100
++++ cacao-0.98+hg20071001/src/mm/boehm-gc/pthread_support.c 2008-01-15
14:46:30.000000000 +0100
+@@ -864,6 +864,27 @@
+ }
+ #endif /* GC_NETBSD_THREADS */
+
++void GC_thr_init_foreign()
++{
++# ifndef GC_DARWIN_THREADS
++ int dummy;
++# endif
++ GC_thread t;
++ LOCK();
~ +
++ /* Add the initial thread, so we can stop it. */
++ t = GC_new_thread(pthread_self());
++# ifdef GC_DARWIN_THREADS
++ t -> stop_info.mach_thread = mach_thread_self();
++# else
++ t -> stop_info.stack_ptr = (ptr_t)(&dummy);
++# endif
++ t -> flags = DETACHED;
++
++ UNLOCK();
++
++}
++
+ /* We hold the allocation lock. */
+ void GC_thr_init()
+ {
+Index: cacao-0.98+hg20071001/src/mm/boehm.c
+===================================================================
+--- cacao-0.98+hg20071001.orig/src/mm/boehm.c 2008-01-15
14:45:41.000000000 +0100
++++ cacao-0.98+hg20071001/src/mm/boehm.c 2008-01-15 14:46:30.000000000
+0100
+@@ -108,6 +108,10 @@
+ GC_expand_hp(heapstartsize - heapcurrentsize);
+ }
+
++void gc_init_foreign()
++{
++ GC_thr_init_foreign();
++}
+
+ static void gc_ignore_warnings(char *msg, GC_word arg)
+ {
+Index: cacao-0.98+hg20071001/src/mm/gc-common.h
+===================================================================
+--- cacao-0.98+hg20071001.orig/src/mm/gc-common.h 2008-01-15
14:45:41.000000000 +0100
++++ cacao-0.98+hg20071001/src/mm/gc-common.h 2008-01-15
14:46:30.000000000 +0100
+@@ -74,6 +74,7 @@
+ void gc_finalize_all(void);
+ void *gc_out_of_memory(size_t bytes_requested);
+
++void gc_init_foreign();
+
+ /* inlined functions
**********************************************************/
+
+Index: cacao-0.98+hg20071001/src/threads/native/threads.c
+===================================================================
+--- cacao-0.98+hg20071001.orig/src/threads/native/threads.c 2008-01-15
14:45:41.000000000 +0100
++++ cacao-0.98+hg20071001/src/threads/native/threads.c 2008-01-15
16:01:22.000000000 +0100
+@@ -1392,7 +1392,10 @@
+
~ /* thread is completely initialized */
++ gc_init_foreign();
++
~ threads_thread_state_runnable(thread);
++ threads_set_current_threadobject(thread);
+
+ DEBUGTHREADS("attaching", thread);
+
- -----------------------------------------------------------------
Revision: 631a3e8b95d1d4ee1d1a9ed29390bcd59924f06e
Ancestor: 791e0606e591e3b944c8399f3912e8364b4a8c06
Author: thebohemian at openembedded.org
Date: 2008-01-14T14:35:45
Branch: org.openembedded.dev
Renamed entries:
~ packages/classpath/classpath-gtk_0.93.bb to
packages/obsolete/classpath/classpath-gtk_0.93.bb
~ packages/classpath/classpath-gtk_cvs.bb to
packages/obsolete/classpath/classpath-gtk_cvs.bb
~ packages/classpath/classpath-minimal-native_0.93.bb to
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
~ packages/classpath/classpath-minimal-native_0.95.bb to
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
~ packages/classpath/classpath-minimal_0.90.bb to
packages/obsolete/classpath/classpath-minimal_0.90.bb
~ packages/classpath/classpath-minimal_0.95.bb to
packages/obsolete/classpath/classpath-minimal_0.95.bb
~ packages/classpath/classpath.inc to
packages/obsolete/classpath/classpath.inc
~ packages/classpath/classpath_0.14.bb to
packages/obsolete/classpath/classpath_0.14.bb
~ packages/classpath/classpath_0.15.bb to
packages/obsolete/classpath/classpath_0.15.bb
~ packages/classpath/classpath_0.17.bb to
packages/obsolete/classpath/classpath_0.17.bb
~ packages/classpath/classpath_0.18.bb to
packages/obsolete/classpath/classpath_0.18.bb
~ packages/classpath/classpath_0.19.bb to
packages/obsolete/classpath/classpath_0.19.bb
~ packages/classpath/classpath_0.20.bb to
packages/obsolete/classpath/classpath_0.20.bb
~ packages/classpath/classpath_cvs.bb to
packages/obsolete/classpath/classpath_cvs.bb
~ packages/classpath/files/disable-automake-checks-v2.patch to
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
~ packages/classpath/files/disable-automake-checks.patch to
packages/obsolete/classpath/files/disable-automake-checks.patch
~ packages/classpath/files/fix-endian-arm-floats.patch to
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
~ packages/classpath/files/gconf_version.patch to
packages/obsolete/classpath/files/gconf_version.patch
Added files:
~ packages/cacao/cacao-cldc.inc
~ packages/cacao/cacao_0.98+hg20071001.bb
~ packages/cacao/cacaoh-native.inc
~ packages/cacao/cacaoh-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
~ packages/cacao/files/cacao-0.98+hg-attachthread.patch
~ packages/cacao/files/cacao-0.98+svn-classpath_var.patch
~ packages/cacao/files/cacao-0.98+svn-libdir.diff
~ packages/classpath/classpath-minimal_0.96.1.bb
~ packages/classpath/classpath.inc
~ packages/classpath/classpath_0.95.bb
~ packages/classpath/classpath_0.96.1.bb
Added directories:
~ packages/obsolete/classpath
~ packages/obsolete/classpath/files
Modified files:
~ packages/cacao/cacao-cldc_0.98.bb packages/cacao/cacao.inc
~ packages/cacao/cacaoh-cldc-native_0.98.bb
~ packages/midpath/midpath-cldc-native_0.1.bb
~ packages/midpath/midpath-cldc-x11_0.1.bb
~ packages/midpath/midpath-cldc_0.1.bb
~ packages/midpath/midpath.inc
ChangeLog:
cacao 0.98+hg20071001: Added snapshot version.
cacao-cldc: Added an include recipe.
classpath: Moved versions prior 0.95 to obsolete/ .
classpath-minimal: Moved versions prior 0.95 to obsolete/ .
classpath-gtk: Moved to obsolete/.
classpath cvs: Moved to obsolete/.
classpath 0.96.1: Added new version.
classpath 0.95: Added new version.
classpath-minimal 0.96.1: Added new version.
midpath-cldc: Removed notion of virtual/cldc-api-1.1
~ - install cldc1.1.jar as midpath-cldc1.1.jar to ${datadir}/midpath-cldc
============================================================
- --- packages/cacao/cacao-cldc.inc d3ea647ce467d4d617b4ce6b05fb6270e58fda61
+++ packages/cacao/cacao-cldc.inc d3ea647ce467d4d617b4ce6b05fb6270e58fda61
@@ -0,0 +1,64 @@
+DESCRIPTION = "Cacao-cldc is a Java Virtual Machine, which uses MIDPath
CLDC as default Java core library"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "interpreters"
+
+DEPENDS = "zlib libtool classpath midpath-cldc cacaoh-cldc-native
virtual/javac-native"
+
+# Avoid version number here, otherwise dpkg will expect a package name
+# and cannot be satisfied with a package that provides classpath.
+RDEPENDS = "midpath-cldc"
+
+PROVIDES = "cacao-cldc virtual/java-cldc"
+RPROVIDES_cacao-cldc = "java-cldc-runtime"
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "\
+ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) ==
'soft']} \
+ --enable-debug \
+ --enable-jni \
+ --disable-libjvm \
+ --enable-java=cldc1.1 \
+ --with-classpath=cldc1.1 \
+
-
--with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar
\
+
-
--with-target-classpath-classes=${datadir}/midpath-cldc/midpath-cldc1.1.jar
\
+ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-cldc-${PV} \
+ --with-classpath-libdir=${STAGING_LIBDIR}/classpath \
+ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+ --with-vm-zip=${datadir}/cacao-cldc/vm.zip \
+ --libdir=${libdir}/cacao-cldc \
+ --program-suffix=-cldc \
+ "
+
+S = "${WORKDIR}/cacao-${PV}"
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
+
+FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}"
+FILES_${PN}-doc = "${datadir}/man"
+FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+
+ALTERNATIVE_NAME = "java-cldc"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PATH = "${bindir}/cacao-cldc"
+ALTERNATIVE_PRIORITY = "10"
+
+do_configure_prepend() {
+ # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+ # configured in OE.
+ if [ -e src/vm/properties.c ]; then
+ sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/properties.c
+ fi
+
+ if [ -e src/vm/properties.c ]; then
+ sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/vm.c
+ fi
+}
+
+do_configure_append() {
+ # Fix the executable name in the wrapper script.
+ sed -i -e "s|exec cacao|exec cacao-cldc|" src/scripts/java.in
+}
+
============================================================
- --- packages/cacao/cacao_0.98+hg20071001.bb
d618915c42d4979c7f29cc99c5014d3bc2d99c50
+++ packages/cacao/cacao_0.98+hg20071001.bb
d618915c42d4979c7f29cc99c5014d3bc2d99c50
@@ -0,0 +1,16 @@
+require cacao.inc
+
+PR = "r5"
+
+SRC_URI = "\
+
http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518
\
+ file://cacao-0.98+svn-libdir.diff;patch=1 \
+ file://cacao-0.98+svn-classpath_var.patch;patch=1 \
+ file://cacao-0.98+hg-arm-cacheflush-workaround.patch;patch=1 \
+ file://cacao-0.98+hg-attachthread.patch;patch=1 \
+ "
+
+EXTRA_OECONF += "\
+ --enable-annotations \
+ "
+
============================================================
- --- packages/cacao/cacaoh-native.inc
b5ccb2775f6560095089e77316fc173dd4abc9c5
+++ packages/cacao/cacaoh-native.inc
b5ccb2775f6560095089e77316fc173dd4abc9c5
@@ -0,0 +1,28 @@
+DESCRIPTION = "Header generator for Cacao JVM - Needed for
cross-compilation builds"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE = "GPL"
+
+DEPENDS = "libtool-native zlib-native virtual/javac-native
classpath-native"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+PR = "r1"
+
+inherit autotools
+inherit native
+
+EXTRA_OECONF = " \
+ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+ --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+ "
+
+do_compile() {
+ # Compile the header generator only (and what is needed for it).
+ oe_runmake -C src/toolbox libtoolbox.la
+ oe_runmake -C src/vmcore libvmcore.la
+ oe_runmake -C src/cacaoh cacaoh
+}
+
+do_stage() {
+ install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-${PV}
+}
============================================================
- --- packages/cacao/cacaoh-native_0.98+hg20071001.bb
3e9914f2a492d38de75e478cba4c16addca80a06
+++ packages/cacao/cacaoh-native_0.98+hg20071001.bb
3e9914f2a492d38de75e478cba4c16addca80a06
@@ -0,0 +1,5 @@
+require cacaoh-native.inc
+
+SRC_URI =
"http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+
============================================================
- --- packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
b4231277ce3d268059eaa141886c615a2dac0fc5
+++ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
b4231277ce3d268059eaa141886c615a2dac0fc5
@@ -0,0 +1,50 @@
+Index: cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S
+===================================================================
+--- cacao-0.98+hg7750.orig/src/vm/jit/arm/asmpart.S 2007-11-28
10:14:51.000000000 +0100
++++ cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S 2007-11-28
10:15:31.000000000 +0100
+@@ -302,35 +302,21 @@
+ *
~ *
+
*******************************************************************************/
+
+-.equ sys_cacheflush,__ARM_NR_cacheflush /* syscall number for cache
flushing */
+-
++.equ sys_cacheflush, 0x9f0002
+ asm_cacheflush:
+- add a1, a0, a1
+- mov a2, #0
+-
+-#if defined(__ARM_EABI__)
+- /* According to EABI, the syscall number should be passed via R7,
+- see "http://wiki.debian.org/ArmEabiPort" for additional details. */
+-
+- stmfd sp!, {r7}
+- mov r7, #0x0f0000
+- add r7, r7, #0x000002
+-#endif
++ add a1, a0, a1
++ mov a2, #0
+
+ #if 0
+- /* TWISTI: required on iyonix, maybe a linux-2.4 bug */
+- mov a0, #0x0
+- mov a1, #0xff000000
++ /* TWISTI: required on iyonix, maybe a linux-2.4 bug */
++ /* TODO: repeair this! */
++ /* cacheflush is messed up beyond all repair! */
++ mov a0, #0x0
++ mov a1, #0xff000000
+ #endif
+
+- swi sys_cacheflush
+-
+-#if defined(__ARM_EABI__)
+- ldmfd sp!, {r7}
+-#endif
+-
+- mov pc, lr
+-
++ swi #sys_cacheflush
++ mov pc, lr
+
+ /* disable exec-stacks
********************************************************/
+
============================================================
- --- packages/cacao/files/cacao-0.98+hg-attachthread.patch
8c2c1d3d004946d41425dd8ce6e7c4602fa41437
+++ packages/cacao/files/cacao-0.98+hg-attachthread.patch
8c2c1d3d004946d41425dd8ce6e7c4602fa41437
@@ -0,0 +1,12 @@
+diff -r d8fe2c3ba284 src/threads/native/threads.c
+--- a/src/threads/native/threads.c Sun Dec 30 17:43:35 2007 +0100
++++ b/src/threads/native/threads.c Wed Jan 02 16:41:57 2008 +0100
+@@ -1432,6 +1432,8 @@ bool threads_attach_current_thread(JavaV
+
+ threads_thread_set_object(thread, (java_handle_t *) t);
+
++ threads_set_current_threadobject(thread);
++
+ /* thread is completely initialized */
+
+ threads_thread_state_runnable(thread);
============================================================
- --- packages/cacao/files/cacao-0.98+svn-classpath_var.patch
3ba0b66a46c0306ff811d3930f646fe0074b7477
+++ packages/cacao/files/cacao-0.98+svn-classpath_var.patch
3ba0b66a46c0306ff811d3930f646fe0074b7477
@@ -0,0 +1,56 @@
+Index: cacao-trunk/src/vm/properties.c
+===================================================================
+--- cacao-trunk.orig/src/vm/properties.c 2007-08-31 13:28:53.000000000
+0200
++++ cacao-trunk/src/vm/properties.c 2007-09-03 00:36:14.000000000 +0200
+@@ -294,14 +294,14 @@
+ len =
+ strlen(CACAO_VM_ZIP) +
+ strlen(":") +
+- strlen(CLASSPATH_CLASSES) +
++ strlen(TARGET_CLASSPATH_CLASSES) +
+ strlen("0");
+
+ boot_class_path = MNEW(char, len);
+
+ strcpy(boot_class_path, CACAO_VM_ZIP);
+ strcat(boot_class_path, ":");
+- strcat(boot_class_path, CLASSPATH_CLASSES);
++ strcat(boot_class_path, TARGET_CLASSPATH_CLASSES);
+
+ # elif defined(WITH_CLASSPATH_SUN)
+
+Index: cacao-trunk/configure.ac
+===================================================================
+--- cacao-trunk.orig/configure.ac 2007-08-31 13:22:03.000000000 +0200
++++ cacao-trunk/configure.ac 2007-08-31 13:30:44.000000000 +0200
+@@ -851,6 +851,7 @@
+ AC_CHECK_WITH_CLASSPATH
+ AC_CHECK_WITH_CLASSPATH_PREFIX
+ AC_CHECK_WITH_CLASSPATH_CLASSES
++AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES
+ AC_CHECK_WITH_CLASSPATH_LIBDIR
+ AC_CHECK_WITH_CLASSPATH_INCLUDEDIR
+
+Index: cacao-trunk/m4/classpath.m4
+===================================================================
+--- cacao-trunk.orig/m4/classpath.m4 2007-08-31 13:22:21.000000000 +0200
++++ cacao-trunk/m4/classpath.m4 2007-08-31 13:30:55.000000000 +0200
+@@ -98,6 +98,18 @@
+ AC_SUBST(CLASSPATH_CLASSES)
+ ])
+
++dnl where are Java core library classes installed on the target
++
++AC_DEFUN([AC_CHECK_WITH_TARGET_CLASSPATH_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are installed on the
target)
++AC_ARG_WITH([target-classpath-classes],
++
[AS_HELP_STRING(--with-target-classpath-classes=<path>,path to Java core
library classes (includes the name of the file and may be flat)
[[default=/usr/local/classpath/share/classpath/glibj.zip]])],
++ [TARGET_CLASSPATH_CLASSES=${withval}],
++
[TARGET_CLASSPATH_CLASSES=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${TARGET_CLASSPATH_CLASSES})
++AC_DEFINE_UNQUOTED([TARGET_CLASSPATH_CLASSES],
"${TARGET_CLASSPATH_CLASSES}", [Java core library classes on the target])
++AC_SUBST(TARGET_CLASSPATH_CLASSES)
++])
+
+ dnl where are Java core library native libraries installed
+
============================================================
- --- packages/cacao/files/cacao-0.98+svn-libdir.diff
b97c32544ee97fef51a7222eb879ce6e68e3d1d4
+++ packages/cacao/files/cacao-0.98+svn-libdir.diff
b97c32544ee97fef51a7222eb879ce6e68e3d1d4
@@ -0,0 +1,30 @@
+Index: cacao-trunk/src/vm/properties.c
+===================================================================
+--- cacao-trunk.orig/src/vm/properties.c 2007-08-31 13:20:41.000000000
+0200
++++ cacao-trunk/src/vm/properties.c 2007-09-04 14:54:19.000000000 +0200
+@@ -210,15 +210,22 @@
+
+ # if defined(WITH_CLASSPATH_GNU)
+
+- boot_library_path = CLASSPATH_LIBDIR"/classpath";
++ boot_library_path = CLASSPATH_LIBDIR"/classpath:OE_LIBDIR_JNI";
+
+ # elif defined(WITH_CLASSPATH_SUN)
+
+- boot_library_path = CLASSPATH_LIBDIR;
++ boot_library_path = CLASSPATH_LIBDIR":OE_LIBDIR_JNI";
+
+ # elif defined(WITH_CLASSPATH_CLDC1_1)
+
+- /* No boot_library_path required. */
++ /* No boot_library_path required.
++ Well, don't be that strict on Debian-like
++ environments. Setting this to /usr/lib/jni
++ makes it unneccessary to fumble with
++ LD_LIBRARY_PATH to get things like MIDPath
++ running.
++ */
++ boot_library_path = "OE_LIBDIR_JNI";
+
+ # else
+ # error unknown classpath configuration
============================================================
- --- packages/cacao/cacao-cldc_0.98.bb
30dc5f90b7c873db39b062938df364519af3816b
+++ packages/cacao/cacao-cldc_0.98.bb
7a579745f970088319acb19f5f2f1ab814666abf
@@ -1,35 +1,17 @@
+# Compatible with GNU Classpath 0.95 only!
- -require cacao.inc
+require cacao-cldc.inc
- -SRC_URI +="file://midpath.patch;patch=1 \
- - file://offsets_make.patch;patch=1 \
- - file://classpath_var.patch;patch=1 \
- - file://libmath.patch;patch=1 \
- - file://arm_mmap.patch;patch=1 \
- - "
- -SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1"
+PR = "r1"
- -DEPENDS = "cacaoh-cldc-native virtual/javac-native
classpath-minimal-native virtual/cldc-api-1.1 libtool zlib"
- -RDEPENDS = "virtual/cldc-api-1.1 libltdl"
- -RPROVIDES = "virtual/java"
+SRC_URI += "\
+
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346
\
+ file://midpath.patch;patch=1 \
+ file://offsets_make.patch;patch=1 \
+ file://classpath_var.patch;patch=1 \
+ file://libmath.patch;patch=1 \
+ file://arm_mmap.patch;patch=1 \
+ "
- -EXTRA_OECONF +=
"--with-classpath-libdir=${STAGING_DATADIR}/classpath-minimal \
- -
- --with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \
- - --enable-jni \
- - --enable-java=cldc1.1 \
- - --with-classpath=cldc1.1 \
- -
- --with-classpath-classes=${STAGING_DATADIR}/java/cldc1.1.jar \
- - --with-target-classpath-classes=${datadir}/java/cldc1.1.jar \
- - --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh \
- - --disable-libjvm \
- - "
+SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1"
- -PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
- -
- -FILES_${PN} = "${bindir}/cacao"
- -FILES_${PN}-doc = "${datadir}/man"
- -FILES_${PN}-dbg = "${bindir}/.debug"
- -
- -ALTERNATIVE_NAME = "java"
- -ALTERNATIVE_PATH = "${bindir}/cacao"
- -ALTERNATIVE_PRIORITY = "10"
============================================================
- --- packages/cacao/cacao.inc d8bc9087bb9ca79854ffb1d26ff94e4bafea0159
+++ packages/cacao/cacao.inc 51c2d3e8fe9d317751a001037be7b6061a61b276
@@ -1,16 +1,52 @@
- -DESCRIPTION = "cacao is a Java Virtual Machine, which uses GNU
Classpath as default Java core library"
+DESCRIPTION = "Cacao is a Java Virtual Machine, which uses GNU
Classpath as default Java core library"
~ HOMEPAGE = "http://www.cacaojvm.org/"
~ LICENSE = "GPL"
~ PRIORITY = "optional"
~ SECTION = "interpreters"
- -PR = "r1"
- -inherit autotools
+DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native"
- -SRC_URI =
"http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.98/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346"
+# Avoid version number here, otherwise dpkg will expect a package name
+# and cannot be satisfied with a package that provides classpath.
+RDEPENDS = "classpath"
- -S = "${WORKDIR}/cacao-${PV}"
+PROVIDES = "cacao virtual/java"
+RPROVIDES_cacao = "java2-runtime"
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "\
+ ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) ==
'soft']} \
+ --enable-debug \
+ --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
+ --with-classpath-libdir=${STAGING_LIBDIR}/classpath \
+ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+ --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+ --with-target-classpath-classes=${datadir}/classpath/glibj.zip \
+ --with-vm-zip=${datadir}/cacao/vm.zip \
+ --with-classpath-libdir=${libdir} \
+ "
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
+
+FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}"
+FILES_${PN}-doc = "${datadir}/man"
+FILES_${PN}-dbg = "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+
+ALTERNATIVE_NAME = "java"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PATH = "${bindir}/cacao"
+ALTERNATIVE_PRIORITY = "10"
+
+do_configure_prepend() {
+ # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+ # configured in OE.
+ if [ -e src/vm/properties.c ]; then
+ sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/properties.c
+ fi
+
+ if [ -e src/vm/properties.c ]; then
+ sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/vm.c
+ fi
+}
+
- -EXTRA_OECONF = "--disable-debug \
- - ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) ==
'soft']} \
- - "
============================================================
- --- packages/cacao/cacaoh-cldc-native_0.98.bb
5b676e0ee5aa6d0369047b0842da204b9aee2143
+++ packages/cacao/cacaoh-cldc-native_0.98.bb
cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb
@@ -1,16 +1,19 @@
+require cacaoh-native.inc
- -require cacao.inc
+DEPENDS += "midpath-cldc-native"
- -DEPENDS = "virtual/javac-native classpath-minimal-native
virtual/cldc-api-1.1-native libtool-native zlib-native"
+SRC_URI = "\
+
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346
\
+ "
- -inherit native
- -
- -EXTRA_OECONF +=
"--with-classpath-includedir=${STAGING_INCDIR}/classpath-minimal \
- - --enable-jni \
- - --enable-java=cldc1.1 \
- - --with-classpath=cldc1.1 \
- - --with-classpath-classes=${STAGING_DATADIR}/java/cldc1.1.jar \
- - "
+EXTRA_OECONF += "\
+ --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+ --enable-jni \
+ --enable-java=cldc1.1 \
+ --with-classpath=cldc1.1 \
+
-
--with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar
\
+"
+
~ do_stage() {
- - install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/
+ install -m 0755 src/cacaoh/.libs/cacaoh
${STAGING_BINDIR}/cacaoh-cldc-${PV}
~ }
- -----------------------------------------------------------------
Revision: a33eb17e4fab8b119709ca7c8430f47513a457d9
Ancestor: 2e4f188aff9f2db155896f2fc0669c515d2d86c3
Author: thebohemian at openembedded.org
Date: 2008-01-14T07:40:04
Branch: org.openembedded.dev
Modified files:
~ packages/cacao/cacao-cldc_0.98.bb
~ packages/cacao/cacaoh-cldc-native_0.98.bb
ChangeLog:
cacao-cldc: Use virtual/javac-native.
cacaoh-cldc-native: Use virtual/javac-native.
============================================================
- --- packages/cacao/cacao-cldc_0.98.bb
d075f4c8402dcd779ca32535993ba6af6aafdafd
+++ packages/cacao/cacao-cldc_0.98.bb
30dc5f90b7c873db39b062938df364519af3816b
@@ -9,7 +9,7 @@ SRC_URI_append_arm = "file://offset.h_ar
~ "
~ SRC_URI_append_arm = "file://offset.h_arm.patch;patch=1"
- -DEPENDS = "cacaoh-cldc-native ecj-native classpath-minimal-native
virtual/cldc-api-1.1 libtool zlib"
+DEPENDS = "cacaoh-cldc-native virtual/javac-native
classpath-minimal-native virtual/cldc-api-1.1 libtool zlib"
~ RDEPENDS = "virtual/cldc-api-1.1 libltdl"
~ RPROVIDES = "virtual/java"
============================================================
- --- packages/cacao/cacaoh-cldc-native_0.98.bb
70727331bb54728e45f64ce0f2d252d870e2bf51
+++ packages/cacao/cacaoh-cldc-native_0.98.bb
5b676e0ee5aa6d0369047b0842da204b9aee2143
@@ -1,7 +1,7 @@ require cacao.inc
~ require cacao.inc
- -DEPENDS = "ecj-native classpath-minimal-native
virtual/cldc-api-1.1-native libtool-native zlib-native"
+DEPENDS = "virtual/javac-native classpath-minimal-native
virtual/cldc-api-1.1-native libtool-native zlib-native"
~ inherit native
- -----------------------------------------------------------------
Revision: 64c06913c22a9e5e86178b37c2a23bd8aa5baf77
Ancestor: d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
Author: thebohemian at openembedded.org
Date: 2008-01-09T13:22:37
Branch: org.openembedded.dev
Added files:
~ packages/cacao/cacao-initial_0.98.bb
~ packages/cacao/cacao-native.inc
~ packages/cacao/cacao-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98-initial.patch
~ packages/classpath/classpath-initial_0.93.bb
~ packages/classpath/classpath-native.inc
~ packages/classpath/classpath-native_0.96.1.bb
~ packages/classpath/files/gjar-prefix-patch.diff
~ packages/ecj/ecj-bootstrap-native_3.3.bb
~ packages/ecj/ecj-initial_3.3.bb packages/ecj/files/ecj.in
~ packages/jamvm/files/jamvm_1.5.0-initial.patch
~ packages/jamvm/jamvm-initial_1.5.0.bb
~ packages/jikes/jikes-initial.bb
Added directories:
~ packages/jamvm/files
Modified files:
~ packages/jikes/jikes-native_1.21.bb
Modified attrs:
~ packages/ecj/files/ecj.in
ChangeLog:
jamvm: Added -initial version.
cacao: Multiple fixes.
~ - added -initial version
~ - added -native snapshot version
classpath:
~ - added -initial version
~ - added -native version
ecj:
~ - added -initial version
~ - added -native version that is compiled from source
jikes:
~ - jikes-native is not a virtual/javac-native provider any more
============================================================
- --- packages/cacao/cacao-initial_0.98.bb
154e9de597ec6ab475c760aca2814514979356ea
+++ packages/cacao/cacao-initial_0.98.bb
154e9de597ec6ab475c760aca2814514979356ea
@@ -0,0 +1,34 @@
+require cacao-native.inc
+
+PROVIDES = "virtual/java-initial"
+
+DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial
jikes-initial"
+
+PR = "r0"
+
+SRC_URI = "\
+
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;
\
+ file://cacao-0.98-initial.patch;patch=1;pnum=1 \
+ "
+
+# libjvm disabled - it would conflict with cacao-native installations
+EXTRA_OECONF = "\
+ --enable-debug \
+ --with-classpath-libdir=${libdir} \
+ --with-classpath-includedir=${includedir}/classpath-initial \
+ --with-classpath-classes=${datadir}/classpath-initial/glibj.zip \
+ --with-vm-zip=${datadir}/cacao-initial/vm.zip \
+ --program-suffix=-initial \
+ --disable-libjvm \
+ "
+
+# enforces the usage of jikes-initial
+export JAVAC=jikes-initial
+
+# enforces the usage of fastjar
+export JAR=fastjar
+
+do_configure_append() {
+ # Fix the executable name in the wrapper script.
+ sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in
+}
============================================================
- --- packages/cacao/cacao-native.inc
cc20995498c174c9ac504a54e5d844cfddfb8f3f
+++ packages/cacao/cacao-native.inc cc20995498c174c9ac504a54e5d844cfddfb8f3f
@@ -0,0 +1,27 @@
+DESCRIPTION = "CacaoVM for use as OpenEmbedded's Java VM"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE = "GPL"
+PRIORITY = "optional"
+SECTION = "interpreters"
+
+DEPENDS = "zlib-native libtool-native classpath-native ecj-initial
fastjar-native"
+
+PROVIDES = "virtual/java-native"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+inherit native autotools
+
+EXTRA_OECONF = "\
+ --enable-debug \
+ --with-classpath-libdir=${libdir} \
+ --with-classpath-includedir=${includedir}/classpath \
+ --with-classpath-classes=${datadir}/classpath/glibj.zip \
+ --with-vm-zip=${datadir}/cacao/vm.zip \
+ "
+
+# force usage of ecj-initial (but Java5-compatible class library)
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath
${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+
+# force usage of fastjar
+export JAR=fastjar
============================================================
- --- packages/cacao/cacao-native_0.98+hg20071001.bb
b087b9a24b9593dfff241d8dbafef831492c316b
+++ packages/cacao/cacao-native_0.98+hg20071001.bb
b087b9a24b9593dfff241d8dbafef831492c316b
@@ -0,0 +1,5 @@
+require cacao-native.inc
+
+PR = "r1"
+
+SRC_URI =
"http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
============================================================
- --- packages/cacao/files/cacao-0.98-initial.patch
0ae2a924095b58fa9168774fc8b8a24c6093e87f
+++ packages/cacao/files/cacao-0.98-initial.patch
0ae2a924095b58fa9168774fc8b8a24c6093e87f
@@ -0,0 +1,45 @@
+Index: cacao-0.98/configure.ac
+===================================================================
+--- cacao-0.98.orig/configure.ac 2007-12-19 22:07:55.000000000 +0100
++++ cacao-0.98/configure.ac 2007-12-19 22:08:02.000000000 +0100
+@@ -27,7 +27,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+
+-AC_INIT(cacao, 0.98, cacao at cacaojvm.org)
++AC_INIT(cacao-initial, 0.98, cacao at cacaojvm.org)
+ AC_CONFIG_SRCDIR(src/cacao/cacao.c)
+ AC_CANONICAL_HOST
+ AC_PREREQ(2.59)
+Index: cacao-0.98/src/vm/vm.c
+===================================================================
+--- cacao-0.98.orig/src/vm/vm.c 2007-12-19 22:31:19.000000000 +0100
++++ cacao-0.98/src/vm/vm.c 2007-12-19 22:32:36.000000000 +0100
+@@ -623,7 +623,7 @@
+ #else
+ puts(" java.boot.class.path : "CLASSPATH_CLASSES"");
+ #endif
+- puts(" gnu.classpath.boot.library.path:
"CLASSPATH_LIBDIR"/classpath\n");
++ puts(" gnu.classpath.boot.library.path:
"CLASSPATH_LIBDIR"/classpath-initial\n");
+
+ puts("Runtime variables:\n");
+ printf(" maximum heap size : %d\n", opt_heapmaxsize);
+@@ -828,15 +828,15 @@
+
+ /* and finally set the path to GNU Classpath libraries */
+
+- len = strlen(cacao_prefix) + strlen("/lib/classpath") + strlen("0");
++ len = strlen(cacao_prefix) + strlen("/lib/classpath-initial") +
strlen("0");
+
+ classpath_libdir = MNEW(char, len);
+ strcpy(classpath_libdir, cacao_prefix);
+- strcat(classpath_libdir, "/lib/classpath");
++ strcat(classpath_libdir, "/lib/classpath-initial");
+ #else
+ cacao_prefix = CACAO_PREFIX;
+ cacao_libjvm = CACAO_LIBDIR"/libjvm";
+- classpath_libdir = CLASSPATH_LIBDIR"/classpath";
++ classpath_libdir = CLASSPATH_LIBDIR"/classpath-initial";
+ #endif
+
+ /* set the bootclasspath */
- -----------------------------------------------------------------
Revision: 631a3e8b95d1d4ee1d1a9ed29390bcd59924f06e
Ancestor: 791e0606e591e3b944c8399f3912e8364b4a8c06
Author: thebohemian at openembedded.org
Date: 2008-01-14T14:35:45
Branch: org.openembedded.dev
Renamed entries:
~ packages/classpath/classpath-gtk_0.93.bb to
packages/obsolete/classpath/classpath-gtk_0.93.bb
~ packages/classpath/classpath-gtk_cvs.bb to
packages/obsolete/classpath/classpath-gtk_cvs.bb
~ packages/classpath/classpath-minimal-native_0.93.bb to
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
~ packages/classpath/classpath-minimal-native_0.95.bb to
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
~ packages/classpath/classpath-minimal_0.90.bb to
packages/obsolete/classpath/classpath-minimal_0.90.bb
~ packages/classpath/classpath-minimal_0.95.bb to
packages/obsolete/classpath/classpath-minimal_0.95.bb
~ packages/classpath/classpath.inc to
packages/obsolete/classpath/classpath.inc
~ packages/classpath/classpath_0.14.bb to
packages/obsolete/classpath/classpath_0.14.bb
~ packages/classpath/classpath_0.15.bb to
packages/obsolete/classpath/classpath_0.15.bb
~ packages/classpath/classpath_0.17.bb to
packages/obsolete/classpath/classpath_0.17.bb
~ packages/classpath/classpath_0.18.bb to
packages/obsolete/classpath/classpath_0.18.bb
~ packages/classpath/classpath_0.19.bb to
packages/obsolete/classpath/classpath_0.19.bb
~ packages/classpath/classpath_0.20.bb to
packages/obsolete/classpath/classpath_0.20.bb
~ packages/classpath/classpath_cvs.bb to
packages/obsolete/classpath/classpath_cvs.bb
~ packages/classpath/files/disable-automake-checks-v2.patch to
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
~ packages/classpath/files/disable-automake-checks.patch to
packages/obsolete/classpath/files/disable-automake-checks.patch
~ packages/classpath/files/fix-endian-arm-floats.patch to
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
~ packages/classpath/files/gconf_version.patch to
packages/obsolete/classpath/files/gconf_version.patch
Added files:
~ packages/cacao/cacao-cldc.inc
~ packages/cacao/cacao_0.98+hg20071001.bb
~ packages/cacao/cacaoh-native.inc
~ packages/cacao/cacaoh-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
~ packages/cacao/files/cacao-0.98+hg-attachthread.patch
~ packages/cacao/files/cacao-0.98+svn-classpath_var.patch
~ packages/cacao/files/cacao-0.98+svn-libdir.diff
~ packages/classpath/classpath-minimal_0.96.1.bb
~ packages/classpath/classpath.inc
~ packages/classpath/classpath_0.95.bb
~ packages/classpath/classpath_0.96.1.bb
Added directories:
~ packages/obsolete/classpath
~ packages/obsolete/classpath/files
Modified files:
~ packages/cacao/cacao-cldc_0.98.bb packages/cacao/cacao.inc
~ packages/cacao/cacaoh-cldc-native_0.98.bb
~ packages/midpath/midpath-cldc-native_0.1.bb
~ packages/midpath/midpath-cldc-x11_0.1.bb
~ packages/midpath/midpath-cldc_0.1.bb
~ packages/midpath/midpath.inc
ChangeLog:
cacao 0.98+hg20071001: Added snapshot version.
cacao-cldc: Added an include recipe.
classpath: Moved versions prior 0.95 to obsolete/ .
classpath-minimal: Moved versions prior 0.95 to obsolete/ .
classpath-gtk: Moved to obsolete/.
classpath cvs: Moved to obsolete/.
classpath 0.96.1: Added new version.
classpath 0.95: Added new version.
classpath-minimal 0.96.1: Added new version.
midpath-cldc: Removed notion of virtual/cldc-api-1.1
~ - install cldc1.1.jar as midpath-cldc1.1.jar to ${datadir}/midpath-cldc
============================================================
- --- packages/classpath/classpath-minimal_0.96.1.bb
e55ff8e0007e4814498b21013d19e63123d425ee
+++ packages/classpath/classpath-minimal_0.96.1.bb
e55ff8e0007e4814498b21013d19e63123d425ee
@@ -0,0 +1,17 @@
+require classpath.inc
+
+PR = "r3"
+
+SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+
+PROVIDES = "${PN} classpath"
+
+EXTRA_OECONF += "\
+ --enable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --disable-examples \
+ "
============================================================
- --- packages/classpath/classpath.inc
f89bbf74a4b188100d82872ac4cea3f094bafca9
+++ packages/classpath/classpath.inc
f89bbf74a4b188100d82872ac4cea3f094bafca9
@@ -0,0 +1,64 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PBN = "classpath"
+
+DEPENDS = "virtual/javac-native fastjar-native zip-native"
+RPROVIDES = ""
+
+RDEPENDS_${PN} = "${PBN}-common (>= ${PV})"
+
+RPROVIDES_${PN} = "${PBN}"
+RPROVIDES_${PN}-gtk = "${PBN}-awt"
+
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+S = "${WORKDIR}/${PBN}-${PV}"
+
+EXTRA_OECONF = "\
+ --with-glibj \
+ --with-ecj=javac \
+ --with-fastjar=fastjar \
+ --includedir=${includedir}/classpath \
+ --with-vm=java \
+ "
+
+inherit autotools
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/classpath
+ install -m 0644 include/jni* ${STAGING_INCDIR}/classpath
+ install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/
+
+ install -d ${STAGING_DATADIR}/classpath
+ install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath
+}
+
+do_install() {
+ autotools_do_install
+ mv ${D}${libdir}/security ${D}${libdir}/${PBN}
+}
+
+PACKAGES =+ "${PBN}-common ${PN}-examples \
+ ${PN}-tools ${PN}-tools-doc \
+ ${PN}-gtk ${PN}-gconf "
+
+FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}"
+
+FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip
${libdir}/logging.properties ${libdir}/${PBN}/security"
+FILES_${PN}-examples = "${datadir}/${PBN}/examples"
+
+FILES_${PN}-tools = "${datadir}/${PBN}/tools.zip ${bindir}"
+FILES_${PN}-tools-doc = "${mandir}"
+
+FILES_${PN}-dbg += "${libdir}/${PBN}/.debug"
+FILES_${PN}-doc = "${infodir}"
+
+# gcjwebplugin - not built yet
+#FILES_${PN}-gcjwebplugin = "${libdir}/${PBN}/libgcjwebplugin.so"
+FILES_${PN}-gtk = "${libdir}/${PBN}/libgtkpeer.so
${libdir}/${PBN}/libjawt.so"
+FILES_${PN}-gconf = "${libdir}/${PBN}/libgconfpeer.so"
+FILES_${PN} = "${libdir}/${PBN}/lib*so*"
+
============================================================
- --- packages/classpath/classpath_0.95.bb
d2f820a6ce35613717c16b3612ca071f4d918e83
+++ packages/classpath/classpath_0.95.bb
d2f820a6ce35613717c16b3612ca071f4d918e83
@@ -0,0 +1,20 @@
+require classpath.inc
+
+SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+
+PR = "r2"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+ --disable-alsa \
+ --disable-dssi \
+ --disable-qt4-peer \
+ --disable-plugin \
+ --enable-gconf-peer \
+ --enable-gtk-peer \
+ --enable-local-sockets \
+ --with-vm=java \
+ "
+
+
============================================================
- --- packages/classpath/classpath_0.96.1.bb
d2f820a6ce35613717c16b3612ca071f4d918e83
+++ packages/classpath/classpath_0.96.1.bb
d2f820a6ce35613717c16b3612ca071f4d918e83
@@ -0,0 +1,20 @@
+require classpath.inc
+
+SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+
+PR = "r2"
+
+DEPENDS += "gtk+ gconf libxtst"
+
+EXTRA_OECONF += "\
+ --disable-alsa \
+ --disable-dssi \
+ --disable-qt4-peer \
+ --disable-plugin \
+ --enable-gconf-peer \
+ --enable-gtk-peer \
+ --enable-local-sockets \
+ --with-vm=java \
+ "
+
+
- -----------------------------------------------------------------
Revision: f7a565e7e910cea46808ec61590556a6b97dff74
Ancestor: 79d45e73d2895ffcdc7d64585b097a492ffdd6d9
Author: Laibsch at openembedded.org
Date: 2008-01-14T13:40:49
Branch: org.openembedded.dev
Modified files:
~ packages/classpath/classpath-gtk_0.93.bb
~ packages/classpath/classpath-minimal-native_0.93.bb
~ packages/classpath/classpath-minimal_0.90.bb
~ packages/classpath/classpath_0.14.bb
~ packages/classpath/classpath_0.15.bb
~ packages/classpath/classpath_0.17.bb
~ packages/classpath/classpath_0.18.bb
~ packages/classpath/classpath_0.19.bb
~ packages/classpath/classpath_0.20.bb
~ packages/classpath/classpath_cvs.bb
~ packages/jikes/jikes-initial.bb packages/kaffe/kaffe.inc
~ packages/sablevm/sablevm-classpath_1.1.9.bb
~ packages/sablevm/sablevm-classpath_1.11.3.bb
~ packages/sablevm/sablevm-classpath_1.12.bb
ChangeLog:
java packages: replace jikes-native in DEPENDS with
"virtual/javac-native". Partly closes bug 3655.
============================================================
- --- packages/classpath/classpath-gtk_0.93.bb
29471612c52f1a188aaf73a43ff614b4d3287cc6
+++ packages/classpath/classpath-gtk_0.93.bb
f2e339fbff8d86d459a25301181d25515695fafe
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst
jikes-native zip-native"
+DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst
virtual/javac-native zip-native"
~ RDEPENDS_${PN} = "classpath-common (>= ${PV})"
~ RCONFLICTS_${PN} = "classpath-minimal"
============================================================
- --- packages/classpath/classpath-minimal-native_0.93.bb
c55a20a34483babe4a85fbdbabfc8c762ed34d96
+++ packages/classpath/classpath-minimal-native_0.93.bb
d4445847f35475d564e7d7e49cb969e6a923df12
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
+DEPENDS = "glib-2.0 libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ PR = "r1"
~ SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
============================================================
- --- packages/classpath/classpath-minimal_0.90.bb
7d81cd98d13478abeb43424709d6e0fc7481e3ad
+++ packages/classpath/classpath-minimal_0.90.bb
9be0ecfccc014f6e6cccfd13e622e6aa885a4089
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "jikes-native zip-native"
+DEPENDS = "virtual/javac-native zip-native"
~ RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})"
~ RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
============================================================
- --- packages/classpath/classpath_0.14.bb
1907cb3b650ac080b81051e1df40834b6869160a
+++ packages/classpath/classpath_0.14.bb
458daa52c257e456d1c354f9ecf1c6c6c1f71246
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (${PV})"
~ PR = "r2"
============================================================
- --- packages/classpath/classpath_0.15.bb
1907cb3b650ac080b81051e1df40834b6869160a
+++ packages/classpath/classpath_0.15.bb
458daa52c257e456d1c354f9ecf1c6c6c1f71246
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (${PV})"
~ PR = "r2"
============================================================
- --- packages/classpath/classpath_0.17.bb
1907cb3b650ac080b81051e1df40834b6869160a
+++ packages/classpath/classpath_0.17.bb
458daa52c257e456d1c354f9ecf1c6c6c1f71246
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (${PV})"
~ PR = "r2"
============================================================
- --- packages/classpath/classpath_0.18.bb
8f5840f5d971a6c33981e5ddddb12fdefca9a1d4
+++ packages/classpath/classpath_0.18.bb
c3f43049f100f492b31da016d37a218835fe6297
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
~ PR = "r1"
============================================================
- --- packages/classpath/classpath_0.19.bb
8f5840f5d971a6c33981e5ddddb12fdefca9a1d4
+++ packages/classpath/classpath_0.19.bb
c3f43049f100f492b31da016d37a218835fe6297
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
~ PR = "r1"
============================================================
- --- packages/classpath/classpath_0.20.bb
8f5840f5d971a6c33981e5ddddb12fdefca9a1d4
+++ packages/classpath/classpath_0.20.bb
c3f43049f100f492b31da016d37a218835fe6297
@@ -1,6 +1,6 @@ require classpath.inc
~ require classpath.inc
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
~ PR = "r1"
============================================================
- --- packages/classpath/classpath_cvs.bb
ca7c59f95b8afe060854c150114e852325cd9c7c
+++ packages/classpath/classpath_cvs.bb
9d90e1ff83f7f0f9d7e2e5df46770f7d4b180b2c
@@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1"
~ DEFAULT_PREFERENCE = "-1"
- -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native
zip-native"
+DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native
zip-native"
~ RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
~ SRC_URI =
"cvs://anoncvs@cvs.gnu.org/cvsroot/classpath;method=pserver;rsh=ssh;module=classpath
\
- -----------------------------------------------------------------
Revision: f69d33ca84f78b23a444272f70d92f9de97b221f
Ancestor: a33eb17e4fab8b119709ca7c8430f47513a457d9
Author: thebohemian at openembedded.org
Date: 2008-01-14T07:42:48
Branch: org.openembedded.dev
Modified files:
~ packages/classpath/classpath-gtk_cvs.bb
~ packages/classpath/classpath-minimal_0.95.bb
ChangeLog:
classpath-gtk: Use virtual/javac-native.
classpath-minimal: Use virtual/javac-native.
============================================================
- --- packages/classpath/classpath-gtk_cvs.bb
4b43f8aa3270e64a9e31f2583dccdcf3d0d28735
+++ packages/classpath/classpath-gtk_cvs.bb
35d08cab9f06b673f9ca43e7efd7d911a9898667
@@ -6,7 +6,7 @@ PV = "0.93+cvs${SRCDATE}"
~ PV = "0.93+cvs${SRCDATE}"
~ ### note from Laibsch: bug 2523 has information on how to build this
package
- -DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native
virtual/java-native libxtst"
+DEPENDS = "glib-2.0 gtk+ cairo gconf virtual/javac-native zip-native
virtual/java-native libxtst"
~ RDEPENDS_${PN} = "classpath-common (>= ${PV})"
~ RCONFLICTS_${PN} = "classpath-minimal"
@@ -15,7 +15,7 @@ S = "${WORKDIR}/classpath"
~ S = "${WORKDIR}/classpath"
- -EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj
- --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin
- --disable-dssi --disable-alsa"
+EXTRA_OECONF = "--with-javac=${STAGING_BINDIR_NATIVE}/javac
- --with-ecj-jar=${STAGING_DATADIR_NATIVE}/ecj-bootstrap.jar
- --disable-plugin --disable-dssi --disable-alsa"
~ do_stage() {
~ install -d ${STAGING_INCDIR}/classpath
============================================================
- --- packages/classpath/classpath-minimal_0.95.bb
22d3ae706725316f5f70a7ed0da7a369f15a89db
+++ packages/classpath/classpath-minimal_0.95.bb
6c90b3b38ea003f229f32b86d0b2bb4658fcc85b
@@ -11,13 +11,13 @@ SRC_URI = "${GNU_MIRROR}/classpath/class
~ SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
- -DEPENDS = "ecj-native zip-native"
+DEPENDS = "virtual/javac-native zip-native"
~ inherit autotools
~ EXTRA_OECONF = "--with-glibj \
- - --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+ --with-javac=${STAGING_BINDIR_NATIVE}/javac \
~ --disable-alsa \
~ --disable-gconf-peer \
~ --disable-gtk-peer \
- -----------------------------------------------------------------
Revision: 64c06913c22a9e5e86178b37c2a23bd8aa5baf77
Ancestor: d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
Author: thebohemian at openembedded.org
Date: 2008-01-09T13:22:37
Branch: org.openembedded.dev
Added files:
~ packages/cacao/cacao-initial_0.98.bb
~ packages/cacao/cacao-native.inc
~ packages/cacao/cacao-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98-initial.patch
~ packages/classpath/classpath-initial_0.93.bb
~ packages/classpath/classpath-native.inc
~ packages/classpath/classpath-native_0.96.1.bb
~ packages/classpath/files/gjar-prefix-patch.diff
~ packages/ecj/ecj-bootstrap-native_3.3.bb
~ packages/ecj/ecj-initial_3.3.bb packages/ecj/files/ecj.in
~ packages/jamvm/files/jamvm_1.5.0-initial.patch
~ packages/jamvm/jamvm-initial_1.5.0.bb
~ packages/jikes/jikes-initial.bb
Added directories:
~ packages/jamvm/files
Modified files:
~ packages/jikes/jikes-native_1.21.bb
Modified attrs:
~ packages/ecj/files/ecj.in
ChangeLog:
jamvm: Added -initial version.
cacao: Multiple fixes.
~ - added -initial version
~ - added -native snapshot version
classpath:
~ - added -initial version
~ - added -native version
ecj:
~ - added -initial version
~ - added -native version that is compiled from source
jikes:
~ - jikes-native is not a virtual/javac-native provider any more
============================================================
- --- packages/classpath/classpath-initial_0.93.bb
dcbd137250c9fd6e2ca0ca88afc7404e9ede289c
+++ packages/classpath/classpath-initial_0.93.bb
dcbd137250c9fd6e2ca0ca88afc7404e9ede289c
@@ -0,0 +1,28 @@
+# No later version of Classpath may be used because this is the latest
that can be compiled
+# by jikes!
+
+require classpath-native.inc
+
+DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as
bootclasspath for jikes-native."
+
+PR = "r0"
+
+DEPENDS = "zip-native fastjar-native jikes-native"
+
+EXTRA_OECONF = "\
+ --with-jikes=jikes \
+ --with-fastjar=fastjar \
+ --with-glibj \
+ --disable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --disable-examples \
+ --disable-tools \
+ --with-glibj-dir=${STAGING_DATADIR}/classpath-initial \
+ --with-native-libdir=${STAGING_LIBDIR}/classpath-initial \
+ --includedir=${STAGING_INCDIR}/classpath-initial \
+ "
+
============================================================
- --- packages/classpath/classpath-native.inc
ce05671105e08fb6217f1907cf4202d41ebfd512
+++ packages/classpath/classpath-native.inc
ce05671105e08fb6217f1907cf4202d41ebfd512
@@ -0,0 +1,32 @@
+DESCRIPTION = "GNU Classpath standard Java libraries - For native
Java-dependent programs"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+LICENSE = "Classpath"
+
+S = "${WORKDIR}/classpath-${PV}"
+
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+DEPENDS = "ecj-initial fastjar-native zip-native"
+
+inherit autotools native
+
+EXTRA_OECONF = "\
+ --with-glibj \
+ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
+ --with-fastjar=fastjar \
+ --enable-local-sockets \
+ --disable-alsa \
+ --disable-gconf-peer \
+ --disable-gtk-peer \
+ --disable-plugin \
+ --disable-dssi \
+ --enable-examples \
+ --enable-tools \
+ --includedir=${STAGING_INCDIR}/classpath \
+ --with-vm=java \
+ "
+
+do_stage() {
+ oe_runmake install
+}
+
============================================================
- --- packages/classpath/classpath-native_0.96.1.bb
8b956ee477f32cf28c75a7cd39e9e85373378164
+++ packages/classpath/classpath-native_0.96.1.bb
8b956ee477f32cf28c75a7cd39e9e85373378164
@@ -0,0 +1,6 @@
+require classpath-native.inc
+
+PR = "r1"
+
+SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+
============================================================
- --- packages/classpath/files/gjar-prefix-patch.diff
d511884813b1b0a0b7ea1f16e8e11c32981eb117
+++ packages/classpath/files/gjar-prefix-patch.diff
d511884813b1b0a0b7ea1f16e8e11c32981eb117
@@ -0,0 +1,40 @@
+Index: tools/gnu/classpath/tools/jar/Entry.java
+===================================================================
+RCS file:
/sources/classpath/classpath/tools/gnu/classpath/tools/jar/Entry.java,v
+retrieving revision 1.1
+diff -u -r1.1 Entry.java
+--- tools/gnu/classpath/tools/jar/Entry.java 8 May 2006 18:38:20 -0000 1.1
++++ tools/gnu/classpath/tools/jar/Entry.java 10 Dec 2007 22:20:05 -0000
+@@ -1,5 +1,5 @@
+ /* Entry.java - represent a single file to write to a jar
+- Copyright (C) 2006 Free Software Foundation, Inc.
++ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+ This file is part of GNU Classpath.
+
+@@ -49,12 +49,22 @@
+ public Entry(File file, String name)
+ {
+ this.file = file;
+- this.name = name;
++
++ /* Removes any './' prefixes automatically. Those caused trouble
++ * in (boot) classpath use-cases. See #32516.
++ */
++ int start = 0;
++ while (name.length() > start + 2
++ && name.codePointAt(start) == '.'
++ && name.codePointAt(start + 1) == File.separatorChar)
++ start += 2;
++
++ this.name = name.substring(start);
+ }
+
+ public Entry(File file)
+ {
+- this.file = file;
+- this.name = file.toString();
++ this(file, file.toString());
+ }
++
+ }
- -----------------------------------------------------------------
Revision: 64c06913c22a9e5e86178b37c2a23bd8aa5baf77
Ancestor: d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
Author: thebohemian at openembedded.org
Date: 2008-01-09T13:22:37
Branch: org.openembedded.dev
Added files:
~ packages/cacao/cacao-initial_0.98.bb
~ packages/cacao/cacao-native.inc
~ packages/cacao/cacao-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98-initial.patch
~ packages/classpath/classpath-initial_0.93.bb
~ packages/classpath/classpath-native.inc
~ packages/classpath/classpath-native_0.96.1.bb
~ packages/classpath/files/gjar-prefix-patch.diff
~ packages/ecj/ecj-bootstrap-native_3.3.bb
~ packages/ecj/ecj-initial_3.3.bb packages/ecj/files/ecj.in
~ packages/jamvm/files/jamvm_1.5.0-initial.patch
~ packages/jamvm/jamvm-initial_1.5.0.bb
~ packages/jikes/jikes-initial.bb
Added directories:
~ packages/jamvm/files
Modified files:
~ packages/jikes/jikes-native_1.21.bb
Modified attrs:
~ packages/ecj/files/ecj.in
ChangeLog:
jamvm: Added -initial version.
cacao: Multiple fixes.
~ - added -initial version
~ - added -native snapshot version
classpath:
~ - added -initial version
~ - added -native version
ecj:
~ - added -initial version
~ - added -native version that is compiled from source
jikes:
~ - jikes-native is not a virtual/javac-native provider any more
============================================================
- --- 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/ecj/files/ecj.in ded1ab42bf6383b2789b01c1f98beeb3a909507f
+++ packages/ecj/files/ecj.in ded1ab42bf6383b2789b01c1f98beeb3a909507f
@@ -0,0 +1 @@
+${RUNTIME} -Xmx512m -cp ${ECJ_JAR}
org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}
- -----------------------------------------------------------------
Revision: 213c582b00d27a563e968bbcd4a9c276301fc7cc
Ancestor: 3591379aa6369b74696920e6779af9f79a3933cb
Author: Laibsch at openembedded.org
Date: 2008-01-15T00:32:28
Branch: org.openembedded.dev
Modified files:
~ packages/jamvm/jamvm_1.4.5.bb packages/jamvm/jamvm_1.5.0.bb
ChangeLog:
jamvm: include inc file. partly closes 3655.
============================================================
- --- packages/jamvm/jamvm_1.4.5.bb 96f7f2935c1cc4ef3d02c5b6fd56d8d4fca41571
+++ packages/jamvm/jamvm_1.4.5.bb d778d272861de9bf5a6bc422f452f11f0e078df7
@@ -1,2 +1,4 @@
+require jamvm.inc
+
~ SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
============================================================
- --- packages/jamvm/jamvm_1.5.0.bb 99b4f3849872d11f22a1277e75986513fba80634
+++ packages/jamvm/jamvm_1.5.0.bb 645cab3c8ecedf36901ba0d416cb8956c85f04b1
@@ -1,3 +1,5 @@
+require jamvm.inc
+
~ PR = "r0"
- -----------------------------------------------------------------
Revision: b144146d96293ddc0c8140f894293debe08cc3af
Ancestor: 631a3e8b95d1d4ee1d1a9ed29390bcd59924f06e
Author: thebohemian at openembedded.org
Date: 2008-01-14T15:07:22
Branch: org.openembedded.dev
Deleted entries:
~ packages/jamvm/jamvm
~ packages/jamvm/jamvm/sh3sh4-support.patch
Renamed entries:
~ packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch to
packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
~ packages/jamvm/jamvm-1.3.0 to packages/obsolete/jamvm/jamvm-1.3.0
~ packages/jamvm/jamvm_1.3.0.bb to
packages/obsolete/jamvm/jamvm_1.3.0.bb
~ packages/jamvm/jamvm_1.3.1.bb to
packages/obsolete/jamvm/jamvm_1.3.1.bb
~ packages/jamvm/jamvm_1.3.2.bb to
packages/obsolete/jamvm/jamvm_1.3.2.bb
~ packages/jamvm/jamvm_1.4.1.bb to
packages/obsolete/jamvm/jamvm_1.4.1.bb
Added files:
~ packages/jamvm/jamvm.inc packages/jamvm/jamvm_1.5.0.bb
~ packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
Added directories:
~ packages/obsolete/jamvm packages/obsolete/jamvm/files
Modified files:
~ packages/jamvm/jamvm_1.4.5.bb
ChangeLog:
jamvm: Cleanup and new version.
~ - moved all versions prior to 1.4.5 to obsolete/ (including patches)
~ - added recipe for 1.5.0
~ - made 1.4.5 and 1.5.0 use a common include file
============================================================
- --- packages/jamvm/jamvm.inc 5edcfc7c22cf4daf00c3d364962aa42af749237e
+++ packages/jamvm/jamvm.inc 5edcfc7c22cf4daf00c3d364962aa42af749237e
@@ -0,0 +1,22 @@
+DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM
specification version 2."
+HOMEPAGE = "http://jamvm.sourceforge.net/"
+LICENSE = "GPL"
+
+DEPENDS = "zlib classpath virtual/javac-native"
+RDEPENDS = "classpath"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz"
+
+RPROVIDES_jamvm = "java2-runtime"
+
+# This uses 32 bit arm, so force the instruction set to arm, not thumb
+ARM_INSTRUCTION_SET = "arm"
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
+CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+
+ALTERNATIVE_NAME = "java"
+ALTERNATIVE_PATH = "${bindir}/jamvm"
+ALTERNATIVE_PRIORITY = "10"
============================================================
- --- packages/jamvm/jamvm_1.5.0.bb 99b4f3849872d11f22a1277e75986513fba80634
+++ packages/jamvm/jamvm_1.5.0.bb 99b4f3849872d11f22a1277e75986513fba80634
@@ -0,0 +1,3 @@
+PR = "r0"
+
+
============================================================
- --- packages/jamvm/jamvm_1.4.5.bb d3200cc6d653922acc3679bbb1ca8a3c97b8e67b
+++ packages/jamvm/jamvm_1.4.5.bb 96f7f2935c1cc4ef3d02c5b6fd56d8d4fca41571
@@ -1,24 +1,2 @@
- -DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM
specification version 2."
- -HOMEPAGE = "http://jamvm.sourceforge.net/"
- -LICENSE = "GPL"
- -PRIORITY = "optional"
- -SECTION = "interpreters"
+SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
- -DEPENDS = "zlib classpath"
- -RDEPENDS = "classpath (>= 0.18) classpath-common (>= 0.18)"
- -
- -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
- - file://jamvm-1.3.1-size-defaults.patch;patch=1"
- -
- -# This uses 32 bit arm, so force the instruction set to arm, not thumb
- -ARM_INSTRUCTION_SET = "arm"
- -
- -inherit autotools update-alternatives
- -
- -EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
- -CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
- -
- -PROVIDES = "virtual/java"
- -ALTERNATIVE_NAME = "java"
- -ALTERNATIVE_PATH = "${bindir}/jamvm"
- -ALTERNATIVE_PRIORITY = "10"
- -----------------------------------------------------------------
Revision: 64c06913c22a9e5e86178b37c2a23bd8aa5baf77
Ancestor: d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
Author: thebohemian at openembedded.org
Date: 2008-01-09T13:22:37
Branch: org.openembedded.dev
Added files:
~ packages/cacao/cacao-initial_0.98.bb
~ packages/cacao/cacao-native.inc
~ packages/cacao/cacao-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98-initial.patch
~ packages/classpath/classpath-initial_0.93.bb
~ packages/classpath/classpath-native.inc
~ packages/classpath/classpath-native_0.96.1.bb
~ packages/classpath/files/gjar-prefix-patch.diff
~ packages/ecj/ecj-bootstrap-native_3.3.bb
~ packages/ecj/ecj-initial_3.3.bb packages/ecj/files/ecj.in
~ packages/jamvm/files/jamvm_1.5.0-initial.patch
~ packages/jamvm/jamvm-initial_1.5.0.bb
~ packages/jikes/jikes-initial.bb
Added directories:
~ packages/jamvm/files
Modified files:
~ packages/jikes/jikes-native_1.21.bb
Modified attrs:
~ packages/ecj/files/ecj.in
ChangeLog:
jamvm: Added -initial version.
cacao: Multiple fixes.
~ - added -initial version
~ - added -native snapshot version
classpath:
~ - added -initial version
~ - added -native version
ecj:
~ - added -initial version
~ - added -native version that is compiled from source
jikes:
~ - jikes-native is not a virtual/javac-native provider any more
============================================================
- --- packages/jamvm/files/jamvm_1.5.0-initial.patch
91a98ee8f2d7c025af1263c9f0e20fc020521ed2
+++ packages/jamvm/files/jamvm_1.5.0-initial.patch
91a98ee8f2d7c025af1263c9f0e20fc020521ed2
@@ -0,0 +1,82 @@
+Index: jamvm-1.5.0/configure.ac
+===================================================================
+--- jamvm-1.5.0.orig/configure.ac 2007-12-20 00:01:08.000000000 +0100
++++ jamvm-1.5.0/configure.ac 2007-12-20 00:03:40.000000000 +0100
+@@ -22,7 +22,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+ AC_INIT(src/jam.c)
+-AM_INIT_AUTOMAKE(jamvm, 1.5.0)
++AM_INIT_AUTOMAKE(jamvm-initial, 1.5.0)
+ AC_CONFIG_HEADERS([src/config.h])
+ AC_PREFIX_DEFAULT(/usr/local/jamvm)
+
+Index: jamvm-1.5.0/java-initial
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ jamvm-1.5.0/java-initial 2007-12-20 00:03:27.000000000 +0100
+@@ -0,0 +1,5 @@
++#!/bin/sh
++#
++# Wrapper script inspired by the one provided by cacao.
++
++exec jamvm-initial ${1+"$@"}
+Index: jamvm-1.5.0/lib/Makefile.am
+===================================================================
+--- jamvm-1.5.0.orig/lib/Makefile.am 2007-12-20 00:05:24.000000000 +0100
++++ jamvm-1.5.0/lib/Makefile.am 2007-12-20 00:05:28.000000000 +0100
+@@ -19,7 +19,7 @@
+ ## Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+ ##
+
+-CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath
++CP_LIB_DIR = ${with_classpath_install_dir}/share/classpath-initial
+ GLIBJ_ZIP = ${CP_LIB_DIR}/glibj.zip
+
+ SUBDIRS = jamvm java gnu sun
+Index: jamvm-1.5.0/src/class.h
+===================================================================
+--- jamvm-1.5.0.orig/src/class.h 2007-12-20 00:06:34.000000000 +0100
++++ jamvm-1.5.0/src/class.h 2007-12-20 00:16:41.000000000 +0100
+@@ -39,11 +39,11 @@
+ separate class files in a directory structure */
+
+ #ifdef USE_ZIP
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
+-#define CLASSPATH_CLASSES
CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
++#define JAMVM_CLASSES
CLASSPATH_INSTALL_DIR"/share/jamvm-initial/classes.zip"
++#define CLASSPATH_CLASSES
CLASSPATH_INSTALL_DIR"/share/classpath-initial/glibj.zip"
+ #else
+-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
+-#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
++#define JAMVM_CLASSES CLASSPATH_INSTALL_DIR"/share/jamvm-initial/classes"
++#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath-initial"
+ #endif
+
+ #define DFLT_BCP JAMVM_CLASSES":"CLASSPATH_CLASSES
+Index: jamvm-1.5.0/src/dll.c
+===================================================================
+--- jamvm-1.5.0.orig/src/dll.c 2007-12-20 00:01:24.000000000 +0100
++++ jamvm-1.5.0/src/dll.c 2007-12-20 00:03:27.000000000 +0100
+@@ -294,7 +294,7 @@
+ }
+
+ char *getBootDllPath() {
+- return CLASSPATH_INSTALL_DIR"/lib/classpath";
++ return CLASSPATH_INSTALL_DIR"/lib/classpath-initial";
+ }
+
+ char *getDllName(char *name) {
+Index: jamvm-1.5.0/src/Makefile.am
+===================================================================
+--- jamvm-1.5.0.orig/src/Makefile.am 2007-12-20 00:21:37.000000000 +0100
++++ jamvm-1.5.0/src/Makefile.am 2007-12-20 00:21:46.000000000 +0100
+@@ -23,7 +23,7 @@
+ DIST_SUBDIRS = os arch interp
+
+ bin_PROGRAMS = jamvm
+-include_HEADERS = jni.h
++noinst_HEADERS = jni.h
+
+ lib_LTLIBRARIES = libjvm.la
+ noinst_LTLIBRARIES = libcore.la
============================================================
- --- packages/jamvm/jamvm-initial_1.5.0.bb
08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4
+++ packages/jamvm/jamvm-initial_1.5.0.bb
08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4
@@ -0,0 +1,36 @@
+SUMMARY = "A compact Java Virtual Machine which conforms to the JVM
specification version 2."
+HOMEPAGE = "http://jamvm.sourceforge.net/"
+LICENSE = "GPL"
+
+DEPENDS = "zlib-native classpath-initial jikes-initial"
+
+PROVIDES = "virtual/java-initial"
+
+S = "${WORKDIR}/jamvm-${PV}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
+ file://jamvm_${PV}-initial.patch;patch=1;pnum=1 \
+ "
+
+# This uses 32 bit arm, so force the instruction set to arm, not thumb
+ARM_INSTRUCTION_SET = "arm"
+
+inherit native autotools
+
+EXTRA_OECONF = "\
+ --with-classpath-install-dir=${STAGING_DIR_NATIVE}\
+ --program-suffix=-initial \
+ "
+
+CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+
+do_compile() {
+ oe_runmake \
+ JAVAC=jikes-initial \
+ GLIBJ_ZIP=${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip
+}
+
+do_stage_append() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 java-initial ${STAGING_BINDIR}
+}
- -----------------------------------------------------------------
Revision: fcb60e20d2bda504bfd7af6775c815a4c014185e
Ancestor: f7a565e7e910cea46808ec61590556a6b97dff74
Author: Laibsch at openembedded.org
Date: 2008-01-14T14:13:35
Branch: org.openembedded.dev
Modified files:
~ packages/jikes/jikes-initial.bb
ChangeLog:
jikes: jikes-initial really needs jikes-native. Partly undoing
f7a565e7e910cea46808ec61590556a6b97dff74
============================================================
- --- packages/jikes/jikes-initial.bb
ccc5500cd108638a643a49a0af8fb6fb71ff6e8b
+++ packages/jikes/jikes-initial.bb acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
@@ -1,6 +1,6 @@ SUMMARY = "Initial Java 1.4-compatible (
~ SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler"
- -DEPENDS = "virtual/javac-native classpath-initial"
+DEPENDS = "jikes-native classpath-initial"
~ SRC_URI = ""
- -----------------------------------------------------------------
Revision: f7a565e7e910cea46808ec61590556a6b97dff74
Ancestor: 79d45e73d2895ffcdc7d64585b097a492ffdd6d9
Author: Laibsch at openembedded.org
Date: 2008-01-14T13:40:49
Branch: org.openembedded.dev
Modified files:
~ packages/classpath/classpath-gtk_0.93.bb
~ packages/classpath/classpath-minimal-native_0.93.bb
~ packages/classpath/classpath-minimal_0.90.bb
~ packages/classpath/classpath_0.14.bb
~ packages/classpath/classpath_0.15.bb
~ packages/classpath/classpath_0.17.bb
~ packages/classpath/classpath_0.18.bb
~ packages/classpath/classpath_0.19.bb
~ packages/classpath/classpath_0.20.bb
~ packages/classpath/classpath_cvs.bb
~ packages/jikes/jikes-initial.bb packages/kaffe/kaffe.inc
~ packages/sablevm/sablevm-classpath_1.1.9.bb
~ packages/sablevm/sablevm-classpath_1.11.3.bb
~ packages/sablevm/sablevm-classpath_1.12.bb
ChangeLog:
java packages: replace jikes-native in DEPENDS with
"virtual/javac-native". Partly closes bug 3655.
============================================================
- --- packages/jikes/jikes-initial.bb
acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
+++ packages/jikes/jikes-initial.bb ccc5500cd108638a643a49a0af8fb6fb71ff6e8b
@@ -1,6 +1,6 @@ SUMMARY = "Initial Java 1.4-compatible (
~ SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler"
- -DEPENDS = "jikes-native classpath-initial"
+DEPENDS = "virtual/javac-native classpath-initial"
~ SRC_URI = ""
- -----------------------------------------------------------------
Revision: 64c06913c22a9e5e86178b37c2a23bd8aa5baf77
Ancestor: d7fa03e49c13cc4c48551f9ea7d8f18ef558c0f1
Author: thebohemian at openembedded.org
Date: 2008-01-09T13:22:37
Branch: org.openembedded.dev
Added files:
~ packages/cacao/cacao-initial_0.98.bb
~ packages/cacao/cacao-native.inc
~ packages/cacao/cacao-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98-initial.patch
~ packages/classpath/classpath-initial_0.93.bb
~ packages/classpath/classpath-native.inc
~ packages/classpath/classpath-native_0.96.1.bb
~ packages/classpath/files/gjar-prefix-patch.diff
~ packages/ecj/ecj-bootstrap-native_3.3.bb
~ packages/ecj/ecj-initial_3.3.bb packages/ecj/files/ecj.in
~ packages/jamvm/files/jamvm_1.5.0-initial.patch
~ packages/jamvm/jamvm-initial_1.5.0.bb
~ packages/jikes/jikes-initial.bb
Added directories:
~ packages/jamvm/files
Modified files:
~ packages/jikes/jikes-native_1.21.bb
Modified attrs:
~ packages/ecj/files/ecj.in
ChangeLog:
jamvm: Added -initial version.
cacao: Multiple fixes.
~ - added -initial version
~ - added -native snapshot version
classpath:
~ - added -initial version
~ - added -native version
ecj:
~ - added -initial version
~ - added -native version that is compiled from source
jikes:
~ - jikes-native is not a virtual/javac-native provider any more
============================================================
- --- packages/jikes/jikes-initial.bb
acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
+++ packages/jikes/jikes-initial.bb acb7ab273c93fa5264bb5d431ef94cf91cb08c8b
@@ -0,0 +1,23 @@
+SUMMARY = "Initial Java 1.4-compatible (and not higher) compiler"
+
+DEPENDS = "jikes-native classpath-initial"
+
+SRC_URI = ""
+
+S = "${WORKDIR}"
+
+inherit native
+
+do_configure() {
+ :
+}
+
+do_compile() {
+ echo "#!/bin/sh" > jikes-initial
+ echo "${STAGING_BINDIR_NATIVE}/jikes -bootclasspath
${STAGING_DATADIR_NATIVE}/classpath-initial/glibj.zip \$@" >> jikes-initial
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 0755 jikes-initial ${STAGING_BINDIR}
+}
============================================================
- --- packages/jikes/jikes-native_1.21.bb
1259d32e2a9d8f19824f3284c5c62601c2dd947b
+++ packages/jikes/jikes-native_1.21.bb
ceee4d931ba6e74ba4e24d312663180e70c0db0d
@@ -1,7 +1,6 @@ require jikes_${PV}.bb
~ inherit native
~ require jikes_${PV}.bb
- -PROVIDES = "virtual/javac-native"
~ S = "${WORKDIR}/jikes-${PV}"
~ do_stage() {
- -----------------------------------------------------------------
Revision: 631a3e8b95d1d4ee1d1a9ed29390bcd59924f06e
Ancestor: 791e0606e591e3b944c8399f3912e8364b4a8c06
Author: thebohemian at openembedded.org
Date: 2008-01-14T14:35:45
Branch: org.openembedded.dev
Renamed entries:
~ packages/classpath/classpath-gtk_0.93.bb to
packages/obsolete/classpath/classpath-gtk_0.93.bb
~ packages/classpath/classpath-gtk_cvs.bb to
packages/obsolete/classpath/classpath-gtk_cvs.bb
~ packages/classpath/classpath-minimal-native_0.93.bb to
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
~ packages/classpath/classpath-minimal-native_0.95.bb to
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
~ packages/classpath/classpath-minimal_0.90.bb to
packages/obsolete/classpath/classpath-minimal_0.90.bb
~ packages/classpath/classpath-minimal_0.95.bb to
packages/obsolete/classpath/classpath-minimal_0.95.bb
~ packages/classpath/classpath.inc to
packages/obsolete/classpath/classpath.inc
~ packages/classpath/classpath_0.14.bb to
packages/obsolete/classpath/classpath_0.14.bb
~ packages/classpath/classpath_0.15.bb to
packages/obsolete/classpath/classpath_0.15.bb
~ packages/classpath/classpath_0.17.bb to
packages/obsolete/classpath/classpath_0.17.bb
~ packages/classpath/classpath_0.18.bb to
packages/obsolete/classpath/classpath_0.18.bb
~ packages/classpath/classpath_0.19.bb to
packages/obsolete/classpath/classpath_0.19.bb
~ packages/classpath/classpath_0.20.bb to
packages/obsolete/classpath/classpath_0.20.bb
~ packages/classpath/classpath_cvs.bb to
packages/obsolete/classpath/classpath_cvs.bb
~ packages/classpath/files/disable-automake-checks-v2.patch to
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
~ packages/classpath/files/disable-automake-checks.patch to
packages/obsolete/classpath/files/disable-automake-checks.patch
~ packages/classpath/files/fix-endian-arm-floats.patch to
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
~ packages/classpath/files/gconf_version.patch to
packages/obsolete/classpath/files/gconf_version.patch
Added files:
~ packages/cacao/cacao-cldc.inc
~ packages/cacao/cacao_0.98+hg20071001.bb
~ packages/cacao/cacaoh-native.inc
~ packages/cacao/cacaoh-native_0.98+hg20071001.bb
~ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
~ packages/cacao/files/cacao-0.98+hg-attachthread.patch
~ packages/cacao/files/cacao-0.98+svn-classpath_var.patch
~ packages/cacao/files/cacao-0.98+svn-libdir.diff
~ packages/classpath/classpath-minimal_0.96.1.bb
~ packages/classpath/classpath.inc
~ packages/classpath/classpath_0.95.bb
~ packages/classpath/classpath_0.96.1.bb
Added directories:
~ packages/obsolete/classpath
~ packages/obsolete/classpath/files
Modified files:
~ packages/cacao/cacao-cldc_0.98.bb packages/cacao/cacao.inc
~ packages/cacao/cacaoh-cldc-native_0.98.bb
~ packages/midpath/midpath-cldc-native_0.1.bb
~ packages/midpath/midpath-cldc-x11_0.1.bb
~ packages/midpath/midpath-cldc_0.1.bb
~ packages/midpath/midpath.inc
ChangeLog:
cacao 0.98+hg20071001: Added snapshot version.
cacao-cldc: Added an include recipe.
classpath: Moved versions prior 0.95 to obsolete/ .
classpath-minimal: Moved versions prior 0.95 to obsolete/ .
classpath-gtk: Moved to obsolete/.
classpath cvs: Moved to obsolete/.
classpath 0.96.1: Added new version.
classpath 0.95: Added new version.
classpath-minimal 0.96.1: Added new version.
midpath-cldc: Removed notion of virtual/cldc-api-1.1
~ - install cldc1.1.jar as midpath-cldc1.1.jar to ${datadir}/midpath-cldc
============================================================
- --- packages/midpath/midpath-cldc-native_0.1.bb
876ed1db01ef361d0403dfa49aa970522a41661d
+++ packages/midpath/midpath-cldc-native_0.1.bb
d64ba8f09d50ebb96843da8f4964ad681eaa163a
@@ -1,12 +1,9 @@ require midpath-cldc_${PV}.bb
~ inherit native
~ require midpath-cldc_${PV}.bb
- -PROVIDES = "virtual/cldc-api-1.1-native"
- -RPROVIDES = " "
- -
~ PACKAGES = " "
~ do_install() {
============================================================
- --- packages/midpath/midpath-cldc-x11_0.1.bb
fa9d3d7fe3f54287c26f6d9e57241640e7edf920
+++ packages/midpath/midpath-cldc-x11_0.1.bb
0c3c6192bfffb9e6b32dfd1e9953519ba473c133
@@ -1,7 +1,7 @@ require midpath.inc
~ require midpath.inc
- -DEPENDS += " virtual/libx11 virtual/cldc-api-1.1"
+DEPENDS += "virtual/libx11 midpath-cldc"
~ do_configure() {
============================================================
- --- packages/midpath/midpath-cldc_0.1.bb
207ecb961824e78d5556506fd417a98aec0cdeba
+++ packages/midpath/midpath-cldc_0.1.bb
1c7d1a97f62b6096cc25b16d15f1178e5b9cc402
@@ -1,9 +1,6 @@ require midpath.inc
~ require midpath.inc
- -PROVIDES = "virtual/cldc-api-1.1"
- -RPROVIDES = "virtual/cldc-api-1.1"
- -
~ do_compile() {
~ mkdir -p ${S}/dist
@@ -18,21 +15,21 @@ make install JAVAC=${JAVAC_CMD} JAVAC_FL
~ make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath
${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3
- -target 1.1"
~ make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath
${S}/external/cldc1.1/classes -source 1.3 -target 1.1"
CLASS_DIR=${S}/external/cldc1.1/classes
~ # Make a jar
- -${FASTJAR_CMD} cvf ${S}/dist/cldc1.1.jar -C
${S}/external/cldc1.1/classes .
+${FASTJAR_CMD} cvf ${S}/dist/midpath-cldc1.1.jar -C
${S}/external/cldc1.1/classes .
~ }
~ do_install() {
- - install -d ${D}${datadir}/java
- - install -m 0644 dist/cldc1.1.jar ${D}${datadir}/java
+ install -d ${D}${datadir}/midpath-cldc
+ install -m 0644 dist/midpath-cldc1.1.jar ${D}${datadir}/midpath-cldc
~ }
~ do_stage() {
- - install -d ${STAGING_DATADIR}/java
- - install -m 0644 dist/cldc1.1.jar ${STAGING_DATADIR}/java
+ install -d ${STAGING_DATADIR}/midpath-cldc
+ install -m 0644 dist/midpath-cldc1.1.jar ${STAGING_DATADIR}/midpath-cldc
~ }
~ PACKAGES = "${PN}"
+FILES_${PN} = "${datadir}/midpath-cldc/midpath-cldc1.1.jar"
- -FILES_${PN} = "${datadir}/java/cldc1.1.jar"
============================================================
- --- packages/midpath/midpath.inc 5390ede5a215319620bb1df840e3383b3308e5be
+++ packages/midpath/midpath.inc 4ec39c10e6cf8f56277e239747ebd3f4809d0ba5
@@ -9,7 +9,7 @@ S = "${WORKDIR}/midpath-${PV}"
~ S = "${WORKDIR}/midpath-${PV}"
- -DEPENDS = "virtual/javac-native fastjar-native classpath-minimal"
+DEPENDS = "virtual/javac-native fastjar-native classpath"
~ JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac"
@@ -17,6 +17,6 @@ JAVA_PATH = "${STAGING_DATADIR}/java"
~ JAVA_PATH = "${STAGING_DATADIR}/java"
- -GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath-minimal/glibj.zip"
+GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath/glibj.zip"
+CLDC_PATH = ${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar
- -CLDC_PATH = ${JAVA_PATH}/cldc1.1.jar
- -----------------------------------------------------------------
Revision: 396d43c9459edaab2f04c5dd3825de0391fc1b73
Ancestor: 1ccc031525108c90a7b7bb81f5d84142dc95cfe0
Author: thebohemian at openembedded.org
Date: 2008-01-14T07:33:25
Branch: org.openembedded.dev
Modified files:
~ packages/midpath/midpath.inc
ChangeLog:
midpath: Use virtual/javac-native instead of ecj-native.
============================================================
- --- packages/midpath/midpath.inc e9d8c24f154d72d1d4847d255e9e58c8dc1bb7d1
+++ packages/midpath/midpath.inc 5390ede5a215319620bb1df840e3383b3308e5be
@@ -9,9 +9,9 @@ S = "${WORKDIR}/midpath-${PV}"
~ S = "${WORKDIR}/midpath-${PV}"
- -DEPENDS = "ecj-native fastjar-native classpath-minimal"
+DEPENDS = "virtual/javac-native fastjar-native classpath-minimal"
- -JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/ecj"
+JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac"
~ FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar"
- -----------------------------------------------------------------
Revision: 9005ec7475f13738f08b14c023c457704df3f4af
Ancestor: 396c39b9ce5e76666714c3b494fef67d986ea8d6
Author: thebohemian at openembedded.org
Date: 2008-01-17T15:51:03
Branch: org.openembedded.dev
Added files:
~ classes/java-library.bbclass classes/java.bbclass
~ packages/swt/files/Makefile
~ packages/swt/files/swt-hildon.patch packages/swt/swt-gtk.inc
~ packages/swt/swt3.3-gtk_3.3.1.bb
~ packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
~ packages/swt/swt3.4-gtk_3.3+3.4M3.bb
Added directories:
~ packages/swt packages/swt/files
ChangeLog:
java.bbclass: New bbclass for java recipes.
java-library.bbclass: New bbclass for java library (jar) recipes.
swt3.3-gtk: New recipe.
swt3.4-gtk: New recipe.
swt3.4-gtk-hildon: New recipe.
============================================================
- --- packages/swt/files/Makefile 6a0e11147f246807075b03fa7fa27e739f8b6e5d
+++ packages/swt/files/Makefile 6a0e11147f246807075b03fa7fa27e739f8b6e5d
@@ -0,0 +1,78 @@
+JAVA=swt-gtk-$(RELEASE).jar
+LIBRARIES=libswt.so libswt-pi.so libswt-mozilla.so
+CLEANFILES=*.files *.jar *.so* *-stamp
+
+RELEASE=OE_SWT_RELEASE
+SONAME_VERSION=OE_SWT_API_VERSION
+
+GCJ=gcj
+JAR=gjar
+JAVAC=javac -classpath .
+LDCONFIG=/sbin/ldconfig
+LN_S=ln -s
+RM=rm -f
+
+GCJFLAGS=-O2 -fPIC -fjni -shared
+
+LINK=$(GCJ) $(GCJFLAGS) -o $@ -Wl,-soname=lib$*.so.$(SONAME_VERSION)
+
+# Build without Jars
+#all:
+# $(MAKE) -f make_linux.mak make_swt make_atk make_cairo
+
+# Build with Jars
+all: $(JAVA)
+ $(MAKE) -f make_linux.mak make_swt make_atk make_cairo
+
+# all: $(JAVA) $(LIBRARIES)
+# $(MAKE) -f make_linux.mak make_swt make_atk make_gnome make_mozilla
+
+clean distclean:
+ $(RM) $(CLEANFILES)
+ $(RM) -r swt swt-pi swt-mozilla
+ -$(MAKE) -f make_linux.mak clean
+
+.PHONY: all clean distclean
+
+swt.files:
+ find org -name *.java \
+ -not -path org/eclipse/swt/internal\* \
+ -not -path org/eclipse/swt/browser\* | sort > $@
+
+swt-mozilla.files:
+ find org/eclipse/swt/browser org/eclipse/swt/internal/mozilla \
+ -name *.java | sort > $@
+
+swt-pi.files:
+ find org/eclipse/swt/internal -name *.java \
+ -not -path org/eclipse/swt/internal/mozilla\* | sort > $@
+
+%-stamp: %.files
+ mkdir -p $*
+ for i in `cat $<`; do \
+ if [ -e $*/$${i%java}class ]; then \
+ echo SKIPPING $$i; \
+ else \
+ echo $(JAVAC) -d $* $$i; \
+ $(JAVAC) -d $* $$i || exit $$?; \
+ fi \
+ done
+ touch $@
+
+%.jar: %-stamp
+ $(JAR) -C $* -cf $@ .
+
+lib%.so.$(RELEASE): %.jar
+ $(LINK) $<
+ $(LDCONFIG) -n .
+
+%.so: %.so.$(RELEASE)
+ $(LN_S) -f $< $@
+
+swt-gtk-$(RELEASE).jar: swt.jar swt-pi.jar swt-mozilla.jar
+ mkdir _jar
+ cd _jar && for i in $^; do $(JAR) -xf ../$$i || exit $$?; done
+ $(JAR) -C _jar -cf $@ org
+ rm -rf _jar
+
+.SECONDARY:
============================================================
- --- packages/swt/files/swt-hildon.patch
cc6d6cb67722d189122f70411ef01e0639206d86
+++ packages/swt/files/swt-hildon.patch
cc6d6cb67722d189122f70411ef01e0639206d86
@@ -0,0 +1,128 @@
+Index: swt-hildon/swt-source/make_linux.mak
+===================================================================
+--- swt-hildon.orig/swt-source/make_linux.mak 2008-01-08
09:35:29.000000000 +0100
++++ swt-hildon/swt-source/make_linux.mak 2008-01-08 11:35:01.000000000
+0100
+@@ -45,8 +45,8 @@
+ CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
+
+ # Do not use pkg-config to get libs because it includes unnecessary
dependencies (i.e. pangoxft-1.0)
+-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0`
- -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
++GTKCFLAGS = `pkg-config --cflags gtk+-2.0 hildon-1`
++GTKLIBS = -lhildon-1 `pkg-config --libs-only-L gtk+-2.0 gthread-2.0`
- -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
+
+ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
+
+@@ -74,8 +74,6 @@
+ -Wno-non-virtual-dtor \
+ -fPIC \
+ -I. \
+- -I$(JAVA_HOME)/include \
+- -I$(JAVA_HOME)/include/linux \
+ ${SWT_PTR_CFLAGS}
+ MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+ MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
+@@ -96,8 +94,6 @@
+ -DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
+ -DLINUX -DGTK \
+- -I$(JAVA_HOME)/include \
+- -I$(JAVA_HOME)/include/linux \
+ -fPIC \
+ ${SWT_PTR_CFLAGS}
+ LIBS = -shared -fPIC
+Index: swt-hildon/swt-source/os.c
+===================================================================
+--- swt-hildon.orig/swt-source/os.c 2008-01-08 09:35:29.000000000 +0100
++++ swt-hildon/swt-source/os.c 2008-01-08 09:37:00.000000000 +0100
+@@ -17,6 +17,9 @@
+ #include "os_structs.h"
+ #include "os_stats.h"
+
++#include <hildon/hildon-program.h>
++#include <hildon/hildon-window.h>
++
+ #define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
+
+ #ifndef NO_Call
+@@ -7015,9 +7018,18 @@
+ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+ {
++ GtkContainer *container = (GtkContainer *) arg0;
++ GtkWidget *widget = (GtkWidget *) arg1;
+ OS_NATIVE_ENTER(env, that, _1gtk_1container_1add_FUNC);
+- gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1);
+- OS_NATIVE_EXIT(env, that, _1gtk_1container_1add_FUNC);
++ if (GTK_CHECK_TYPE (widget, GTK_TYPE_MENU)
++ && !strcmp(gtk_menu_get_title(GTK_MENU(widget)), "__main_menu__"))
++ {
++ hildon_window_set_menu(HILDON_WINDOW(container), GTK_MENU(widget));
++ }
++ else
++ gtk_container_add((GtkContainer *)arg0, (GtkWidget *)arg1);
++
++ OS_NATIVE_EXIT(env, that, _1gtk_1container_1add_FUNC);
+ }
+ #endif
+
+@@ -9121,9 +9133,12 @@
+ JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
+ (JNIEnv *env, jclass that)
+ {
++ GtkWidget *menu;
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, _1gtk_1menu_1bar_1new_FUNC);
+- rc = (jint)gtk_menu_bar_new();
++ menu = gtk_menu_new();
++ gtk_menu_set_title(menu, "__main_menu__");
++ rc = (jint) menu;
+ OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
+ return rc;
+ }
+@@ -15464,8 +15479,22 @@
+ (JNIEnv *env, jclass that, jint arg0)
+ {
+ jint rc = 0;
++ HildonProgram *p;
++ GtkWidget *w;
+ OS_NATIVE_ENTER(env, that, _1gtk_1window_1new_FUNC);
+- rc = (jint)gtk_window_new((GtkWindowType)arg0);
++/*
++ if (GTK_WINDOW_TOPLEVEL == (GtkWindowType) arg0)
++ {
++*/
++ p = hildon_program_get_instance();
++ w = hildon_window_new();
++ hildon_program_add_window(p, HILDON_WINDOW(w));
++/*
++ }
++ else
++ w = gtk_window_new(GTK_WINDOW_POPUP);
++*/
++ rc = (jint) w;
+ OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
+ return rc;
+ }
+Index: swt-hildon/swt-source/org/eclipse/swt/widgets/Menu.java
+===================================================================
+--- swt-hildon.orig/swt-source/org/eclipse/swt/widgets/Menu.java
2008-01-08 09:34:55.000000000 +0100
++++ swt-hildon/swt-source/org/eclipse/swt/widgets/Menu.java 2008-01-08
09:36:01.000000000 +0100
+@@ -259,9 +259,17 @@
+ if ((style & SWT.BAR) != 0) {
+ handle = OS.gtk_menu_bar_new ();
+ if (handle == 0) error (SWT.ERROR_NO_HANDLES);
++ if (parent instanceof Shell)
++ {
++ int /*long*/ shellHandle = ((Shell) parent).shellHandle;
++ OS.gtk_container_add (shellHandle, handle);
++ }
++ else
++ {
+ int /*long*/ vboxHandle = parent.vboxHandle;
+ OS.gtk_container_add (vboxHandle, handle);
+ OS.gtk_box_set_child_packing (vboxHandle, handle, false, true, 0,
OS.GTK_PACK_START);
++ }
+ } else {
+ handle = OS.gtk_menu_new ();
+ if (handle == 0) error (SWT.ERROR_NO_HANDLES);
============================================================
- --- packages/swt/swt-gtk.inc bcadfa700e7fc0872ab1d3a38e456f41e5ebefed
+++ packages/swt/swt-gtk.inc bcadfa700e7fc0872ab1d3a38e456f41e5ebefed
@@ -0,0 +1,58 @@
+DESCRIPTION = "SWT is an open source widget toolkit for Java designed
to provide efficient, portable access to the user-interface facilities"
+LICENSE = "CPL MPL LGPL"
+
+inherit java-library
+
+DEPENDS = "cairo gtk+ atk libxtst"
+
+S = "${WORKDIR}/swt-source"
+
+# A number which is used by SWT to mark the shared libraries. It can be
found
+# in the version.txt file inside the source directory.
+SWTVERSION = ${@bb.fatal('SWTVERSION is not defined in this swt-gtk
recipe!')}
+SWT_API_VERSION = ${@bb.fatal('SWT_API_VERSION is not defined in this
swt-gtk recipe!')}
+
+do_unpackpost() {
+ if [ ! -d ${S} ]; then
+ mkdir ${S}
+ cd ${S}
+ fi
+
+ unzip -o ../src.zip
+ cp ../Makefile .
+
+ sed -i -e "s|RELEASE=OE_SWT_RELEASE|RELEASE=${PV}|" Makefile
+ sed -i -e
"s|SONAME_VERSION=OE_SWT_API_VERSION|SONAME_VERSION=${SWT_API_VERSION}|"
Makefile
+}
+
+do_compile() {
+ oe_runmake NATIVE_STATS="-I${STAGING_INCDIR}/classpath"
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_install() {
+ oe_jarinstall swt-pi.jar
+ oe_jarinstall swt.jar
+ oe_jarinstall swt-gtk-${PV}.jar swt-gtk.jar
+
+ install -d ${D}${libdir_jni}
+ oe_libinstall -so libswt-atk-gtk-${SWTVERSION} ${D}/${libdir_jni}
+ oe_libinstall -so libswt-cairo-gtk-${SWTVERSION} ${D}/${libdir_jni}
+ oe_libinstall -so libswt-pi-gtk-${SWTVERSION} ${D}/${libdir_jni}
+ oe_libinstall -so libswt-gtk-${SWTVERSION} ${D}/${libdir_jni}
+}
+
+do_stage() {
+ oe_jarinstall -s swt-pi.jar
+ oe_jarinstall -s swt.jar
+ oe_jarinstall -s swt-gtk-${PV}.jar swt-gtk.jar
+}
+
+PACKAGES += "lib${PN}-jni"
+
+FILES_lib${PN}-jni = "${libdir_jni}/lib*.so*"
+
+RDEPENDS_${JPN} = "lib${PN}-jni"
+RPROVIDES_${JPN} = "libswt${SWT_API_VERSION}-gtk-java"
+
============================================================
- --- packages/swt/swt3.3-gtk_3.3.1.bb
ac1e6656f8358a0ce3928cd18fcdc21d2d36511e
+++ packages/swt/swt3.3-gtk_3.3.1.bb
ac1e6656f8358a0ce3928cd18fcdc21d2d36511e
@@ -0,0 +1,10 @@
+require swt-gtk.inc
+
+SRC_URI =
"http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-${PV}-200710231652/swt-${PV}-gtk-linux-x86.zip
\
+ file://Makefile"
+
+# A number which is used by SWT to mark the shared libraries.
+SWTVERSION = "3347"
+SWT_API_VERSION = "3.3"
+
+RCONFLICTS = "libswt3.4-gtk-java"
============================================================
- --- packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
2659ee0d88eeab0a2f7012db8f483cc8a4e0373c
+++ packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
2659ee0d88eeab0a2f7012db8f483cc8a4e0373c
@@ -0,0 +1,7 @@
+require swt3.4-gtk_${PV}.bb
+
+PR = "r1"
+
+DEPENDS += "hildon-1"
+
+SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
============================================================
- --- packages/swt/swt3.4-gtk_3.3+3.4M3.bb
cf948019bf5ff1d457cbe1999cc6651269b7ea70
+++ packages/swt/swt3.4-gtk_3.3+3.4M3.bb
cf948019bf5ff1d457cbe1999cc6651269b7ea70
@@ -0,0 +1,12 @@
+require swt-gtk.inc
+
+SRC_URI =
"http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip
\
+ file://Makefile"
+
+# A number which is used by SWT to mark the shared libraries.
+SWTVERSION = "3416"
+SWT_API_VERSION = "3.4"
+
+PROVIDES = "swt3.4-gtk"
+
+RCONFLICTS = "libswt3.3-gtk-java"
- --
koen at dominion.kabel.utwente.nl will go go away in december 2007, please
use k.kooi at student.utwente.nl instead.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFHmLoDMkyGM64RGpERAn97AKCiwWDxb+EfMY1xY0k6ygHM6CyidACgolSu
HY11tSk2lZXDo4h5WCtg1FQ=
=m8zw
-----END PGP SIGNATURE-----
More information about the Angstrom-distro-devel
mailing list