# HG changeset patch # User vranyj1 # Date 1321225079 0 # Node ID 847291fc77d7058fab5b7fc3eaa5f9fcc7308ed0 # Parent cd93fefe9b2ce012a6ac7760abcbfe70a67c20fc More java.net.* primitives diff -r cd93fefe9b2c -r 847291fc77d7 src/JavaSocket.st --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/JavaSocket.st Sun Nov 13 22:57:59 2011 +0000 @@ -0,0 +1,145 @@ +" + COPYRIGHT (c) 1996-2011 by Claus Gittinger + COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko + SWING Research Group, Czech Technical University in Prague + + Parts of the code written by Claus Gittinger are under following + license: + + This software is furnished under a license and may be used + only in accordance with the terms of that license and with the + inclusion of the above copyright notice. This software may not + be provided or otherwise made available to, or used by, any + other person. No title to or ownership of the software is + hereby transferred. + + Parts of the code written at SWING Reasearch Group [1] are MIT licensed: + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the 'Software'), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + [1] Code written at SWING Research Group contain a signature + of one of the above copright owners. +" +"{ Package: 'stx:libjava' }" + +Socket subclass:#JavaSocket + instanceVariableNames:'options' + classVariableNames:'Defaults' + poolDictionaries:'' + category:'Languages-Java-Support' +! + +!JavaSocket class methodsFor:'documentation'! + +copyright +" + COPYRIGHT (c) 1996-2011 by Claus Gittinger + COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko + SWING Research Group, Czech Technical University in Prague + + Parts of the code written by Claus Gittinger are under following + license: + + This software is furnished under a license and may be used + only in accordance with the terms of that license and with the + inclusion of the above copyright notice. This software may not + be provided or otherwise made available to, or used by, any + other person. No title to or ownership of the software is + hereby transferred. + + Parts of the code written at SWING Reasearch Group [1] are MIT licensed: + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the 'Software'), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + [1] Code written at SWING Research Group contain a signature + of one of the above copright owners. + +" +! ! + +!JavaSocket class methodsFor:'initialization'! + +initialize + "Invoked at system start or when the class is dynamically loaded." + + "/ please change as required (and remove this comment) + + Defaults := Dictionary new. + Defaults at: #TCP_NODELAY put: false. + Defaults at: #SO_LINGER put: -1. + + "Modified: / 13-11-2011 / 23:07:15 / Jan Vrany " +! ! + +!JavaSocket methodsFor:'options'! + +getSocketOption: option + + options isNil ifTrue:[options := Dictionary new]. + ^options at: option ifAbsent:[Defaults at: option ifAbsent:[false]] + + "Created: / 13-11-2011 / 20:54:29 / Jan Vrany " +! + +setSocketOption: option argument: arg1 argument: arg2 + + super setSocketOption: option argument: arg1 argument: arg2. + options isNil ifTrue:[options := Dictionary new]. + option == #SO_LINGER ifTrue:[ + arg1 == false ifTrue:[ + options at: option put: -1 + ] ifFalse:[ + options at: option put: arg2 + ]. + ] ifFalse:[ + options at: option put: arg1 + ] + + "Created: / 13-11-2011 / 20:51:44 / Jan Vrany " +! ! + +!JavaSocket class methodsFor:'documentation'! + +version_SVN + ^ '$Id$' +! ! + +JavaSocket initialize! diff -r cd93fefe9b2c -r 847291fc77d7 src/JavaVM.st --- a/src/JavaVM.st Sun Nov 13 22:56:44 2011 +0000 +++ b/src/JavaVM.st Sun Nov 13 22:57:59 2011 +0000 @@ -7389,6 +7389,7 @@ self throwExceptionClassName:'java.net.ConnectException' withMessage:'connect failed'. ]. jsock instVarNamed: #localport put: sock port. + jsock instVarNamed: #address put: jaddr. ] on: Error do:[:ex| self throwExceptionClassName:'java.net.ConnectException' withMessage:'connect failed: ', ex description ]. @@ -7397,7 +7398,7 @@ "Created: / 25-01-1998 / 20:02:27 / cg" "Modified: / 30-12-1998 / 20:10:28 / cg" - "Modified: / 09-11-2011 / 22:59:10 / Jan Vrany " + "Modified: / 13-11-2011 / 23:16:59 / Jan Vrany " ! _java_net_PlainSocketImpl_socketCreate: nativeContext @@ -7425,9 +7426,9 @@ ]. isStream ifTrue:[ - sock := Socket newTCP + sock := JavaSocket newTCP ] ifFalse:[ - sock := Socket newUDP + sock := JavaSocket newUDP ]. sock isNil ifTrue:[ self throwIOExceptionWithMessage:'socketCreate failed'. @@ -7450,14 +7451,75 @@ "Created: / 25-01-1998 / 19:59:25 / cg" "Modified: / 30-12-1998 / 20:10:38 / cg" - "Modified: / 07-11-2011 / 23:20:02 / Jan Vrany " + "Modified: / 13-11-2011 / 20:46:23 / Jan Vrany " ! _java_net_PlainSocketImpl_socketGetOption: nativeContext - ^ UnimplementedNativeMethodSignal raise + | opt arg sock ret | + opt := nativeContext argAt: 1. + arg := nativeContext argAt: 2. + + sock := self validateFile: nativeContext receiver. + +"/ TCP_NODELAY = 1; + opt = 1 ifTrue:[ + ret := sock getSocketOption: #TCP_NODELAY. + ^ret ifTrue:[1] ifFalse:[-1]. + ]. +"/ SO_BINDADDR = 15; + opt = 15 ifTrue:[ + self breakPoint: #jv. + ^-1 "/Unsupported + ]. + +"/ SO_REUSEADDR = 4; + opt = 4 ifTrue:[ + ret := sock getSocketOption: #SO_REUSEADDR. + ^ret ifTrue:[1] ifFalse:[-1]. + ]. +"/ IP_TOS = 3; + opt = 3 ifTrue:[ + self breakPoint: #jv. + ^-1 "/Unsupported + ]. +"/ SO_LINGER = 128; + opt = 128 ifTrue:[ + ret := sock getSocketOption:#SO_LINGER. + ^ret + ]. +"/ SO_TIMEOUT = 4102; + opt = 4102 ifTrue:[ + self breakPoint: #jv. + ^-1 "/Unsupported . + ]. +"/ SO_SNDBUF = 4097; + opt = 4097 ifTrue:[ + ret := sock getSocketOption: #SO_SNDBUF. + ^ret + ]. + +"/ SO_RCVBUF = 4098; + opt = 4098 ifTrue:[ + ret := sock getSocketOption: #SO_RCVBUF. + ^ret + ]. + +"/ SO_KEEPALIVE = 8; + opt = 8 ifTrue:[ + ret := sock getSocketOption: #SO_KEEPALIVE. + ^ret ifTrue:[1] ifFalse:[-1]. + ]. + +"/ SO_OOBINLINE = 4099; + opt = 4099 ifTrue:[ + ret := sock getSocketOption: #SO_OOBINLINE. + ^ret ifTrue:[1] ifFalse:[-1]. + ] + + "Modified: / 13-11-2011 / 23:06:21 / Jan Vrany " ! _java_net_PlainSocketImpl_socketListen: nativeContext @@ -7492,10 +7554,10 @@ - | opt on val sock o arg1 | + | opt on val sock o arg1 arg2 | opt := nativeContext argAt: 1. on := nativeContext argAt: 2. - val := nativeContext argAt: 2. + val := nativeContext argAt: 3. sock := self validateFile: nativeContext receiver. @@ -7520,8 +7582,9 @@ ]. "/ SO_LINGER = 128; opt = 128 ifTrue:[ - o := #SO_DONTLINGER. - arg1 := (on == 0) + o := #SO_LINGER. + arg1 := (on == 1). + arg2 := val instVarNamed: #value. ]. "/ SO_TIMEOUT = 4102; opt = 4102 ifTrue:[ @@ -7553,12 +7616,12 @@ ]. [ - sock setSocketOption: o argument: arg1 argument: nil. + sock setSocketOption: o argument: arg1 argument: arg2. ] on: Error do:[:ex| self throwSocketException: 'Error setting socket option: ', ex description. ]. - "Modified: / 09-11-2011 / 23:32:33 / Jan Vrany " + "Modified: / 13-11-2011 / 23:05:21 / Jan Vrany " ! _java_net_SocketInputStream_init: nativeContext @@ -7600,14 +7663,14 @@ ]. [ - nread := sock next: len into: data startingAt: off. + nread := sock readInto: data startingAt: off count: len. ] on: Error do:[:ex| self throwSocketException: 'Error when reading: ', ex description. ]. ^nread - "Modified: / 09-11-2011 / 22:51:39 / Jan Vrany " + "Modified: / 13-11-2011 / 23:49:51 / Jan Vrany " ! _java_net_SocketOutputStream_init: nativeContext @@ -7623,7 +7686,27 @@ - ^ UnimplementedNativeMethodSignal raise + | fdObj data off len sock | + fdObj := nativeContext argAt:1. + data := nativeContext argAt:2. + off := nativeContext argAt:3. + len := nativeContext argAt:4. + + + fdObj isNil ifTrue:[ + self throwSocketException: 'Socket closed (null fdObj passed to socketRead0)'. + ^ -1. + ]. + + sock := self validateFile: fdObj. + + [ + sock nextPutBytes: len from: data startingAt: off. + ] on: Error do:[:ex| + self throwIOExceptionWithMessage: 'Error when writing: ', ex description. + ]. + + "Modified: / 13-11-2011 / 23:53:43 / Jan Vrany " ! ! !JavaVM class methodsFor:'native - java.security'! @@ -17516,4 +17599,3 @@ ! ! JavaVM initialize! - diff -r cd93fefe9b2c -r 847291fc77d7 src/Make.proto --- a/src/Make.proto Sun Nov 13 22:56:44 2011 +0000 +++ b/src/Make.proto Sun Nov 13 22:57:59 2011 +0000 @@ -1,7 +1,7 @@ # $Header$ # # DO NOT EDIT -# automagically generated from the projectDefinition: stx_libjava at 2011-10-25 09:53:56.062. +# automagically generated from the projectDefinition: stx_libjava at 2011-11-14 00:00:23.638. # # Warning: once you modify this file, do not rerun # stmkmp or projectDefinition-build again - otherwise, your changes are lost. @@ -121,6 +121,7 @@ cleanjunk:: + -rm -f *.s *.s2 clean:: -rm -f *.o *.H @@ -139,7 +140,6 @@ $(OUTDIR)JavaAnnotationValue.$(O) JavaAnnotationValue.$(H): JavaAnnotationValue.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaArray.$(O) JavaArray.$(H): JavaArray.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaByteCodeProcessor.$(O) JavaByteCodeProcessor.$(H): JavaByteCodeProcessor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaClassRegistry.$(O) JavaClassRegistry.$(H): JavaClassRegistry.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaConstantPool.$(O) JavaConstantPool.$(H): JavaConstantPool.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaConstants.$(O) JavaConstants.$(H): JavaConstants.st $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -170,6 +170,7 @@ $(OUTDIR)JavaRelease.$(O) JavaRelease.$(H): JavaRelease.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaResolver.$(O) JavaResolver.$(H): JavaResolver.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaSlotIndexCache.$(O) JavaSlotIndexCache.$(H): JavaSlotIndexCache.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)JavaSocket.$(O) JavaSocket.$(H): JavaSocket.st $(INCLUDE_TOP)/stx/libbasic2/Socket.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaSourceCodeCache.$(O) JavaSourceCodeCache.$(H): JavaSourceCodeCache.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -177,7 +178,6 @@ $(OUTDIR)JavaTopView.$(O) JavaTopView.$(H): JavaTopView.st $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaTypeBox.$(O) JavaTypeBox.$(H): JavaTypeBox.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaView.$(O) JavaView.$(H): JavaView.st $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaZipSupport.$(O) JavaZipSupport.$(H): JavaZipSupport.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)MessageDescription.$(O) MessageDescription.$(H): MessageDescription.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -197,7 +197,7 @@ $(OUTDIR)JavaAnnotationEnumValue.$(O) JavaAnnotationEnumValue.$(H): JavaAnnotationEnumValue.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) JavaAnnotationNestedAnnotationValue.$(H): JavaAnnotationNestedAnnotationValue.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaAnnotationPrimitiveValue.$(O) JavaAnnotationPrimitiveValue.$(H): JavaAnnotationPrimitiveValue.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)JavaBehavior.$(O) JavaBehavior.$(H): JavaBehavior.st $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)JavaBehavior.$(O) JavaBehavior.$(H): JavaBehavior.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaBoolBox.$(O) JavaBoolBox.$(H): JavaBoolBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaBooleanBox.$(O) JavaBooleanBox.$(H): JavaBooleanBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaByteCodeDisassembler.$(O) JavaByteCodeDisassembler.$(H): JavaByteCodeDisassembler.st $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -205,6 +205,7 @@ $(OUTDIR)JavaByteCodeInterpreter.$(O) JavaByteCodeInterpreter.$(H): JavaByteCodeInterpreter.st $(INCLUDE_TOP)/stx/libjava/JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaClassAnnotationContainer.$(O) JavaClassAnnotationContainer.$(H): JavaClassAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaClassContentRef2.$(O) JavaClassContentRef2.$(H): JavaClassContentRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaClassRef2.$(O) JavaClassRef2.$(H): JavaClassRef2.st $(INCLUDE_TOP)/stx/libjava/JavaRef2.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaEmbeddedFrameView.$(O) JavaEmbeddedFrameView.$(H): JavaEmbeddedFrameView.st $(INCLUDE_TOP)/stx/libjava/JavaView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -212,7 +213,7 @@ $(OUTDIR)JavaFormalParameterNode.$(O) JavaFormalParameterNode.$(H): JavaFormalParameterNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaIntegerBox.$(O) JavaIntegerBox.$(H): JavaIntegerBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaInvalidRefError.$(O) JavaInvalidRefError.$(H): JavaInvalidRefError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) -$(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaMethodAnnotationContainer.$(O) JavaMethodAnnotationContainer.$(H): JavaMethodAnnotationContainer.st $(INCLUDE_TOP)/stx/libjava/JavaAnnotationContainer.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)/stx/libjava/JavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) @@ -226,6 +227,7 @@ $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)/stx/libjava/JavaError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaUnresolvedClassConstant.$(O) JavaUnresolvedClassConstant.$(H): JavaUnresolvedClassConstant.st $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavaUnresolvedStringConstant.$(O) JavaUnresolvedStringConstant.$(H): JavaUnresolvedStringConstant.st $(INCLUDE_TOP)/stx/libjava/JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) +$(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)/stx/libjava/JavaConstants.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)JavadocDeclarationNode.$(O) JavadocDeclarationNode.$(H): JavadocDeclarationNode.st $(INCLUDE_TOP)/stx/libjava/PPJavaNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SetBox.$(O) SetBox.$(H): SetBox.st $(INCLUDE_TOP)/stx/libjava/JavaTypeBox.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) $(OUTDIR)SmalltalkSelectorParser.$(O) SmalltalkSelectorParser.$(H): SmalltalkSelectorParser.st $(INCLUDE_TOP)/stx/libjava/SelectorParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR) diff -r cd93fefe9b2c -r 847291fc77d7 src/Make.spec --- a/src/Make.spec Sun Nov 13 22:56:44 2011 +0000 +++ b/src/Make.spec Sun Nov 13 22:57:59 2011 +0000 @@ -1,7 +1,7 @@ # $Header$ # # DO NOT EDIT -# automagically generated from the projectDefinition: stx_libjava at 2011-10-25 09:53:54.706. +# automagically generated from the projectDefinition: stx_libjava at 2011-11-14 00:00:22.571. # # Warning: once you modify this file, do not rerun # stmkmp or projectDefinition-build again - otherwise, your changes are lost. @@ -168,6 +168,7 @@ JavaNativeMethod \ JavaClassRegistry \ JavaClass \ + JavaSocket \ @@ -291,6 +292,7 @@ $(OUTDIR)JavaNativeMethod.$(O) \ $(OUTDIR)JavaClassRegistry.$(O) \ $(OUTDIR)JavaClass.$(O) \ + $(OUTDIR)JavaSocket.$(O) \ $(OUTDIR)extensions.$(O) \ diff -r cd93fefe9b2c -r 847291fc77d7 src/abbrev.stc --- a/src/abbrev.stc Sun Nov 13 22:56:44 2011 +0000 +++ b/src/abbrev.stc Sun Nov 13 22:57:59 2011 +0000 @@ -149,3 +149,4 @@ JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1 JavaClassRegistry JavaClassRegistry stx:libjava 'Languages-Java-Support' 0 JavaConstants JavaConstants stx:libjava 'Languages-Java-Support' 0 +JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0 diff -r cd93fefe9b2c -r 847291fc77d7 src/bc.mak --- a/src/bc.mak Sun Nov 13 22:56:44 2011 +0000 +++ b/src/bc.mak Sun Nov 13 22:57:59 2011 +0000 @@ -1,7 +1,7 @@ # $Header$ # # DO NOT EDIT -# automagically generated from the projectDefinition: stx_libjava at 2011-10-25 09:53:56.822. +# automagically generated from the projectDefinition: stx_libjava at 2011-11-14 00:00:24.088. # # Warning: once you modify this file, do not rerun # stmkmp or projectDefinition-build again - otherwise, your changes are lost. @@ -14,9 +14,9 @@ # bmake clobber - clean all # # Historic Note: -# this used to contain only rules to make with borland +# this used to contain only rules to make with borland # (called via bmake, by "make.exe -f bc.mak") -# this has changed; it is now also possible to build using microsoft visual c +# this has changed; it is now also possible to build using microsoft visual c # (called via vcmake, by "make.exe -f bc.mak -DUSEVC") # TOP=.. @@ -97,7 +97,6 @@ $(OUTDIR)JavaAnnotationValue.$(O) JavaAnnotationValue.$(H): JavaAnnotationValue.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaArray.$(O) JavaArray.$(H): JavaArray.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaByteCodeProcessor.$(O) JavaByteCodeProcessor.$(H): JavaByteCodeProcessor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaClassRegistry.$(O) JavaClassRegistry.$(H): JavaClassRegistry.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaConstantPool.$(O) JavaConstantPool.$(H): JavaConstantPool.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaConstants.$(O) JavaConstants.$(H): JavaConstants.st $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -128,6 +127,7 @@ $(OUTDIR)JavaRelease.$(O) JavaRelease.$(H): JavaRelease.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaResolver.$(O) JavaResolver.$(H): JavaResolver.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaSlotIndexCache.$(O) JavaSlotIndexCache.$(H): JavaSlotIndexCache.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)JavaSocket.$(O) JavaSocket.$(H): JavaSocket.st $(INCLUDE_TOP)\stx\libbasic2\Socket.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaSourceCodeCache.$(O) JavaSourceCodeCache.$(H): JavaSourceCodeCache.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaSourceFileWriter.$(O) JavaSourceFileWriter.$(H): JavaSourceFileWriter.st $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -135,7 +135,6 @@ $(OUTDIR)JavaTopView.$(O) JavaTopView.$(H): JavaTopView.st $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaTypeBox.$(O) JavaTypeBox.$(H): JavaTypeBox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaUnresolvedConstant.$(O) JavaUnresolvedConstant.$(H): JavaUnresolvedConstant.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaView.$(O) JavaView.$(H): JavaView.st $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaZipSupport.$(O) JavaZipSupport.$(H): JavaZipSupport.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)MessageDescription.$(O) MessageDescription.$(H): MessageDescription.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -155,7 +154,7 @@ $(OUTDIR)JavaAnnotationEnumValue.$(O) JavaAnnotationEnumValue.$(H): JavaAnnotationEnumValue.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaAnnotationNestedAnnotationValue.$(O) JavaAnnotationNestedAnnotationValue.$(H): JavaAnnotationNestedAnnotationValue.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaAnnotationPrimitiveValue.$(O) JavaAnnotationPrimitiveValue.$(H): JavaAnnotationPrimitiveValue.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)JavaBehavior.$(O) JavaBehavior.$(H): JavaBehavior.st $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)JavaBehavior.$(O) JavaBehavior.$(H): JavaBehavior.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaBoolBox.$(O) JavaBoolBox.$(H): JavaBoolBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaBooleanBox.$(O) JavaBooleanBox.$(H): JavaBooleanBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaByteCodeDisassembler.$(O) JavaByteCodeDisassembler.$(H): JavaByteCodeDisassembler.st $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -163,6 +162,7 @@ $(OUTDIR)JavaByteCodeInterpreter.$(O) JavaByteCodeInterpreter.$(H): JavaByteCodeInterpreter.st $(INCLUDE_TOP)\stx\libjava\JavaByteCodeProcessor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaClassAnnotationContainer.$(O) JavaClassAnnotationContainer.$(H): JavaClassAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaClassContentRef2.$(O) JavaClassContentRef2.$(H): JavaClassContentRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)JavaClassReader.$(O) JavaClassReader.$(H): JavaClassReader.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaClassRef2.$(O) JavaClassRef2.$(H): JavaClassRef2.st $(INCLUDE_TOP)\stx\libjava\JavaRef2.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaEmbeddedFrameView.$(O) JavaEmbeddedFrameView.$(H): JavaEmbeddedFrameView.st $(INCLUDE_TOP)\stx\libjava\JavaView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaFieldAnnotationContainer.$(O) JavaFieldAnnotationContainer.$(H): JavaFieldAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -170,7 +170,7 @@ $(OUTDIR)JavaFormalParameterNode.$(O) JavaFormalParameterNode.$(H): JavaFormalParameterNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaIntegerBox.$(O) JavaIntegerBox.$(H): JavaIntegerBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaInvalidRefError.$(O) JavaInvalidRefError.$(H): JavaInvalidRefError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) -$(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)JavaMethod.$(O) JavaMethod.$(H): JavaMethod.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaMethodAnnotationContainer.$(O) JavaMethodAnnotationContainer.$(H): JavaMethodAnnotationContainer.st $(INCLUDE_TOP)\stx\libjava\JavaAnnotationContainer.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaMethodDeclarationNode.$(O) JavaMethodDeclarationNode.$(H): JavaMethodDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaMethodDeclaratorNode.$(O) JavaMethodDeclaratorNode.$(H): JavaMethodDeclaratorNode.st $(INCLUDE_TOP)\stx\libjava\JavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) @@ -184,6 +184,7 @@ $(OUTDIR)JavaUnhandledExceptionError.$(O) JavaUnhandledExceptionError.$(H): JavaUnhandledExceptionError.st $(INCLUDE_TOP)\stx\libjava\JavaError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaUnresolvedClassConstant.$(O) JavaUnresolvedClassConstant.$(H): JavaUnresolvedClassConstant.st $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavaUnresolvedStringConstant.$(O) JavaUnresolvedStringConstant.$(H): JavaUnresolvedStringConstant.st $(INCLUDE_TOP)\stx\libjava\JavaUnresolvedConstant.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) +$(OUTDIR)JavaVM.$(O) JavaVM.$(H): JavaVM.st $(INCLUDE_TOP)\stx\libjava\JavaConstants.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)JavadocDeclarationNode.$(O) JavadocDeclarationNode.$(H): JavadocDeclarationNode.st $(INCLUDE_TOP)\stx\libjava\PPJavaNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)SetBox.$(O) SetBox.$(H): SetBox.st $(INCLUDE_TOP)\stx\libjava\JavaTypeBox.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) $(OUTDIR)SmalltalkSelectorParser.$(O) SmalltalkSelectorParser.$(H): SmalltalkSelectorParser.st $(INCLUDE_TOP)\stx\libjava\SelectorParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR) diff -r cd93fefe9b2c -r 847291fc77d7 src/bmake.bat --- a/src/bmake.bat Sun Nov 13 22:56:44 2011 +0000 +++ b/src/bmake.bat Sun Nov 13 22:57:59 2011 +0000 @@ -3,6 +3,6 @@ @REM type bmake, and wait... @REM do not edit - automatically generated from ProjectDefinition @REM ------- -make.exe -N -f bc.mak %1 %2 +make.exe -N -f bc.mak %* diff -r cd93fefe9b2c -r 847291fc77d7 src/libInit.cc --- a/src/libInit.cc Sun Nov 13 22:56:44 2011 +0000 +++ b/src/libInit.cc Sun Nov 13 22:57:59 2011 +0000 @@ -36,7 +36,6 @@ _JavaAnnotationValue_Init(pass,__pRT__,snd); _JavaArray_Init(pass,__pRT__,snd); _JavaByteCodeProcessor_Init(pass,__pRT__,snd); -_JavaClassReader_Init(pass,__pRT__,snd); _JavaClassRegistry_Init(pass,__pRT__,snd); _JavaConstantPool_Init(pass,__pRT__,snd); _JavaConstants_Init(pass,__pRT__,snd); @@ -67,6 +66,7 @@ _JavaRelease_Init(pass,__pRT__,snd); _JavaResolver_Init(pass,__pRT__,snd); _JavaSlotIndexCache_Init(pass,__pRT__,snd); +_JavaSocket_Init(pass,__pRT__,snd); _JavaSourceCodeCache_Init(pass,__pRT__,snd); _JavaSourceFileWriter_Init(pass,__pRT__,snd); _JavaStartup_Init(pass,__pRT__,snd); @@ -74,7 +74,6 @@ _JavaTopView_Init(pass,__pRT__,snd); _JavaTypeBox_Init(pass,__pRT__,snd); _JavaUnresolvedConstant_Init(pass,__pRT__,snd); -_JavaVM_Init(pass,__pRT__,snd); _JavaView_Init(pass,__pRT__,snd); _JavaZipSupport_Init(pass,__pRT__,snd); _MessageDescription_Init(pass,__pRT__,snd); @@ -102,6 +101,7 @@ _JavaByteCodeInterpreter_Init(pass,__pRT__,snd); _JavaClassAnnotationContainer_Init(pass,__pRT__,snd); _JavaClassContentRef2_Init(pass,__pRT__,snd); +_JavaClassReader_Init(pass,__pRT__,snd); _JavaClassRef2_Init(pass,__pRT__,snd); _JavaEmbeddedFrameView_Init(pass,__pRT__,snd); _JavaFieldAnnotationContainer_Init(pass,__pRT__,snd); @@ -123,6 +123,7 @@ _JavaUnhandledExceptionError_Init(pass,__pRT__,snd); _JavaUnresolvedClassConstant_Init(pass,__pRT__,snd); _JavaUnresolvedStringConstant_Init(pass,__pRT__,snd); +_JavaVM_Init(pass,__pRT__,snd); _JavadocDeclarationNode_Init(pass,__pRT__,snd); _SetBox_Init(pass,__pRT__,snd); _SmalltalkSelectorParser_Init(pass,__pRT__,snd); diff -r cd93fefe9b2c -r 847291fc77d7 src/libjava.rc --- a/src/libjava.rc Sun Nov 13 22:56:44 2011 +0000 +++ b/src/libjava.rc Sun Nov 13 22:57:59 2011 +0000 @@ -3,13 +3,15 @@ // automagically generated from the projectDefinition: stx_libjava. // VS_VERSION_INFO VERSIONINFO - FILEVERSION 6,2,1391,1391 + FILEVERSION 6,2,1453,1453 PRODUCTVERSION 6,2,1,1 +#if (__BORLANDC__) FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL FILESUBTYPE VS_USER_DEFINED +#endif BEGIN BLOCK "StringFileInfo" @@ -18,12 +20,12 @@ BEGIN VALUE "CompanyName", "eXept Software AG\0" VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0" - VALUE "FileVersion", "6.2.1391.1391\0" + VALUE "FileVersion", "6.2.1453.1453\0" VALUE "InternalName", "stx:libjava\0" VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b SWING Research Group, Czech Technical University In Prague\0" VALUE "ProductName", "Smalltalk/X\0" VALUE "ProductVersion", "6.2.1.1\0" - VALUE "ProductDate", "Tue, 25 Oct 2011 07:54:03 GMT\0" + VALUE "ProductDate", "Sun, 13 Nov 2011 23:00:42 GMT\0" END END diff -r cd93fefe9b2c -r 847291fc77d7 src/vcmake.bat --- a/src/vcmake.bat Sun Nov 13 22:56:44 2011 +0000 +++ b/src/vcmake.bat Sun Nov 13 22:57:59 2011 +0000 @@ -3,6 +3,10 @@ @REM type vcmake, and wait... @REM do not edit - automatically generated from ProjectDefinition @REM ------- -make.exe -N -f bc.mak -DUSEVC %1 %2 + +@if not defined VSINSTALLDIR ( + call "C:\Program Files\Microsoft Visual Studio 10.0"\VC\bin\vcvars32.bat +) +make.exe -N -f bc.mak -DUSEVC %*