Mercurial Mercurial > hg > stx-libbasic / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 29 Sep 2011 12:59:43 +0100
branchjv
changeset 17866 abe5bdd75639
parent 17865 598963c6ff8e
child 17867 2cc3cacfd4ca
(none)
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
ProjectDefinition.st file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
libbasic.rc file | annotate | diff | comparison | revisions 
--- a/Make.proto	Wed Sep 28 20:07:49 2011 +0100
+++ b/Make.proto	Thu Sep 29 12:59:43 2011 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic at 2011-09-28 17:40:00.803.
+# automagically generated from the projectDefinition: stx_libbasic at 2011-09-29 13:00:28.909.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/Make.spec	Wed Sep 28 20:07:49 2011 +0100
+++ b/Make.spec	Thu Sep 29 12:59:43 2011 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic at 2011-09-28 17:39:56.556.
+# automagically generated from the projectDefinition: stx_libbasic at 2011-09-29 13:00:22.575.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -347,6 +347,17 @@
 	FileDoesNotExistException \
 	MiniLogger \
 
+WIN32_CLASSES= \
+	Win32Process \
+	PCFilename \
+	CharacterEncoderImplementations::MS_Baltic \
+	CharacterEncoderImplementations::MS_Cyrillic \
+	CharacterEncoderImplementations::MS_Greek \
+	Win32Handle \
+	Win32FILEHandle \
+	Win32Constants \
+	Win32OperatingSystem \
+
 
 
 
@@ -648,5 +659,16 @@
     $(OUTDIR)FileDoesNotExistException.$(O) \
     $(OUTDIR)MiniLogger.$(O) \
 
