[oe-commits] org.oe.dev jamvm: Cleanup and new version.

[thebohemian commit]

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

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: b144146d96293ddc0c8140f894293debe08cc3af
ViewMTN: http://monotone.openembedded.org/revision/info/b144146d96293ddc0c8140f894293debe08cc3af
Files:
1
packages/jamvm/jamvm
packages/jamvm/jamvm/sh3sh4-support.patch
packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch
packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/jamvm/jamvm-1.3.0
packages/obsolete/jamvm/jamvm-1.3.0
packages/jamvm/jamvm_1.3.0.bb
packages/obsolete/jamvm/jamvm_1.3.0.bb
packages/jamvm/jamvm_1.3.1.bb
packages/obsolete/jamvm/jamvm_1.3.1.bb
packages/jamvm/jamvm_1.3.2.bb
packages/obsolete/jamvm/jamvm_1.3.2.bb
packages/jamvm/jamvm_1.4.1.bb
packages/obsolete/jamvm/jamvm_1.4.1.bb
packages/obsolete/jamvm
packages/obsolete/jamvm/files
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/jamvm/jamvm_1.4.5.bb
Diffs:

#
# mt diff -r631a3e8b95d1d4ee1d1a9ed29390bcd59924f06e -rb144146d96293ddc0c8140f894293debe08cc3af
#
# 
# 
# delete "packages/jamvm/jamvm"
# 
# delete "packages/jamvm/jamvm/sh3sh4-support.patch"
# 
# rename "packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch"
#     to "packages/jamvm/files/jamvm-1.3.1-size-defaults.patch"
# 
# rename "packages/jamvm/jamvm-1.3.0"
#     to "packages/obsolete/jamvm/jamvm-1.3.0"
# 
# rename "packages/jamvm/jamvm_1.3.0.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.0.bb"
# 
# rename "packages/jamvm/jamvm_1.3.1.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.1.bb"
# 
# rename "packages/jamvm/jamvm_1.3.2.bb"
#     to "packages/obsolete/jamvm/jamvm_1.3.2.bb"
# 
# rename "packages/jamvm/jamvm_1.4.1.bb"
#     to "packages/obsolete/jamvm/jamvm_1.4.1.bb"
# 
# add_dir "packages/obsolete/jamvm"
# 
# add_dir "packages/obsolete/jamvm/files"
# 
# add_file "packages/jamvm/jamvm.inc"
#  content [5edcfc7c22cf4daf00c3d364962aa42af749237e]
# 
# add_file "packages/jamvm/jamvm_1.5.0.bb"
#  content [99b4f3849872d11f22a1277e75986513fba80634]
# 
# add_file "packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch"
#  content [87b384507b8adbd40cca46154ac6911a8a79c4d6]
# 
# patch "packages/jamvm/jamvm_1.4.5.bb"
#  from [d3200cc6d653922acc3679bbb1ca8a3c97b8e67b]
#    to [96f7f2935c1cc4ef3d02c5b6fd56d8d4fca41571]
# 
============================================================
--- 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/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch	87b384507b8adbd40cca46154ac6911a8a79c4d6
+++ packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch	87b384507b8adbd40cca46154ac6911a8a79c4d6
@@ -0,0 +1,12 @@
+--- jamvm-1.3.1.orig/src/jam.h	2005-07-17 23:53:34.000000000 +0200
++++ jamvm-1.3.1/src/jam.h	2005-07-17 23:54:17.000000000 +0200
+@@ -548,7 +548,9 @@
+ #endif
+ 
+ /* default size of the Java stack */
++#ifndef DEFAULT_STACK
+ #define DEFAULT_STACK 64*KB
++#endif
+ 
+ /* size of emergency area - big enough to create
+    a StackOverflow exception */
============================================================
--- 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"