--- a/JavaNativeMethodImpl_SunJDK7.st Thu Feb 06 10:38:49 2014 +0100
+++ b/JavaNativeMethodImpl_SunJDK7.st Thu Feb 06 10:45:46 2014 +0100
@@ -99,6 +99,31 @@
^ JavaVM unimplementedNativeMethodSignal raise
! !
+!JavaNativeMethodImpl_SunJDK7 class methodsFor:'native - java.io'!
+
+_java_io_FileInputStream_read0: this
+
+ <javanative: 'java/io/FileInputStream' name: 'read0()I'>
+
+ ^ JavaVM unimplementedNativeMethodSignal raise
+! !
+
+!JavaNativeMethodImpl_SunJDK7 class methodsFor:'native - sun.misc'!
+
+_sun_misc_Unsafe_shouldBeInitialized: this _: a1
+
+ <javanative: 'sun/misc/Unsafe' name: 'shouldBeInitialized(Ljava/lang/Class;)Z'>
+
+ ^ JavaVM unimplementedNativeMethodSignal raise
+!
+
+_sun_misc_VM_latestUserDefinedLoader: this
+
+ <javanative: 'sun/misc/VM' name: 'latestUserDefinedLoader()Ljava/lang/ClassLoader;'>
+
+ ^ JavaVM unimplementedNativeMethodSignal raise
+! !
+
!JavaNativeMethodImpl_SunJDK7 class methodsFor:'documentation'!
version_CVS
--- a/JavaRelease.st Thu Feb 06 10:38:49 2014 +0100
+++ b/JavaRelease.st Thu Feb 06 10:45:46 2014 +0100
@@ -1774,7 +1774,7 @@
homeFromRegistry := self javaHomeOnWindowsFromRegistry.
homeFromRegistry = home ifTrue:[ ^ true ].
- homeDir := homeDir asFilename.
+ homeDir := home asFilename.
"JDK..."
(f := homeDir / 'release') exists ifTrue:[
@@ -1804,6 +1804,7 @@
"Created: / 12-02-2013 / 02:52:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 12-12-2013 / 15:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 12-12-2013 / 16:35:10 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
!
validateJavaVersionString:aVersionString
--- a/Make.proto Thu Feb 06 10:38:49 2014 +0100
+++ b/Make.proto Thu Feb 06 10:45:46 2014 +0100
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport/fdlibm -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic3 -I$(INCLUDE_TOP)/stx/libview
# if you need any additional defines for embedded C code,
@@ -144,8 +144,6 @@
cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/bc.mak Thu Feb 06 10:38:49 2014 +0100
+++ b/bc.mak Thu Feb 06 10:45:46 2014 +0100
@@ -34,7 +34,7 @@
-LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview
+LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libview
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -54,8 +54,6 @@
pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/libjava.rc Thu Feb 06 10:38:49 2014 +0100
+++ b/libjava.rc Thu Feb 06 10:45:46 2014 +0100
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Fri, 31 Jan 2014 12:35:22 GMT\0"
+ VALUE "ProductDate", "Thu, 12 Dec 2013 15:36:25 GMT\0"
END
END