+WIN32_OBJS= \
+    $(OUTDIR)Win32Process.$(O) \
+    $(OUTDIR)PCFilename.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Baltic.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Cyrillic.$(O) \
+    $(OUTDIR)CharacterEncoderImplementations__MS_Greek.$(O) \
+    $(OUTDIR)Win32Handle.$(O) \
+    $(OUTDIR)Win32FILEHandle.$(O) \
+    $(OUTDIR)Win32Constants.$(O) \
+    $(OUTDIR)Win32OperatingSystem.$(O) \
 
 
+
--- a/ProjectDefinition.st	Wed Sep 28 20:07:49 2011 +0100
+++ b/ProjectDefinition.st	Thu Sep 29 12:59:43 2011 +0100
@@ -1321,76 +1321,76 @@
     newSpec := OrderedCollection new.
 
     ignoreOldEntries ifFalse:[
-	oldSpec do:[:oldEntry |
-	    |newEntry className cls |
-
-	    newEntry := oldEntry copy.
-	    className := newEntry first.
-
-	    (ignored includes:className) ifFalse:[
-		cls := Smalltalk classNamed:className.
-		ignoreOldDefinition ifTrue:[
-		    (cls notNil and:[cls isLoaded not]) ifTrue:[
-			(newEntry includes:#autoload) ifFalse:[
-			    newEntry := newEntry copyWith:#autoload.
-			].
-		    ].
-		].
-		cls notNil ifTrue:[
-		    "JV @ 2010-06-19
-		     Force merge default class attributes with existing ones"
-		    newEntry := self mergeDefaultClassAttributesFor: cls with: newEntry.
-		    newSpec add:newEntry.
-		]
-	    ].
-	].
+        oldSpec do:[:oldEntry |
+            |newEntry className cls |
+
+            newEntry := oldEntry copy.
+            className := newEntry first.
+
+            (ignored includes:className) ifFalse:[
+                cls := Smalltalk classNamed:className.
+                ignoreOldDefinition ifTrue:[
+                    (cls notNil and:[cls isLoaded not]) ifTrue:[
+                        (newEntry includes:#autoload) ifFalse:[
+                            newEntry := newEntry copyWith:#autoload.
+                        ].
+                    ].
+                ].
+                cls notNil ifTrue:[
+                    "JV @ 2010-06-19
+                     Force merge default class attributes with existing ones"
+                    newEntry := self mergeDefaultClassAttributesFor: cls with: newEntry.
+                ].
+                newSpec add:newEntry.
+            ].
+        ].
     ].
 
     self searchForClasses do:[:eachClass |
-	|className attributes oldSpecEntry oldAttributes newEntry|
-
-	className := eachClass name.
-	(ignored includes:className) ifFalse:[
-	    oldSpecEntry := oldSpec detect:[:entry | entry first = className] ifNone:nil.
-
-	    (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
-		(eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
-		    (self additionalClassNamesAndAttributes includes:className) ifFalse:[
-			(oldSpecEntry size > 1) ifTrue:[
-			    oldAttributes := oldSpecEntry copyFrom:2.
-			].
-
-			ignoreOldDefinition ifTrue:[
-			    "take autoload attribute from classes state in the image"
-			    oldAttributes notNil ifTrue:[
-				attributes := oldAttributes copyWithout:#autoload.
-			    ] ifFalse:[
-				attributes := #()
-			    ].
-			    eachClass isLoaded ifFalse:[
-				attributes := attributes copyWith:#autoload.
-			    ].
-			] ifFalse:[
-			    "keep any existing attribute"
-			    oldAttributes notNil ifTrue:[
-				attributes := oldAttributes.
-			    ] ifFalse:[
-				attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
-			    ].
-			].
-			"JV @ 2010-06-19
-			 Support fo additional class attributes and programming language attribute"
-			attributes := self mergeDefaultClassAttributesFor: eachClass with: attributes.
-
-			newEntry := Array with:className.
-			attributes notEmptyOrNil ifTrue:[
-			    newEntry := newEntry , attributes.
-			].
-			newSpec add:newEntry
-		    ]
-		]
-	    ]
-	]
+        |className attributes oldSpecEntry oldAttributes newEntry|
+
+        className := eachClass name.
+        (ignored includes:className) ifFalse:[
+            oldSpecEntry := oldSpec detect:[:entry | entry first = className] ifNone:nil.
+
+            (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
+                (eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
+                    (self additionalClassNamesAndAttributes includes:className) ifFalse:[
+                        (oldSpecEntry size > 1) ifTrue:[
+                            oldAttributes := oldSpecEntry copyFrom:2.
+                        ].
+
+                        ignoreOldDefinition ifTrue:[
+                            "take autoload attribute from classes state in the image"
+                            oldAttributes notNil ifTrue:[
+                                attributes := oldAttributes copyWithout:#autoload.
+                            ] ifFalse:[
+                                attributes := #()
+                            ].
+                            eachClass isLoaded ifFalse:[
+                                attributes := attributes copyWith:#autoload.
+                            ].
+                        ] ifFalse:[
+                            "keep any existing attribute"
+                            oldAttributes notNil ifTrue:[
+                                attributes := oldAttributes.
+                            ] ifFalse:[
+                                attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
+                            ].
+                        ].
+                        "JV @ 2010-06-19
+                         Support fo additional class attributes and programming language attribute"
+                        attributes := self mergeDefaultClassAttributesFor: eachClass with: attributes.
+
+                        newEntry := Array with:className.
+                        attributes notEmptyOrNil ifTrue:[
+                            newEntry := newEntry , attributes.
+                        ].
+                        newSpec add:newEntry
+                    ]
+                ]
+            ]
+        ]
     ].
     ^ self classNamesAndAttributes_codeFor:newSpec
 
@@ -1401,8 +1401,8 @@
 
     "Modified: / 08-08-2006 / 19:24:34 / fm"
     "Created: / 10-10-2006 / 22:00:50 / cg"
-    "Modified: / 19-06-2010 / 10:56:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 06-09-2011 / 07:48:52 / cg"
+    "Modified: / 29-09-2011 / 12:58:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 companyName_code
@@ -6481,7 +6481,8 @@
     
     "Modified: / 27-09-2011 / 18:20:36 / cg"
 
-! 
+!
+
 validateDescription_extensions
 
     "
@@ -6545,7 +6546,6 @@
     "Created: / 11-08-2011 / 18:51:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !ProjectDefinition class methodsFor:'testing'!
 
 isApplicationDefinition
@@ -6615,18 +6615,15 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Id: ProjectDefinition.st 10694 2011-09-28 12:46:37Z vranyj1 $'
+    ^ '$Id: ProjectDefinition.st 10697 2011-09-29 11:59:43Z vranyj1 $'
 !
 
 version_CVS
