Fix in ProjectDefinition>>#generateLocalIncludes_unix/win32: sort includes... jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 25 Nov 2013 16:44:08 +0000
branchjv
changeset 18109 0fab3955490e
parent 18108 492001d9a29d
child 18110 b0740d62ff1e
Fix in ProjectDefinition>>#generateLocalIncludes_unix/win32: sort includes... ...to reduce false changes in VCS when files are regenerated.
Make.proto
Make.spec
ProjectDefinition.st
abbrev.stc
bc.mak
bmake.bat
libInit.cc
libbasic.rc
--- a/Make.proto	Mon Nov 25 13:59:34 2013 +0000
+++ b/Make.proto	Mon Nov 25 16:44:08 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.266 2013-08-24 12:29:07 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic.
@@ -99,6 +99,16 @@
 stx_libbasic.$(O): $(shell hg root)/.hg/dirstate
 endif
 
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+	$(MAKE) -C $(TOP)/goodies/builder/reports
+	$(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
 # add more install actions here
 install::
 
@@ -356,7 +366,7 @@
 $(OUTDIR)ByteArray.$(O) ByteArray.$(H): ByteArray.st $(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)CharacterArray.$(O) CharacterArray.$(H): CharacterArray.st $(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)CharacterWriteStream.$(O) CharacterWriteStream.$(H): CharacterWriteStream.st $(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)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(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/Association.$(H) $(INCLUDE_TOP)/stx/libbasic/LookupKey.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(STCHDR)
+$(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Association.$(H) $(INCLUDE_TOP)/stx/libbasic/LookupKey.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
 $(OUTDIR)ContextError.$(O) ContextError.$(H): ContextError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(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)ConversionError.$(O) ConversionError.$(H): ConversionError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(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)DeepCopyError.$(O) DeepCopyError.$(H): DeepCopyError.st $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(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)
--- a/Make.spec	Mon Nov 25 13:59:34 2013 +0000
+++ b/Make.spec	Mon Nov 25 16:44:08 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/Make.spec,v 1.143 2013-03-19 13:31:58 stefan Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic.
@@ -49,14 +49,6 @@
 # STCWARNINGS=-warnEOLComments
 STCWARNINGS=-warnNonStandard
 
-WIN32_CLASSES= \
-	PCFilename \
-	Win32Constants \
-	Win32FILEHandle \
-	Win32Handle \
-	Win32OperatingSystem \
-	Win32Process \
-
 COMMON_CLASSES= \
 	Autoload \
 	Object \
@@ -216,6 +208,7 @@
 	Time \
 	TimeoutNotification \
 	Timestamp \
+	UserConfirmation \
 	UserInterrupt \
 	UserNotification \
 	YesToAllConfirmation \
@@ -262,7 +255,6 @@
 	StringCollection \
 	TerminateProcessRequest \
 	UninterpretedBytes \
-	UserConfirmation \
 	UserInformation \
 	UtcTimestamp \
 	VMInternalError \
@@ -339,8 +331,10 @@
 	InvalidCodeError \
 	InvalidModeError \
 	InvalidOperationError \
+	InvalidTypeError \
 	KeyNotFoundError \
 	MallocFailure \
+	MethodNotAppropriateError \
 	NonBooleanReceiverError \
 	OpenError \
 	PositionError \
@@ -358,6 +352,7 @@
 	WeakDependencyDictionary \
 	WriteError \
 	WrongProceedabilityError \
+	AbstractClassInstantiationError \
 	BadLiteralsError \
 	DecodingError \
 	EncodingError \
@@ -382,13 +377,6 @@
 	DirectoryStream \
 	InvalidEncodingError \
 	PipeStream \
-	MethodNotAppropriateError \
-	AbstractClassInstantiationError \
-	InvalidTypeError \
-	PolymorphicInlineCache \
-	CmdLineOption \
-	CmdLineOptionError \
-	CmdLineParser \
 
 UNIX_CLASSES= \
 	UnixFileDescriptorHandle \
@@ -396,21 +384,8 @@
 	UnixOperatingSystem \
 	OSXOperatingSystem \
 
-VMS_CLASSES= \
-	OpenVMSFileHandle \
-	OpenVMSFilename \
-	OpenVMSOperatingSystem \
-
-
 
 
-WIN32_OBJS= \
-    $(OUTDIR_SLASH)PCFilename.$(O) \
-    $(OUTDIR_SLASH)Win32Constants.$(O) \
-    $(OUTDIR_SLASH)Win32FILEHandle.$(O) \
-    $(OUTDIR_SLASH)Win32Handle.$(O) \
-    $(OUTDIR_SLASH)Win32OperatingSystem.$(O) \
-    $(OUTDIR_SLASH)Win32Process.$(O) \
 
 COMMON_OBJS= \
     $(OUTDIR_SLASH)Autoload.$(O) \
@@ -449,6 +424,7 @@
     $(OUTDIR_SLASH)OSProcess.$(O) \
     $(OUTDIR_SLASH)ObjectMemory.$(O) \
     $(OUTDIR_SLASH)PackageId.$(O) \
+    $(OUTDIR_SLASH)PolymorphicInlineCache.$(O) \
     $(OUTDIR_SLASH)ProcessorScheduler.$(O) \
     $(OUTDIR_SLASH)ProgrammingLanguage.$(O) \
     $(OUTDIR_SLASH)Project.$(O) \
@@ -570,6 +546,7 @@
     $(OUTDIR_SLASH)Time.$(O) \
     $(OUTDIR_SLASH)TimeoutNotification.$(O) \
     $(OUTDIR_SLASH)Timestamp.$(O) \
+    $(OUTDIR_SLASH)UserConfirmation.$(O) \
     $(OUTDIR_SLASH)UserInterrupt.$(O) \
     $(OUTDIR_SLASH)UserNotification.$(O) \
     $(OUTDIR_SLASH)YesToAllConfirmation.$(O) \
@@ -616,7 +593,6 @@
     $(OUTDIR_SLASH)StringCollection.$(O) \
     $(OUTDIR_SLASH)TerminateProcessRequest.$(O) \
     $(OUTDIR_SLASH)UninterpretedBytes.$(O) \
-    $(OUTDIR_SLASH)UserConfirmation.$(O) \
     $(OUTDIR_SLASH)UserInformation.$(O) \
     $(OUTDIR_SLASH)UtcTimestamp.$(O) \
     $(OUTDIR_SLASH)VMInternalError.$(O) \
@@ -693,8 +669,10 @@
     $(OUTDIR_SLASH)InvalidCodeError.$(O) \
     $(OUTDIR_SLASH)InvalidModeError.$(O) \
     $(OUTDIR_SLASH)InvalidOperationError.$(O) \
+    $(OUTDIR_SLASH)InvalidTypeError.$(O) \
     $(OUTDIR_SLASH)KeyNotFoundError.$(O) \
     $(OUTDIR_SLASH)MallocFailure.$(O) \
+    $(OUTDIR_SLASH)MethodNotAppropriateError.$(O) \
     $(OUTDIR_SLASH)NonBooleanReceiverError.$(O) \
     $(OUTDIR_SLASH)OpenError.$(O) \
     $(OUTDIR_SLASH)PositionError.$(O) \
@@ -712,6 +690,7 @@
     $(OUTDIR_SLASH)WeakDependencyDictionary.$(O) \
     $(OUTDIR_SLASH)WriteError.$(O) \
     $(OUTDIR_SLASH)WrongProceedabilityError.$(O) \
+    $(OUTDIR_SLASH)AbstractClassInstantiationError.$(O) \
     $(OUTDIR_SLASH)BadLiteralsError.$(O) \
     $(OUTDIR_SLASH)DecodingError.$(O) \
     $(OUTDIR_SLASH)EncodingError.$(O) \
@@ -736,14 +715,6 @@
     $(OUTDIR_SLASH)DirectoryStream.$(O) \
     $(OUTDIR_SLASH)InvalidEncodingError.$(O) \
     $(OUTDIR_SLASH)PipeStream.$(O) \
-    $(OUTDIR_SLASH)MethodNotAppropriateError.$(O) \
-    $(OUTDIR_SLASH)AbstractClassInstantiationError.$(O) \
-    $(OUTDIR_SLASH)InvalidTypeError.$(O) \
-    $(OUTDIR_SLASH)PolymorphicInlineCache.$(O) \
-    $(OUTDIR_SLASH)CmdLineOption.$(O) \
-    $(OUTDIR_SLASH)CmdLineOptionError.$(O) \
-    $(OUTDIR_SLASH)CmdLineParser.$(O) \
-
 
 UNIX_OBJS= \
     $(OUTDIR_SLASH)UnixFileDescriptorHandle.$(O) \
@@ -751,10 +722,5 @@
     $(OUTDIR_SLASH)UnixOperatingSystem.$(O) \
     $(OUTDIR_SLASH)OSXOperatingSystem.$(O) \
 
-VMS_OBJS= \
-    $(OUTDIR_SLASH)OpenVMSFileHandle.$(O) \
-    $(OUTDIR_SLASH)OpenVMSFilename.$(O) \
-    $(OUTDIR_SLASH)OpenVMSOperatingSystem.$(O) \
 
 
-
--- a/ProjectDefinition.st	Mon Nov 25 13:59:34 2013 +0000
+++ b/ProjectDefinition.st	Mon Nov 25 16:44:08 2013 +0000
@@ -2589,6 +2589,7 @@
 ! !
 
 
+
 !ProjectDefinition class methodsFor:'description - project information'!
 
 applicationAdditionalIconFileNames
@@ -4218,7 +4219,7 @@
 generateLocalIncludes_unix
     ^ String streamContents:[:s |
         s nextPutAll:(self localIncludes_unix).
-        self searchForProjectsWhichProvideHeaderFiles
+        self searchForProjectsWhichProvideHeaderFiles asSortedCollection
             do:[:includeProject |
                 s nextPutAll:' -I$(INCLUDE_TOP)/',(self topRelativePathToPackage_unix: includeProject)
             ]
@@ -4236,12 +4237,13 @@
 
     "Created: / 09-08-2006 / 16:46:49 / fm"
     "Modified: / 07-12-2006 / 17:47:06 / cg"
+    "Modified: / 25-11-2013 / 16:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 generateLocalIncludes_win32
     ^ String streamContents:[:s |
         s nextPutAll:(self localIncludes_win32).
-        self searchForProjectsWhichProvideHeaderFiles
+        self searchForProjectsWhichProvideHeaderFiles asSortedCollection
             do:[:includeProject |
                 s nextPutAll:' -I$(INCLUDE_TOP)\',(self topRelativePathToPackage_win32: includeProject)
             ]
@@ -4257,6 +4259,7 @@
 
     "Created: / 09-08-2006 / 16:46:49 / fm"
     "Modified: / 07-12-2006 / 17:47:10 / cg"
+    "Modified: / 25-11-2013 / 16:40:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 generateObjects_make_dot_spec
--- a/abbrev.stc	Mon Nov 25 13:59:34 2013 +0000
+++ b/abbrev.stc	Mon Nov 25 16:44:08 2013 +0000
@@ -18,6 +18,7 @@
 CharacterEncoderImplementations::HANGUL CharacterEncoderImplementations__HANGUL stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO10646_to_JavaText CharacterEncoderImplementations__ISO10646_to_JavaText stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::ISO10646_to_SGML CharacterEncoderImplementations__ISO10646_to_SGML stx:libbasic 'Collections-Text-Encodings' 0
+CharacterEncoderImplementations::ISO10646_to_XMLUTF8 CharacterEncoderImplementations__ISO10646_to_XMLUTF8 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0201 CharacterEncoderImplementations__JIS0201 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208 CharacterEncoderImplementations__JIS0208 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::JIS0208_to_EUC CharacterEncoderImplementations__JIS0208_to_EUC stx:libbasic 'Collections-Text-Encodings' 0
@@ -47,7 +48,6 @@
 ClassBuilder ClassBuilder stx:libbasic 'Kernel-Support' 0
 ClassCategoryReader ClassCategoryReader stx:libbasic 'Kernel-Support' 0
 CmdLineOption CmdLineOption stx:libbasic 'System-Support-Command line' 0
-CmdLineOptionError CmdLineOptionError stx:libbasic 'System-Support-Command line' 1
 CmdLineParser CmdLineParser stx:libbasic 'System-Support-Command line' 0
 CmdLineParserTest CmdLineParserTest stx:libbasic 'System-Support-Command line' 1
 Collection Collection stx:libbasic 'Collections-Abstract' 0
@@ -78,16 +78,11 @@
 NaiveRomanNumberFormatNotification NaiveRomanNumberFormatNotification stx:libbasic 'Magnitude-Numbers' 1
 NameSpace NameSpace stx:libbasic 'Kernel-Classes' 0
 NotANumber NotANumber stx:libbasic 'Magnitude-Numbers' 0
-NumberConversionError NumberConversionError stx:libbasic 'Magnitude-Numbers' 1
-NumberFormatError NumberFormatError stx:libbasic 'Magnitude-Numbers' 1
 OSErrorHolder OSErrorHolder stx:libbasic 'OS-Support' 0
 OSProcess OSProcess stx:libbasic 'System-Support' 0
 ObjectMemory ObjectMemory stx:libbasic 'System-Support' 0
-OpenVMSFileHandle OpenVMSFileHandle stx:libbasic  'unknownCategory'  0
-OpenVMSFilename OpenVMSFilename stx:libbasic  'unknownCategory'  0
-OpenVMSOperatingSystem OpenVMSOperatingSystem stx:libbasic  'unknownCategory'  0
-PCFilename PCFilename stx:libbasic  'unknownCategory'  0
 PackageId PackageId stx:libbasic 'System-Support-Projects' 0
+PolymorphicInlineCache PolymorphicInlineCache stx:libbasic 'Kernel-Classes' 0
 ProcessorScheduler ProcessorScheduler stx:libbasic 'Kernel-Processes' 0
 ProgrammingLanguage ProgrammingLanguage stx:libbasic 'Kernel-Languages' 1
 Project Project stx:libbasic 'System-Support' 0
@@ -96,7 +91,6 @@
 ReadEvalPrintLoop ReadEvalPrintLoop stx:libbasic 'System-Support' 0
 RecursionLock RecursionLock stx:libbasic 'Kernel-Processes' 0
 Registry Registry stx:libbasic 'System-Support' 0
-RomanNumberFormatError RomanNumberFormatError stx:libbasic 'Magnitude-Numbers' 1
 Semaphore Semaphore stx:libbasic 'Kernel-Processes' 0
 SharedPool SharedPool stx:libbasic 'Kernel-Classes' 0
 Signal Signal stx:libbasic 'Kernel-Exceptions' 0
@@ -109,17 +103,10 @@
 TextCollectorStream TextCollectorStream stx:libbasic 'Streams-Misc' 0
 UnboundedExternalStream UnboundedExternalStream stx:libbasic 'Streams-External' 0
 UndefinedObject UndefinedObject stx:libbasic 'Kernel-Objects' 0
-UnixDesktop UnixDesktop stx:libbasic 'System-Desktop' 0
 UserMessage UserMessage stx:libbasic 'Interface-Internationalization' 0
 Visitor Visitor stx:libbasic 'System-Visiting' 0
 WeakValueIdentityDictionary WeakValueIdentityDictionary stx:libbasic 'Collections-Weak' 0
-Win32Constants Win32Constants stx:libbasic  'unknownCategory'  0
-Win32FILEHandle Win32FILEHandle stx:libbasic  'unknownCategory'  0
-Win32Handle Win32Handle stx:libbasic  'unknownCategory'  0
-Win32OperatingSystem Win32OperatingSystem stx:libbasic  'unknownCategory'  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
 ApplicationDefinition ApplicationDefinition stx:libbasic 'System-Support-Projects' 3
 ArithmeticValue ArithmeticValue stx:libbasic 'Magnitude-Numbers' 0
@@ -159,11 +146,13 @@
 SmalltalkChunkFileSourceReader SmalltalkChunkFileSourceReader stx:libbasic 'Kernel-Classes-Support' 0
 SmalltalkLanguage SmalltalkLanguage stx:libbasic 'Kernel-Languages' 1
 True True stx:libbasic 'Kernel-Objects' 0
+UnixDesktop UnixDesktop stx:libbasic 'System-Desktop' 0
 UnixFilename UnixFilename stx:libbasic 'OS-Unix' 0
 WeakInterestConverter WeakInterestConverter stx:libbasic 'Interface-Support-Models' 0
 ArrayedCollection ArrayedCollection stx:libbasic 'Collections-Abstract' 0
 Association Association stx:libbasic 'Collections-Support' 0
 Block Block stx:libbasic 'Kernel-Methods' 0
+CascadingNotification CascadingNotification stx:libbasic 'Kernel-Exceptions' 1
 CharacterEncoderImplementations::ASCII CharacterEncoderImplementations__ASCII stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::CP437 CharacterEncoderImplementations__CP437 stx:libbasic 'Collections-Text-Encodings' 0
 CharacterEncoderImplementations::EBCDIC CharacterEncoderImplementations__EBCDIC stx:libbasic 'Collections-Text-Encodings' 0
@@ -197,7 +186,7 @@
 Complex Complex stx:libbasic 'Magnitude-Numbers' 0
 ControlRequest ControlRequest stx:libbasic 'Kernel-Exceptions-Control' 1
 Dictionary Dictionary stx:libbasic 'Collections-Unordered' 0
-EncodedStream EncodedStream stx:libbasic 'Streams-Misc' 0
+EncodedStream EncodedStream stx:libbasic 'Collections-Text-Encodings' 0
 EndOfStreamNotification EndOfStreamNotification stx:libbasic 'Kernel-Exceptions-Errors' 1
 Error Error stx:libbasic 'Kernel-Exceptions-Errors' 1
 ExternalFunctionCallback ExternalFunctionCallback stx:libbasic 'System-Support' 0
@@ -212,8 +201,10 @@
 OSFileHandle OSFileHandle stx:libbasic 'System-Support' 0
 ObjectCoder ObjectCoder stx:libbasic 'System-Storage' 0
 OrderedCollection OrderedCollection stx:libbasic 'Collections-Sequenceable' 0
+OrderedSet OrderedSet stx:libbasic 'Collections-Sequenceable' 0
 Point Point stx:libbasic 'Graphics-Geometry' 0
 PositionableStream PositionableStream stx:libbasic 'Streams' 0
+ProceedingNotification ProceedingNotification stx:libbasic 'Kernel-Exceptions' 1
 Query Query stx:libbasic 'Kernel-Exceptions' 1
 ReadOnlySequenceableCollection ReadOnlySequenceableCollection stx:libbasic 'Collections-Abstract' 0
 RecursiveStoreError RecursiveStoreError stx:libbasic 'Kernel-Exceptions-Errors' 1
@@ -221,8 +212,10 @@
 Time Time stx:libbasic 'Magnitude-Time' 0
 TimeoutNotification TimeoutNotification stx:libbasic 'Kernel-Exceptions-Notifications' 1
 Timestamp Timestamp stx:libbasic 'Magnitude-Time' 0
+UserConfirmation UserConfirmation stx:libbasic 'Kernel-Exceptions-Notifications' 1
 UserInterrupt UserInterrupt stx:libbasic 'Kernel-Exceptions-Control' 1
 UserNotification UserNotification stx:libbasic 'Kernel-Exceptions-Notifications' 1
+XDGDesktop XDGDesktop stx:libbasic 'System-Desktop' 0
 YesToAllConfirmation YesToAllConfirmation stx:libbasic 'Kernel-Exceptions-Notifications' 1
 stx_libbasic stx_libbasic stx:libbasic '* Projects & Packages *' 3
 AbortAllOperationRequest AbortAllOperationRequest stx:libbasic 'Kernel-Exceptions-Control' 1
@@ -236,6 +229,7 @@
 CharacterEncoderImplementations::KOI8_U CharacterEncoderImplementations__KOI8_U stx:libbasic 'Collections-Text-Encodings' 0
 CheapBlock CheapBlock stx:libbasic 'Kernel-Methods' 0
 ClassBuildError ClassBuildError stx:libbasic 'Kernel-Support' 1
+CmdLineOptionError CmdLineOptionError stx:libbasic 'System-Support-Command line' 1
 ElementBoundsError ElementBoundsError stx:libbasic 'Kernel-Exceptions-Errors' 1
 FileDirectory FileDirectory stx:libbasic 'Compatibility-Squeak' 0
 Fraction Fraction stx:libbasic 'Magnitude-Numbers' 0
@@ -250,6 +244,7 @@
 MetaNumber MetaNumber stx:libbasic 'Magnitude-Numbers' 0
 Metaclass Metaclass stx:libbasic 'Kernel-Classes' 0
 MethodWithBreakpoints MethodWithBreakpoints stx:libbasic 'Kernel-Methods' 0
+OrderedDictionary OrderedDictionary stx:libbasic 'Collections-Sequenceable' 0
 OsError OsError stx:libbasic 'OS-Support' 1
 PluginSupport PluginSupport stx:libbasic 'System-Support' 0
 ProceedableError ProceedableError stx:libbasic 'Kernel-Exceptions-Errors' 1
@@ -269,7 +264,6 @@
 UnixFileDescriptorHandle UnixFileDescriptorHandle stx:libbasic 'OS-Unix' 0
 UnixFileHandle UnixFileHandle stx:libbasic 'OS-Unix' 0
 UnixOperatingSystem UnixOperatingSystem stx:libbasic 'OS-Unix' 0
-UserConfirmation UserConfirmation stx:libbasic 'Kernel-Exceptions-Notifications' 1
 UserInformation UserInformation stx:libbasic 'Kernel-Exceptions-Notifications' 1
 UtcTimestamp UtcTimestamp stx:libbasic 'Magnitude-Time' 0
 VMInternalError VMInternalError stx:libbasic 'Kernel-Exceptions-Errors' 1
@@ -307,6 +301,7 @@
 NoModificationError NoModificationError stx:libbasic 'Kernel-Exceptions-Errors' 1
 NotFoundError NotFoundError stx:libbasic 'Kernel-Exceptions-Errors' 1
 OSSignalInterrupt OSSignalInterrupt stx:libbasic 'Kernel-Exceptions-Control' 1
+OSXOperatingSystem OSXOperatingSystem stx:libbasic 'OS-Unix' 0
 OsIllegalOperation OsIllegalOperation stx:libbasic 'OS-Support' 1
 OsInaccessibleError OsInaccessibleError stx:libbasic 'OS-Support' 1
 OsInvalidArgumentsError OsInvalidArgumentsError stx:libbasic 'OS-Support' 1
@@ -346,9 +341,12 @@
 InvalidCodeError InvalidCodeError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
 InvalidModeError InvalidModeError stx:libbasic 'Kernel-Exceptions-Errors' 1
 InvalidOperationError InvalidOperationError stx:libbasic 'Kernel-Exceptions-Errors' 1
+InvalidTypeError InvalidTypeError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
 KeyNotFoundError KeyNotFoundError stx:libbasic 'Kernel-Exceptions-Errors' 1
 MallocFailure MallocFailure stx:libbasic 'System-Support' 1
+MethodNotAppropriateError MethodNotAppropriateError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
 NonBooleanReceiverError NonBooleanReceiverError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
+NumberConversionError NumberConversionError stx:libbasic 'Magnitude-Numbers' 1
 OpenError OpenError stx:libbasic 'Kernel-Exceptions-Errors' 1
 PositionError PositionError stx:libbasic 'Kernel-Exceptions-Errors' 1
 PositionOutOfBoundsError PositionOutOfBoundsError stx:libbasic 'Kernel-Exceptions-Errors' 1
@@ -365,6 +363,7 @@
 WeakDependencyDictionary WeakDependencyDictionary stx:libbasic 'Collections-Weak' 0
 WriteError WriteError stx:libbasic 'Kernel-Exceptions-Errors' 1
 WrongProceedabilityError WrongProceedabilityError stx:libbasic 'Kernel-Exceptions-Errors' 1
+AbstractClassInstantiationError AbstractClassInstantiationError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
 BadLiteralsError BadLiteralsError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
 DecodingError DecodingError stx:libbasic 'Collections-Text-Encodings' 1
 EncodingError EncodingError stx:libbasic 'Collections-Text-Encodings' 1
@@ -378,6 +377,7 @@
 NoByteCodeError NoByteCodeError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
 NonIntegerIndexError NonIntegerIndexError stx:libbasic 'Kernel-Exceptions-Errors' 1
 NonPositionableExternalStream NonPositionableExternalStream stx:libbasic 'Streams-External' 0
+NumberFormatError NumberFormatError stx:libbasic 'Magnitude-Numbers' 1
 OverflowError OverflowError stx:libbasic 'Kernel-Exceptions-Errors' 1
 SubscriptOutOfBoundsError SubscriptOutOfBoundsError stx:libbasic 'Kernel-Exceptions-Errors' 1
 Symbol Symbol stx:libbasic 'Collections-Text' 0
@@ -389,12 +389,4 @@
 DirectoryStream DirectoryStream stx:libbasic 'Streams-External' 0
 InvalidEncodingError InvalidEncodingError stx:libbasic 'Collections-Text-Encodings' 1
 PipeStream PipeStream stx:libbasic 'Streams-External' 0
-MethodNotAppropriateError MethodNotAppropriateError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
-AbstractClassInstantiationError AbstractClassInstantiationError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
-InvalidTypeError InvalidTypeError stx:libbasic 'Kernel-Exceptions-ExecutionErrors' 1
-OSXOperatingSystem OSXOperatingSystem stx:libbasic 'OS-Unix' 0
-MethodOverrideTests MethodOverrideTests stx:libbasic '* as yet unknown category *' 0
-OrderedDictionary OrderedDictionary stx:libbasic 'Collections-Sequenceable' 0
-OrderedSet OrderedSet stx:libbasic 'Collections-Sequenceable' 0
-CascadingNotification CascadingNotification stx:libbasic 'Kernel-Exceptions' 1
-ProceedingNotification ProceedingNotification stx:libbasic 'Kernel-Exceptions' 1
+RomanNumberFormatError RomanNumberFormatError stx:libbasic 'Magnitude-Numbers' 1
--- a/bc.mak	Mon Nov 25 13:59:34 2013 +0000
+++ b/bc.mak	Mon Nov 25 16:44:08 2013 +0000
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/bc.mak,v 1.200 2013-08-24 12:29:12 cg Exp $
+# $Header$
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libbasic.
@@ -59,9 +59,15 @@
 
 
 
+
+test: $(TOP)\goodies\builder\reports\NUL
+	pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+	$(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+        
 clean::
 	del *.$(CSUFFIX)
 
+
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)Autoload.$(O) Autoload.$(H): Autoload.st $(STCHDR)
 $(OUTDIR)Object.$(O) Object.$(H): Object.st $(STCHDR)
@@ -287,7 +293,7 @@
 $(OUTDIR)ByteArray.$(O) ByteArray.$(H): ByteArray.st $(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)CharacterArray.$(O) CharacterArray.$(H): CharacterArray.st $(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)CharacterWriteStream.$(O) CharacterWriteStream.$(H): CharacterWriteStream.st $(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)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(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\Association.$(H) $(INCLUDE_TOP)\stx\libbasic\LookupKey.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(STCHDR)
+$(OUTDIR)Class.$(O) Class.$(H): Class.st $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Association.$(H) $(INCLUDE_TOP)\stx\libbasic\LookupKey.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(STCHDR)
 $(OUTDIR)ContextError.$(O) ContextError.$(H): ContextError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(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)ConversionError.$(O) ConversionError.$(H): ConversionError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(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)DeepCopyError.$(O) DeepCopyError.$(H): DeepCopyError.st $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(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)
@@ -390,12 +396,6 @@
 $(OUTDIR)DirectoryStream.$(O) DirectoryStream.$(H): DirectoryStream.st $(INCLUDE_TOP)\stx\libbasic\FileStream.$(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)InvalidEncodingError.$(O) InvalidEncodingError.$(H): InvalidEncodingError.st $(INCLUDE_TOP)\stx\libbasic\DecodingError.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterEncoderError.$(H) $(INCLUDE_TOP)\stx\libbasic\ConversionError.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(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)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)PCFilename.$(O) PCFilename.$(H): PCFilename.st $(STCHDR)
-$(OUTDIR)Win32Constants.$(O) Win32Constants.$(H): Win32Constants.st $(STCHDR)
-$(OUTDIR)Win32FILEHandle.$(O) Win32FILEHandle.$(H): Win32FILEHandle.st $(STCHDR)
-$(OUTDIR)Win32Handle.$(O) Win32Handle.$(H): Win32Handle.st $(STCHDR)
-$(OUTDIR)Win32OperatingSystem.$(O) Win32OperatingSystem.$(H): Win32OperatingSystem.st $(STCHDR)
-$(OUTDIR)Win32Process.$(O) Win32Process.$(H): Win32Process.st $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
@@ -406,4 +406,4 @@
 # definition class always contains correct binary revision string.
 !IFDEF HGROOT
 $(OUTDIR)stx_libbasic.$(O): $(HGROOT)\.hg\dirstate
-!ENDIF
\ No newline at end of file
+!ENDIF
--- a/bmake.bat	Mon Nov 25 13:59:34 2013 +0000
+++ b/bmake.bat	Mon Nov 25 16:44:08 2013 +0000
@@ -3,6 +3,10 @@
 @REM type bmake, and wait...
 @REM do not edit - automatically generated from ProjectDefinition
 @REM -------
-make.exe -N -f bc.mak %*
+@SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+make.exe -N -f bc.mak  %DEFINES% %*
 
 
--- a/libInit.cc	Mon Nov 25 13:59:34 2013 +0000
+++ b/libInit.cc	Mon Nov 25 16:44:08 2013 +0000
@@ -354,28 +354,12 @@
 _DirectoryStream_Init(pass,__pRT__,snd);
 _InvalidEncodingError_Init(pass,__pRT__,snd);
 _PipeStream_Init(pass,__pRT__,snd);
-_CmdLineOption_Init(pass,__pRT__,snd);
-_CmdLineOptionError_Init(pass,__pRT__,snd);
-_CmdLineParser_Init(pass,__pRT__,snd);
 #ifdef UNIX
 _UnixFileDescriptorHandle_Init(pass,__pRT__,snd);
 _UnixFileHandle_Init(pass,__pRT__,snd);
 _UnixOperatingSystem_Init(pass,__pRT__,snd);
 _OSXOperatingSystem_Init(pass,__pRT__,snd);
 #endif /* UNIX */
-#ifdef WIN32
-_PCFilename_Init(pass,__pRT__,snd);
-_Win32Constants_Init(pass,__pRT__,snd);
-_Win32FILEHandle_Init(pass,__pRT__,snd);
-_Win32Handle_Init(pass,__pRT__,snd);
-_Win32OperatingSystem_Init(pass,__pRT__,snd);
-_Win32Process_Init(pass,__pRT__,snd);
-#endif /* WIN32 */
-#ifdef VMS
-_OpenVMSFileHandle_Init(pass,__pRT__,snd);
-_OpenVMSFilename_Init(pass,__pRT__,snd);
-_OpenVMSOperatingSystem_Init(pass,__pRT__,snd);
-#endif /* VMS */
 
 
 __END_PACKAGE__();
--- a/libbasic.rc	Mon Nov 25 13:59:34 2013 +0000
+++ b/libbasic.rc	Mon Nov 25 16:44:08 2013 +0000
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2013\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Sat, 26 Oct 2013 10:19:13 GMT\0"
+      VALUE "ProductDate", "Mon, 25 Nov 2013 16:42:51 GMT\0"
     END
 
   END