--- a/Smalltalk.st Thu Feb 25 22:58:21 2010 +0000
+++ b/Smalltalk.st Mon Mar 08 21:39:02 2010 +0000
@@ -243,6 +243,7 @@
ObjectMemory initialize.
OperatingSystem initialize.
ExternalStream initialize.
+ ProcessorScheduler initialize.
self initStandardStreams. "/ setup Stdin, Stdout etc.
@@ -5635,20 +5636,25 @@
baseName exists ifTrue:[
"/ load local file first...
handle := ObjectFileLoader loadObjectFile:baseName.
- handle notNil ifTrue:[^ true].
- ].
-
- packagePath := self getPackageDirectoryForPackage:packageID.
- packagePath isNil ifTrue:[^ false].
- packagePath := packagePath asFilename.
- libraryFilename := packagePath / baseName.
- libraryFilename exists ifFalse:[
- "in windows (with Borland compiler, DLLs in development environment are under objbc"
- libraryFilename := packagePath / 'objbc' / baseName.
- ].
- libraryFilename exists ifFalse:[^ false].
-
- ^ (ObjectFileLoader loadObjectFile:libraryFilename pathName) notNil
+ ].
+ handle isNil ifTrue:[
+ packagePath := self getPackageDirectoryForPackage:packageID.
+ packagePath isNil ifTrue:[^ false].
+ packagePath := packagePath asFilename.
+ libraryFilename := packagePath / baseName.
+ libraryFilename exists ifFalse:[
+ "in windows (with Borland compiler, DLLs in development environment are under objbc"
+ libraryFilename := packagePath / 'objbc' / baseName.
+ ].
+ libraryFilename exists ifTrue:[
+ handle := ObjectFileLoader loadObjectFile:libraryFilename pathName.
+ ].
+ ].
+
+"/ handle notNil ifTrue:[
+"/ Transcript showCR:(' Smalltalk: loaded %1.' bindWith:libraryFilename pathName).
+"/ ].
+ ^ handle notNil
"
Smalltalk fileInClassLibrary:'libtable'
@@ -7481,16 +7487,17 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Id: Smalltalk.st 10501 2010-02-13 23:34:44Z vranyj1 $'
+ ^ '$Id: Smalltalk.st 10505 2010-03-08 21:39:02Z vranyj1 $'
!
version_CVS
- ^ 'Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.922 2010/02/05 12:59:18 cg Exp §'
+ ^ 'Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.924 2010/02/26 17:19:25 cg Exp §'
!
version_SVN
- ^ '$Id: Smalltalk.st 10501 2010-02-13 23:34:44Z vranyj1 $'
+ ^ '$Id: Smalltalk.st 10505 2010-03-08 21:39:02Z vranyj1 $'
! !
+