replace sablevm and sablevm-classpath with sablevm-sdk, add a sablevm-mini package...

SVN-Revision: 6995

diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
deleted file mode 100644 (file)
index 2b1f291..0000000
--- a/lang/sablevm-classpath/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sablevm-classpath
-PKG_VERSION:=1.13
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
-PKG_MD5SUM:=9476bb7a0ad67c6cfa353d06f094cdce
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sablevm-classpath/Default
-  SECTION:=lang
-  CATEGORY:=Languages
-  URL:=http://www.gnu.org/software/classpath/
-endef
-
-define Package/libsablevm-classpath
-  $(call Package/sablevm-classpath/Default)
-  TITLE:=Essential native libraries for Java
-  DESCRIPTION:=\
-       GNU Classpath, Essential Libraries for Java, is a GNU project to create \\\
-       free core class libraries for use with virtual machines and compilers for \\\
-       the java programming language.\\\
-       This is a modified version for use with SableVM.
-endef
-
-define Package/sablevm-classpath-full
-  $(call Package/sablevm-classpath/Default)
-  DEPENDS:=+libsablevm-classpath
-  TITLE+= (full)
-endef
-
-define Package/sablevm-classpath-mini
-  $(call Package/sablevm-classpath/Default)
-  DEPENDS:=+libsablevm-classpath
-  TITLE+= (minimal)
-endef
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-                 --disable-gtk-peer \
-                 --disable-gtk-cairo \
-                 --with-jikes \
-                 --without-x \
-       )
-endef
-
-
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-       $(CP) ./files/mini.classlist $(PKG_BUILD_DIR)/lib/
-       cd $(PKG_BUILD_DIR)/lib ; fastjar -Mcf mini.jar -@ < mini.classlist
-endef
-
-define Package/libsablevm-classpath/install    
-       $(INSTALL_DIR) $(1)/usr/lib/sablevm-classpath
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(1)/usr/lib/sablevm-classpath/
-       $(INSTALL_DIR) $(1)/usr/lib/security
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(1)/usr/lib/security/
-endef
-
-define Package/sablevm-classpath-full/install  
-       $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \
-               $(1)/usr/share/sablevm-classpath/
-endef
-       
-define Package/sablevm-classpath-mini/install  
-       $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mini.jar \
-               $(1)/usr/share/sablevm-classpath/libclasspath.jar
-endef
-
-$(eval $(call BuildPackage,libsablevm-classpath))
-$(eval $(call BuildPackage,sablevm-classpath-full))
-$(eval $(call BuildPackage,sablevm-classpath-mini))
-
-$(foreach command, jikes fastjar, \
-  $(eval $(call RequireCommand,$(command), \
-   $(PKG_NAME) requires $(command). \
-  )) \
-)