-    ^ 'Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.363 2011/09/27 17:36:32 cg Exp '
+    ^ '§Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.363 2011/09/27 17:36:32 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: ProjectDefinition.st 10694 2011-09-28 12:46:37Z vranyj1 $'
+    ^ '$Id: ProjectDefinition.st 10697 2011-09-29 11:59:43Z vranyj1 $'
 ! !
 
 ProjectDefinition initialize!
-
-
-
--- a/abbrev.stc	Wed Sep 28 20:07:49 2011 +0100
+++ b/abbrev.stc	Thu Sep 29 12:59:43 2011 +0100
@@ -130,6 +130,7 @@
 UserMessage UserMessage stx:libbasic 'Interface-Internationalization' 0
 Visitor Visitor stx:libbasic 'System-Visiting' 0
 WeakValueIdentityDictionary WeakValueIdentityDictionary stx:libbasic 'Collections-Weak' 0
+Win32Process Win32Process stx:libbasic  'unknownCategory'  0
 WindowsDesktop WindowsDesktop stx:libbasic 'System-Desktop' 0
 XDGDesktop XDGDesktop stx:libbasic 'System-Desktop' 0
 AbstractTime AbstractTime stx:libbasic 'Magnitude-Time' 0
@@ -162,6 +163,7 @@
 NoHandlerError NoHandlerError stx:libbasic 'Kernel-Exceptions-Errors' 1
 Notification Notification stx:libbasic 'Kernel-Exceptions' 1
 OSHandle OSHandle stx:libbasic 'Compatibility-ST80' 0
+PCFilename PCFilename stx:libbasic  'unknownCategory'  0
 PeekableStream PeekableStream stx:libbasic 'Streams' 0
 Process Process stx:libbasic 'Kernel-Processes' 0
 QuerySignal QuerySignal stx:libbasic 'Kernel-Exceptions' 0
@@ -186,6 +188,9 @@
 CharacterEncoderImplementations::ISO8859_7 CharacterEncoderImplementations__ISO8859_7 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208_to_SJIS CharacterEncoderImplementations__JIS0208_to_SJIS stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::MS_Ansi CharacterEncoderImplementations__MS_Ansi stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::MS_Baltic CharacterEncoderImplementations__MS_Baltic stx:libbasic  'unknownCategory'  0
+CharacterEncoderImplementations::MS_Cyrillic CharacterEncoderImplementations__MS_Cyrillic stx:libbasic  'unknownCategory'  0
+CharacterEncoderImplementations::MS_Greek CharacterEncoderImplementations__MS_Greek stx:libbasic  'unknownCategory'  0
 ClassDescription ClassDescription stx:libbasic 'Kernel-Classes' 0
 ControlRequest ControlRequest stx:libbasic 'Kernel-Exceptions-Control' 1
 Dictionary Dictionary stx:libbasic 'Collections-Unordered' 0
@@ -259,9 +264,11 @@
 VMInternalError VMInternalError stx:libbasic 'Kernel-Exceptions-Errors' 1
 VarArgBlock VarArgBlock stx:libbasic 'Kernel-Methods' 0
 Warning Warning stx:libbasic 'Kernel-Exceptions' 1
+Win32Handle Win32Handle stx:libbasic  'unknownCategory'  0
 WeakArray WeakArray stx:libbasic 'Collections-Weak' 0
 WeakIdentitySet WeakIdentitySet stx:libbasic 'Collections-Weak' 0
 WeakValueDictionary WeakValueDictionary stx:libbasic 'Collections-Weak' 0
+Win32FILEHandle Win32FILEHandle stx:libbasic  'unknownCategory'  0
 WriteStream WriteStream stx:libbasic 'Streams' 0
 AbortOperationRequest AbortOperationRequest stx:libbasic 'Kernel-Exceptions-Control' 1
 AllocationFailure AllocationFailure stx:libbasic 'System-Support' 1
@@ -339,6 +346,8 @@
 UnorderedNumbersError UnorderedNumbersError stx:libbasic 'Kernel-Exceptions-Errors' 1
 UnprotectedExternalBytes UnprotectedExternalBytes stx:libbasic 'System-Support' 0
 WeakDependencyDictionary WeakDependencyDictionary stx:libbasic 'Collections-Weak' 0
+Win32Constants Win32Constants stx:libbasic  'unknownCategory'  0
+Win32OperatingSystem Win32OperatingSystem stx:libbasic  'unknownCategory'  0
 WriteError WriteError stx:libbasic 'Kernel-Exceptions-Errors' 1
 WrongProceedabilityError WrongProceedabilityError stx:libbasic 'Kernel-Exceptions-Errors' 1
 BadLiteralsError BadLiteralsError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
