X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=lang%2Fjamvm%2FMakefile;h=a56d29ec255151503c8f36c291c16707e860642b;hb=9817b65bb11ba8910e3e80508e8d38f702d6ae94;hp=0859da2f29936ee266ebfc2156ade86ae931168a;hpb=5cb332fb355cda50c0cfc952cee0778e5148781c;p=packages.git

diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile
index 0859da2f2..a56d29ec2 100644
--- a/lang/jamvm/Makefile
+++ b/lang/jamvm/Makefile
@@ -1,63 +1,69 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2012 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:=jamvm
-PKG_VERSION:=1.4.1
-PKG_RELEASE:=1
-PKG_MD5SUM:=ed79d6b60e50b007614831f8c28321ac
+PKG_VERSION:=1.6.0-git
+PKG_RELEASE:=2
 
-PKG_SOURCE_URL:=@SF/jamvm
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git://git.berlios.de/jamvm
+PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_MD5SUM:=66a728a3cb8dad0e3773035c4049eb5f
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_USE_MIPS16:=0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/jamvm
+  SUBMENU:=Java
   SECTION:=lang
   CATEGORY:=Languages
-  DEPENDS:=+libffi-sable
   TITLE:=A compact Java Virtual Machine
-  DESCRIPTION:=JamVM is a new Java Virtual Machine which conforms to the JVM\\\
-specification version (blue book). In comparison to most other VM's\\\
-(free and commercial) it is extremely small.However, unlike other\\\
-small VMs (e.g. KVM) it is designed to support the full\\\
-specification, and includes support for object finalisation,\\\
-Soft/Weak/Phantom References, the Java Native Interface (JNI) and the\\\
-Reflection API.\\\
   URL:=http://sourceforge.net/projects/jamvm
+  DEPENDS:=+zlib +libpthread +librt +classpath @!avr32
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--enable-ffi)
+define Package/jamvm/description
+ JamVM is a new Java Virtual Machine which conforms to the JVM 
+ specification version (blue book). In comparison to most other VM's (free 
+ and commercial) it is extremely small.However, unlike other small VMs 
+ (e.g. KVM) it is designed to support the full specification, and includes 
+ support for object finalisation, Soft/Weak/Phantom References, the Java 
+ Native Interface (JNI) and the Reflection API.
 endef
 
-define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)/usr/bin
-	mkdir -p $(PKG_INSTALL_DIR)/usr/share/jamvm
-	$(MAKE) -C $(PKG_BUILD_DIR)/src \
-              $(TARGET_CONFIGURE_OPTS)
-	$(CP) $(PKG_BUILD_DIR)/src/jamvm $(PKG_INSTALL_DIR)/usr/bin
-	$(MAKE) -C $(PKG_BUILD_DIR)/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/classes.zip $(PKG_INSTALL_DIR)/usr/share/jamvm
-endef
+CONFIGURE_ARGS += \
+	--with-java-runtime-library=gnuclasspath \
+	--with-classpath-install-dir=/usr \
+	--disable-int-inlining \
+	--disable-shared \
+	--without-pic
 
+MAKE_FLAGS += \
+	GLIBJ_ZIP=$(STAGING_DIR)/usr/share/classpath/glibj.zip
 
-define Package/jamvm/install	
-	install -d -m0755 $(1)/usr/bin
-	install -d -m0755 $(1)/usr/share/jamvm
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/jamvm $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/share/jamvm/classes.zip $(1)/usr/share/jamvm
+define Package/jamvm/install
+	$(INSTALL_DIR) $(1)/usr
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin \
+		$(PKG_INSTALL_DIR)/usr/share \
+		$(1)/usr/
+endef
+
+define Build/InstallDev
+	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
 $(eval $(call BuildPackage,jamvm))
+