diff --git a/lang/sablevm-classpath/files/mini.classlist b/lang/sablevm-classpath/files/mini.classlist
deleted file mode 100644 (file)
index 55f19f9..0000000
--- a/lang/sablevm-classpath/files/mini.classlist
+++ /dev/null
@@ -1,215 +0,0 @@
-./gnu/classpath/SystemProperties.class
-./gnu/classpath/VMStackWalker.class
-./gnu/classpath/VMSystemProperties.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
-./java/io/File.class
-./java/io/FileDescriptor.class
-./java/io/FileInputStream.class
-./java/io/FileOutputStream.class
-./java/io/FilePermission.class
-./java/io/FilterInputStream.class
-./java/io/FilterOutputStream.class
-./java/io/InputStream.class
-./java/io/OutputStream.class
-./java/io/PrintStream.class
-./java/io/Serializable.class
-./java/io/VMFile.class
-./java/lang/AbstractMethodError.class
-./java/lang/ArithmeticException.class
-./java/lang/ArrayIndexOutOfBoundsException.class
-./java/lang/ArrayStoreException.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$1.class
-./java/lang/ClassLoader$StaticData.class
-./java/lang/ClassLoader.class
-./java/lang/ClassNotFoundException.class
-./java/lang/Cloneable.class
-./java/lang/Comparable.class
-./java/lang/Error.class
-./java/lang/Exception.class
-./java/lang/ExceptionInInitializerError.class
-./java/lang/IllegalMonitorStateException.class
-./java/lang/IncompatibleClassChangeError.class
-./java/lang/IndexOutOfBoundsException.class
-./java/lang/Integer.class
-./java/lang/InternalError.class
-./java/lang/InterruptedException.class
-./java/lang/LinkageError.class
-./java/lang/Math.class
-./java/lang/NegativeArraySizeException.class
-./java/lang/NoClassDefFoundError.class
-./java/lang/NoSuchFieldError.class
-./java/lang/NoSuchFieldException.class
-./java/lang/NoSuchMethodError.class
-./java/lang/NoSuchMethodException.class
-./java/lang/NullPointerException.class
-./java/lang/Number.class
-./java/lang/Object.class
-./java/lang/OutOfMemoryError.class
-./java/lang/Runnable.class
-./java/lang/Runtime.class
-./java/lang/RuntimeException.class
-./java/lang/SecurityManager.class
-./java/lang/StackTraceElement.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$Key.class
-./java/lang/ThreadLocal.class
-./java/lang/Throwable.class
-./java/lang/UnsatisfiedLinkError.class
-./java/lang/UnsupportedClassVersionError.class
-./java/lang/VMClass.class
-./java/lang/VMClassLoader.class
-./java/lang/VMObject.class
-./java/lang/VMRuntime.class
-./java/lang/VMString.class
-./java/lang/VMSystem.class
-./java/lang/VMThread.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/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
-./java/nio/channels/GatheringByteChannel.class
-./java/nio/channels/InterruptibleChannel.class
-./java/nio/channels/ReadableByteChannel.class
-./java/nio/channels/ScatteringByteChannel.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$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$PermissionsHash.class
-./java/security/Permissions.class
-./java/security/Policy.class
-./java/security/Principal.class
-./java/security/PrivilegedAction.class
-./java/security/ProtectionDomain.class
-./java/security/SecureClassLoader.class
-./java/security/VMAccessController.class
-./java/util/AbstractCollection.class
-./java/util/AbstractList.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$HashEntry.class
-./java/util/HashMap$HashIterator.class
-./java/util/HashMap.class
-./java/util/HashSet.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$Entry.class
-./java/util/LinkedList.class
-./java/util/List.class
-./java/util/Locale.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$1.class
-./java/util/WeakHashMap$WeakBucket$WeakEntry.class
-./java/util/WeakHashMap$WeakBucket.class
-./java/util/WeakHashMap$WeakEntrySet.class
-./java/util/WeakHashMap.class