--- a/bc.mak	Wed Sep 28 20:07:49 2011 +0100
+++ b/bc.mak	Thu Sep 29 12:59:43 2011 +0100
@@ -1,7 +1,7 @@
 # $Header$
 #
 # DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libbasic at 2011-09-28 17:40:03.119.
+# automagically generated from the projectDefinition: stx_libbasic at 2011-09-29 13:00:29.747.
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -350,5 +350,14 @@
 $(OUTDIR)PipeStream.$(O) PipeStream.$(H): PipeStream.st $(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)Symbol.$(O) Symbol.$(H): Symbol.st $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(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)Unicode16String.$(O) Unicode16String.$(H): Unicode16String.st $(INCLUDE_TOP)\stx\libbasic\TwoByteString.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(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)Win32Process.$(O) Win32Process.$(H): Win32Process.st $(STCHDR)
+$(OUTDIR)PCFilename.$(O) PCFilename.$(H): PCFilename.st $(STCHDR)
+$(OUTDIR)CharacterEncoderImplementations__MS_Baltic.$(O) CharacterEncoderImplementations__MS_Baltic.$(H): CharacterEncoderImplementations__MS_Baltic.st $(STCHDR)
+$(OUTDIR)CharacterEncoderImplementations__MS_Cyrillic.$(O) CharacterEncoderImplementations__MS_Cyrillic.$(H): CharacterEncoderImplementations__MS_Cyrillic.st $(STCHDR)
+$(OUTDIR)CharacterEncoderImplementations__MS_Greek.$(O) CharacterEncoderImplementations__MS_Greek.$(H): CharacterEncoderImplementations__MS_Greek.st $(STCHDR)
+$(OUTDIR)Win32Handle.$(O) Win32Handle.$(H): Win32Handle.st $(STCHDR)
+$(OUTDIR)Win32FILEHandle.$(O) Win32FILEHandle.$(H): Win32FILEHandle.st $(STCHDR)
+$(OUTDIR)Win32Constants.$(O) Win32Constants.$(H): Win32Constants.st $(STCHDR)
+$(OUTDIR)Win32OperatingSystem.$(O) Win32OperatingSystem.$(H): Win32OperatingSystem.st $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
--- a/libInit.cc	Wed Sep 28 20:07:49 2011 +0100
+++ b/libInit.cc	Thu Sep 29 12:59:43 2011 +0100
@@ -323,6 +323,17 @@
 _UnixFileHandle_Init(pass,__pRT__,snd);
 _UnixOperatingSystem_Init(pass,__pRT__,snd);
 #endif /* UNIX */
+#ifdef WIN32
+_Win32Process_Init(pass,__pRT__,snd);
+_PCFilename_Init(pass,__pRT__,snd);
+_CharacterEncoderImplementations__MS_137Baltic_Init(pass,__pRT__,snd);
+_CharacterEncoderImplementations__MS_137Cyrillic_Init(pass,__pRT__,snd);
+_CharacterEncoderImplementations__MS_137Greek_Init(pass,__pRT__,snd);
+_Win32Handle_Init(pass,__pRT__,snd);
+_Win32FILEHandle_Init(pass,__pRT__,snd);
+_Win32Constants_Init(pass,__pRT__,snd);
+_Win32OperatingSystem_Init(pass,__pRT__,snd);
+#endif /* WIN32 */
 
 
 __END_PACKAGE__();
--- a/libbasic.rc	Wed Sep 28 20:07:49 2011 +0100
+++ b/libbasic.rc	Thu Sep 29 12:59:43 2011 +0100
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     6,2,0,1
+  FILEVERSION     6,2,10695,10695
   PRODUCTVERSION  6,2,1,1
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
   FILEFLAGS       VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -18,12 +18,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Basic Classes (LIB)\0"
-      VALUE "FileVersion", "6.2.0.1\0"
+      VALUE "FileVersion", "6.2.10695.10695\0"
       VALUE "InternalName", "stx:libbasic\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Wed, 28 Sep 2011 16:42:31 GMT\0"
+      VALUE "ProductDate", "Thu, 29 Sep 2011 12:01:06 GMT\0"
     END
 
   END
hg/stx-libbasic