update sablevm to 1.13 (closes: #524),

add the patch from whiterussian to use a reasonable heap size.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3738 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 96 insertions, 46 deletions

diff --git a/openwrt/package/sablevm-classpath/Makefile b/openwrt/package/sablevm-classpath/Makefile
index cbe763402..a111920e2 100644
--- a/openwrt/package/sablevm-classpath/Makefile
+++ b/openwrt/package/sablevm-classpath/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sablevm-classpath
-PKG_VERSION:=1.11.3
+PKG_VERSION:=1.13
 PKG_RELEASE:=1
-PKG_MD5SUM:=0aed850f5583199b3d1adb41ac2043ed
+PKG_MD5SUM:=9476bb7a0ad67c6cfa353d06f094cdce
 
 PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/openwrt/package/sablevm-classpath/files/mini.classlist b/openwrt/package/sablevm-classpath/files/mini.classlist
index 1186d6f6f..55f19f99a 100644
--- a/openwrt/package/sablevm-classpath/files/mini.classlist
+++ b/openwrt/package/sablevm-classpath/files/mini.classlist
@@ -1,15 +1,33 @@
 ./gnu/classpath/SystemProperties.class
 ./gnu/classpath/VMStackWalker.class
 ./gnu/classpath/VMSystemProperties.class
-./gnu/java/io/decode/Decoder.class
-./gnu/java/io/decode/Decoder8859_1.class
-./gnu/java/io/decode/DecoderEightBitLookup.class
-./gnu/java/io/encode/Encoder.class
-./gnu/java/io/encode/Encoder8859_1.class
-./gnu/java/io/encode/EncoderEightBitLookup.class
-./gnu/java/io/EncodingManager.class
+./gnu/java/io/PlatformHelper.class
 ./gnu/java/net/protocol/file/Handler.class
 ./gnu/java/nio/channels/FileChannelImpl.class
+./gnu/java/nio/charset/ByteCharset.class
+./gnu/java/nio/charset/ISO_8859_1$Encoder.class
+./gnu/java/nio/charset/ISO_8859_1.class
+./gnu/java/nio/charset/ISO_8859_13.class
+./gnu/java/nio/charset/ISO_8859_15.class
+./gnu/java/nio/charset/ISO_8859_2.class
+./gnu/java/nio/charset/ISO_8859_4.class
+./gnu/java/nio/charset/ISO_8859_5.class
+./gnu/java/nio/charset/ISO_8859_7.class
+./gnu/java/nio/charset/ISO_8859_9.class
+./gnu/java/nio/charset/KOI_8.class
+./gnu/java/nio/charset/Provider.class
+./gnu/java/nio/charset/US_ASCII.class
+./gnu/java/nio/charset/UTF_16.class
+./gnu/java/nio/charset/UTF_16BE.class
+./gnu/java/nio/charset/UTF_16LE.class
+./gnu/java/nio/charset/UTF_8.class
+./gnu/java/nio/charset/UnicodeLittle.class
+./gnu/java/nio/charset/Windows1250.class
+./gnu/java/nio/charset/Windows1251.class
+./gnu/java/nio/charset/Windows1252.class
+./gnu/java/nio/charset/Windows1253.class
+./gnu/java/nio/charset/Windows1254.class
+./gnu/java/nio/charset/Windows1257.class
 ./gnu/java/security/provider/DefaultPolicy.class
 ./java/io/BufferedInputStream.class
 ./java/io/BufferedOutputStream.class
@@ -22,27 +40,22 @@
 ./java/io/FilterOutputStream.class
 ./java/io/InputStream.class
 ./java/io/OutputStream.class
-./java/io/OutputStreamWriter.class
 ./java/io/PrintStream.class
-./java/io/PrintStream$ForwardStream.class
-./java/io/PrintWriter.class
-./java/io/Reader.class
 ./java/io/Serializable.class
 ./java/io/VMFile.class
-./java/io/Writer.class
 ./java/lang/AbstractMethodError.class
 ./java/lang/ArithmeticException.class
 ./java/lang/ArrayIndexOutOfBoundsException.class
 ./java/lang/ArrayStoreException.class
-./java/lang/Character.class
 ./java/lang/CharSequence.class
+./java/lang/Character.class
 ./java/lang/Class.class
 ./java/lang/ClassCastException.class
 ./java/lang/ClassCircularityError.class
 ./java/lang/ClassFormatError.class
-./java/lang/ClassLoader.class
 ./java/lang/ClassLoader$1.class
 ./java/lang/ClassLoader$StaticData.class
+./java/lang/ClassLoader.class
 ./java/lang/ClassNotFoundException.class
 ./java/lang/Cloneable.class
 ./java/lang/Comparable.class
@@ -67,37 +80,23 @@
 ./java/lang/Number.class
 ./java/lang/Object.class
 ./java/lang/OutOfMemoryError.class
-./java/lang/ref/Reference.class
-./java/lang/ref/ReferenceQueue.class
-./java/lang/ref/WeakReference.class
-./java/lang/reflect/AccessibleObject.class
-./java/lang/reflect/Constructor.class
-./java/lang/reflect/Field.class
-./java/lang/reflect/InvocationTargetException.class
-./java/lang/reflect/Member.class
-./java/lang/reflect/Method.class
-./java/lang/reflect/Modifier.class
-./java/lang/reflect/ReflectUtil.class
 ./java/lang/Runnable.class
 ./java/lang/Runtime.class
 ./java/lang/RuntimeException.class
 ./java/lang/SecurityManager.class
 ./java/lang/StackTraceElement.class
-./java/lang/String.class
 ./java/lang/String$CaseInsensitiveComparator.class
+./java/lang/String.class
 ./java/lang/StringBuffer.class
 ./java/lang/StringCreator.class
 ./java/lang/System.class
 ./java/lang/Thread.class
 ./java/lang/ThreadGroup.class
-./java/lang/ThreadLocal.class
 ./java/lang/ThreadLocal$Key.class
+./java/lang/ThreadLocal.class
 ./java/lang/Throwable.class
 ./java/lang/UnsatisfiedLinkError.class
 ./java/lang/UnsupportedClassVersionError.class
-./java/lang/VerifyError.class
-./java/lang/VirtualMachine.class
-./java/lang/VirtualMachineError.class
 ./java/lang/VMClass.class
 ./java/lang/VMClassLoader.class
 ./java/lang/VMObject.class
@@ -105,15 +104,35 @@
 ./java/lang/VMString.class
 ./java/lang/VMSystem.class
 ./java/lang/VMThread.class
-./java/net/URL.class
+./java/lang/VerifyError.class
+./java/lang/VirtualMachine.class
+./java/lang/VirtualMachineError.class
+./java/lang/ref/Reference.class
+./java/lang/ref/ReferenceQueue.class
+./java/lang/ref/WeakReference.class
+./java/lang/reflect/AccessibleObject.class
+./java/lang/reflect/Constructor.class
+./java/lang/reflect/Field.class
+./java/lang/reflect/InvocationTargetException.class
+./java/lang/reflect/Member.class
+./java/lang/reflect/Method.class
+./java/lang/reflect/Modifier.class
+./java/lang/reflect/ReflectUtil.class
 ./java/net/URL$1.class
-./java/net/URLClassLoader.class
+./java/net/URL.class
 ./java/net/URLClassLoader$FileResource.class
 ./java/net/URLClassLoader$FileURLLoader.class
 ./java/net/URLClassLoader$Resource.class
 ./java/net/URLClassLoader$URLLoader.class
+./java/net/URLClassLoader.class
 ./java/net/URLStreamHandler.class
+./java/nio/Buffer.class
 ./java/nio/ByteBuffer$vm.class
+./java/nio/ByteBuffer.class
+./java/nio/ByteBufferImpl.class
+./java/nio/ByteOrder.class
+./java/nio/CharBuffer.class
+./java/nio/CharBufferImpl.class
 ./java/nio/channels/ByteChannel.class
 ./java/nio/channels/Channel.class
 ./java/nio/channels/FileChannel.class
@@ -121,18 +140,26 @@
 ./java/nio/channels/InterruptibleChannel.class
 ./java/nio/channels/ReadableByteChannel.class
 ./java/nio/channels/ScatteringByteChannel.class
-./java/nio/channels/spi/AbstractInterruptibleChannel.class
 ./java/nio/channels/WritableByteChannel.class
+./java/nio/channels/spi/AbstractInterruptibleChannel.class
+./java/nio/charset/Charset.class
+./java/nio/charset/CharsetEncoder.class
+./java/nio/charset/CoderResult$1.class
+./java/nio/charset/CoderResult$2.class
+./java/nio/charset/CoderResult$Cache.class
+./java/nio/charset/CoderResult.class
+./java/nio/charset/CodingErrorAction.class
+./java/nio/charset/spi/CharsetProvider.class
 ./java/security/AccessControlContext.class
 ./java/security/AccessController.class
-./java/security/AllPermission.class
 ./java/security/AllPermission$AllPermissionCollection.class
+./java/security/AllPermission.class
 ./java/security/CodeSource.class
 ./java/security/Guard.class
 ./java/security/Permission.class
 ./java/security/PermissionCollection.class
-./java/security/Permissions.class
 ./java/security/Permissions$PermissionsHash.class
+./java/security/Permissions.class
 ./java/security/Policy.class
 ./java/security/Principal.class
 ./java/security/PrivilegedAction.class
@@ -141,40 +168,48 @@
 ./java/security/VMAccessController.class
 ./java/util/AbstractCollection.class
 ./java/util/AbstractList.class
-./java/util/AbstractMap.class
 ./java/util/AbstractMap$BasicMapEntry.class
+./java/util/AbstractMap.class
 ./java/util/AbstractSequentialList.class
 ./java/util/AbstractSet.class
 ./java/util/ArrayList.class
 ./java/util/Collection.class
+./java/util/Collections$EmptyList.class
+./java/util/Collections$EmptyMap.class
+./java/util/Collections$EmptySet.class
+./java/util/Collections$ReverseComparator.class
 ./java/util/Collections$SynchronizedCollection.class
 ./java/util/Collections$SynchronizedIterator.class
 ./java/util/Collections$SynchronizedSet.class
+./java/util/Collections$UnmodifiableCollection.class
+./java/util/Collections$UnmodifiableIterator.class
+./java/util/Collections$UnmodifiableSet.class
+./java/util/Collections.class
 ./java/util/Comparator.class
 ./java/util/Dictionary.class
 ./java/util/Enumeration.class
-./java/util/HashMap.class
 ./java/util/HashMap$HashEntry.class
 ./java/util/HashMap$HashIterator.class
+./java/util/HashMap.class
 ./java/util/HashSet.class
-./java/util/Hashtable.class
 ./java/util/Hashtable$3.class
 ./java/util/Hashtable$HashEntry.class
 ./java/util/Hashtable$HashIterator.class
+./java/util/Hashtable.class
 ./java/util/Iterator.class
-./java/util/LinkedList.class
 ./java/util/LinkedList$Entry.class
+./java/util/LinkedList.class
 ./java/util/List.class
 ./java/util/Locale.class
-./java/util/Map.class
 ./java/util/Map$Entry.class
+./java/util/Map.class
 ./java/util/Properties.class
 ./java/util/RandomAccess.class
 ./java/util/Set.class
 ./java/util/StringTokenizer.class
 ./java/util/Vector.class
-./java/util/WeakHashMap.class
 ./java/util/WeakHashMap$1.class
-./java/util/WeakHashMap$WeakBucket.class
 ./java/util/WeakHashMap$WeakBucket$WeakEntry.class
+./java/util/WeakHashMap$WeakBucket.class
 ./java/util/WeakHashMap$WeakEntrySet.class
+./java/util/WeakHashMap.class
diff --git a/openwrt/package/sablevm/Makefile b/openwrt/package/sablevm/Makefile
index 7eec3f492..d09b11684 100644
--- a/openwrt/package/sablevm/Makefile
+++ b/openwrt/package/sablevm/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sablevm
-PKG_VERSION:=1.11.3
+PKG_VERSION:=1.13
 PKG_RELEASE:=1
-PKG_MD5SUM:=aea6e808c5f2e3646a60971485220bff
+PKG_MD5SUM:=d5828200032bfe921dd43e450931e38c
 
 PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/openwrt/package/sablevm/patches/001-heap_size.patch b/openwrt/package/sablevm/patches/001-heap_size.patch
new file mode 100644
index 000000000..d28237296
--- /dev/null
+++ b/openwrt/package/sablevm/patches/001-heap_size.patch
@@ -0,0 +1,15 @@
+diff -ruN sablevm-1.11.1-orig/src/libsablevm/system.h sablevm-1.11.1-1/src/libsablevm/system.h
+--- sablevm-1.11.1-orig/src/libsablevm/system.h	2005-03-18 01:25:09.000000000 +0100
++++ sablevm-1.11.1-1/src/libsablevm/system.h	2005-03-22 01:05:19.000000000 +0100
+@@ -279,9 +279,9 @@
+ 
+ #elif defined (_SABLEVM_COPY_GC) || (_SABLEVM_GENCOPY_GC)
+ 
+-#define SVM_HEAP_DEFAULT_MIN_SIZE 16777216
++#define SVM_HEAP_DEFAULT_MIN_SIZE 1048576
+ #define SVM_HEAP_DEFAULT_MAX_SIZE 0
+-#define SVM_HEAP_DEFAULT_ALLOCATION_INCREMENT 1048576
++#define SVM_HEAP_DEFAULT_ALLOCATION_INCREMENT 65536
+ 
+ #if defined (_SABLEVM_GENCOPY_GC)
+