diff --git a/lang/sablevm-sdk/Makefile b/lang/sablevm-sdk/Makefile
new file mode 100644 (file)
index 0000000..88c602b
--- /dev/null
+++ b/lang/sablevm-sdk/Makefile
@@ -0,0 +1,126 @@
+#
+# Copyright (C) 2006,2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sablevm-sdk
+PKG_VERSION:=1.13
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/sablevm
+PKG_MD5SUM:=18a7c1a92b0748a206f9767a76a6b3bb
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/sablevm
+  SECTION:=lang
+  CATEGORY:=Languages
+  DEPENDS:=+libltdl +libpopt +libpthread +zlib
+  TITLE:=A Java Virtual Machine (JVM) implementation
+  DESCRIPTION:=\
+       SableVM is a robust, extremely portable, efficient, and specifications-\\\
+       -compliant Java virtual machine that aims to be easy to maintain and to \\\
+       extend. It features a state-of-the-art and efficient interpreter engine.\\\
+       Its source code is very accessible and easy to understand. It also has \\\
+       many robustness features that have been the object of careful design.
+  URL:=http://sablevm.org/
+endef
+
+define Package/sablevm-mini
+  $(call Package/sablevm)
+  TITLE+= (minimal)
+  DESCRIPTION+=\\\
+       This package contains only the minimal set of Java classes needed to \\\
+       run a simple "HelloWorld" program (included in this package).
+endef
+
+
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --disable-cp-tools \
+               --disable-gjdoc \
+       )
+       $(call Build/Configure/Default, \
+               --srcdir=./../sablevm \
+               --with-fastjar=/usr/bin/fastjar \
+               --with-jikes=/usr/bin/jikes \
+               --with-internal-libffi=yes \
+               --with-internal-libpopt=no \
+               , \
+               LIBS=" -lltdl -lpopt -lz " \
+               ,
+               sablevm \
+       )
+       $(call Build/Configure/Default, \
+               --srcdir=./../sablevm-classpath \
+               --with-fastjar=/usr/bin/fastjar \
+               --with-jikes=/usr/bin/jikes \
+               --disable-gtk-peer \
+               --disable-gtk-cairo \
+               --without-x \
+               , \
+               , \
+               sablevm-classpath \
+       )
+endef
+
+define Build/Compile   
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               EARLY_CONFIGURE= \
+               EXTRA_CONFIGURE= \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               all install
+       $(CP) ./files/mini.classlist $(PKG_BUILD_DIR)/sablevm-classpath/lib/
+       ( cd $(PKG_BUILD_DIR)/sablevm-classpath/lib; \
+               fastjar -Mcf mini.jar -@ < mini.classlist; \
+       )
+       mkdir -p $(PKG_INSTALL_DIR)/usr/share/sablevm/examples
+       $(CP) ./files/*.java $(PKG_INSTALL_DIR)/usr/share/sablevm/examples/
+       ( cd $(PKG_INSTALL_DIR)/usr/share/sablevm/examples; \
+               jikes -bootclasspath "../../sablevm-classpath:../../sablevm-classpath/libclasspath.jar:../../sablevm-classpath/resources.jar" *.java; \
+       )
+endef
+
+define Package/sablevm/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/sablevm-classpath
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(1)/usr/lib/sablevm-classpath/
+       $(INSTALL_DIR) $(1)/usr/lib/security
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(1)/usr/lib/security/
+       $(INSTALL_DIR) $(1)/usr/share/sablevm-classpath
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \
+               $(1)/usr/share/sablevm-classpath/
+endef
+
+define Package/sablevm-mini/install
+  $(call Package/sablevm/install,$(1))
+       rm -f $(1)/usr/lib/security/classpath.security
+       rm -f $(1)/usr/share/sablevm-classpath/resources.jar
+       $(CP) $(PKG_BUILD_DIR)/sablevm-classpath/lib/mini.jar \
+               $(1)/usr/share/sablevm-classpath/libclasspath.jar
+       $(INSTALL_DIR) $(1)/usr/share/sablevm/examples
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm/examples/* \
+               $(1)/usr/share/sablevm/examples/
+endef
+
+$(eval $(call BuildPackage,sablevm))
+$(eval $(call BuildPackage,sablevm-mini))
+
+$(foreach command, jikes fastjar, \
+  $(eval $(call RequireCommand,$(command), \
+   $(PKG_NAME) requires $(command). \
+  )) \
+)

diff --git a/lang/sablevm-sdk/files/HelloWorld.java b/lang/sablevm-sdk/files/HelloWorld.java
new file mode 100644 (file)
index 0000000..4dbe46e
--- /dev/null
+++ b/lang/sablevm-sdk/files/HelloWorld.java
@@ -0,0 +1,8 @@
+class HelloWorld
+{  
+        public static void main(String args[])
+        {
+           System.out.println("Hello World!");
+        }
+}
+

diff --git a/lang/sablevm-sdk/files/mini.classlist b/lang/sablevm-sdk/files/mini.classlist
new file mode 100644 (file)
index 0000000..55f19f9
--- /dev/null
+++ b/lang/sablevm-sdk/files/mini.classlist
@@ -0,0 +1,215 @@
+./gnu/classpath/SystemProperties.class
+./gnu/classpath/VMStackWalker.class
+./gnu/classpath/VMSystemProperties.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
+./java/io/File.class
+./java/io/FileDescriptor.class
+./java/io/FileInputStream.class
+./java/io/FileOutputStream.class
+./java/io/FilePermission.class
+./java/io/FilterInputStream.class
+./java/io/FilterOutputStream.class
+./java/io/InputStream.class
+./java/io/OutputStream.class
+./java/io/PrintStream.class
+./java/io/Serializable.class
+./java/io/VMFile.class
+./java/lang/AbstractMethodError.class
+./java/lang/ArithmeticException.class
+./java/lang/ArrayIndexOutOfBoundsException.class
+./java/lang/ArrayStoreException.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$1.class
+./java/lang/ClassLoader$StaticData.class
+./java/lang/ClassLoader.class
+./java/lang/ClassNotFoundException.class
+./java/lang/Cloneable.class
+./java/lang/Comparable.class
+./java/lang/Error.class
+./java/lang/Exception.class
+./java/lang/ExceptionInInitializerError.class
+./java/lang/IllegalMonitorStateException.class
+./java/lang/IncompatibleClassChangeError.class
+./java/lang/IndexOutOfBoundsException.class
+./java/lang/Integer.class
+./java/lang/InternalError.class
+./java/lang/InterruptedException.class
+./java/lang/LinkageError.class
+./java/lang/Math.class
+./java/lang/NegativeArraySizeException.class
+./java/lang/NoClassDefFoundError.class
+./java/lang/NoSuchFieldError.class
+./java/lang/NoSuchFieldException.class
+./java/lang/NoSuchMethodError.class
+./java/lang/NoSuchMethodException.class
+./java/lang/NullPointerException.class
+./java/lang/Number.class
+./java/lang/Object.class
+./java/lang/OutOfMemoryError.class
+./java/lang/Runnable.class
+./java/lang/Runtime.class
+./java/lang/RuntimeException.class
+./java/lang/SecurityManager.class
+./java/lang/StackTraceElement.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$Key.class
+./java/lang/ThreadLocal.class
+./java/lang/Throwable.class
+./java/lang/UnsatisfiedLinkError.class
+./java/lang/UnsupportedClassVersionError.class
+./java/lang/VMClass.class
+./java/lang/VMClassLoader.class
+./java/lang/VMObject.class
+./java/lang/VMRuntime.class
+./java/lang/VMString.class
+./java/lang/VMSystem.class
+./java/lang/VMThread.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/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
+./java/nio/channels/GatheringByteChannel.class
+./java/nio/channels/InterruptibleChannel.class
+./java/nio/channels/ReadableByteChannel.class
+./java/nio/channels/ScatteringByteChannel.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$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$PermissionsHash.class
+./java/security/Permissions.class
+./java/security/Policy.class
+./java/security/Principal.class
+./java/security/PrivilegedAction.class
+./java/security/ProtectionDomain.class
+./java/security/SecureClassLoader.class
+./java/security/VMAccessController.class
+./java/util/AbstractCollection.class
+./java/util/AbstractList.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$HashEntry.class
+./java/util/HashMap$HashIterator.class
+./java/util/HashMap.class
+./java/util/HashSet.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$Entry.class
+./java/util/LinkedList.class
+./java/util/List.class
+./java/util/Locale.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$1.class
+./java/util/WeakHashMap$WeakBucket$WeakEntry.class
+./java/util/WeakHashMap$WeakBucket.class
+./java/util/WeakHashMap$WeakEntrySet.class
+./java/util/WeakHashMap.class

diff --git a/lang/sablevm-sdk/patches/001-heap_size.patch b/lang/sablevm-sdk/patches/001-heap_size.patch
new file mode 100644 (file)
index 0000000..73d3e2b
--- /dev/null
+++ b/lang/sablevm-sdk/patches/001-heap_size.patch
@@ -0,0 +1,15 @@
+diff -ruN sablevm-sdk-1.13-old/sablevm/src/libsablevm/system.h sablevm-sdk-1.13-new/sablevm/src/libsablevm/system.h
+--- sablevm-sdk-1.13-old/sablevm/src/libsablevm/system.h       2007-03-30 03:57:54.000000000 +0200
++++ sablevm-sdk-1.13-new/sablevm/src/libsablevm/system.h       2007-04-11 02:25:06.000000000 +0200
+@@ -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)
+ 

diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
deleted file mode 100644 (file)
index 3b80eaf..0000000
--- a/lang/sablevm/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sablevm
-PKG_VERSION:=1.13
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://sablevm.org/download/release/$(PKG_VERSION)/
-PKG_MD5SUM:=d5828200032bfe921dd43e450931e38c
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sablevm
-  SECTION:=lang
-  CATEGORY:=Languages
-  DEPENDS:=+libffi-sable +libltdl +libpopt +libpthread +zlib
-  TITLE:=A Java Virtual Machine (JVM) implementation
-  DESCRIPTION:=\
-       SableVM is a robust, extremely portable, efficient, and specifications-\\\
-       -compliant Java virtual machine that aims to be easy to maintain and to \\\
-       extend. It features a state-of-the-art and efficient interpreter engine.\\\
-       Its source code is very accessible and easy to understand. It also has \\\
-       many robustness features that have been the object of careful design.
-  URL:=http://sablevm.org/
-endef
-
-
-define Build/Configure
-       $(call Build/Configure/Default, \
-               , \
-               LIBS="-lffi -lltdl -lpopt -lz" \
-       )
-endef
-
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
-define Package/sablevm/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(1)/usr/bin/
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,sablevm))

diff --git a/lang/sablevm/patches/001-heap_size.patch b/lang/sablevm/patches/001-heap_size.patch
deleted file mode 100644 (file)
index d282372..0000000
--- a/lang/sablevm/patches/001-heap_size.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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)
-