--- a/Smalltalk.st Thu May 07 15:26:31 2009 +0200
+++ b/Smalltalk.st Mon May 11 17:27:35 2009 +0200
@@ -980,11 +980,6 @@
"Created: 20.6.1997 / 16:58:28 / cg"
! !
-!Smalltalk class methodsFor:'binary storage'!
-
-!
-
-! !
!Smalltalk class methodsFor:'browsing'!
@@ -1933,15 +1928,6 @@
]
! !
-!Smalltalk class methodsFor:'inspecting'!
-
-inspectorClass
- "{ Pragma: +optSpace }"
-
- "redefined to launch a DictionaryInspector (instead of the default Inspector)."
-
- ^ DictionaryInspectorView
-! !
!Smalltalk class methodsFor:'message control'!
@@ -4994,26 +4980,31 @@
and load it. This installs all of its contained classes.
Return true if ok, false if not.
Notice: the argument may not have an extension (by purpose);
- the sharedLib extension (.dll / .so / .sl) is added here, to
- make the caller independent of the underlying operatingSystem."
-
- |path baseName handle|
+ the sharedLib extension (.dll / .so / .sl) is added here, to
+ make the caller independent of the underlying operatingSystem."
+
+ |path baseName handle libraryFilename packagePath|
ObjectFileLoader isNil ifTrue:[^ false].
baseName := aClassLibraryName asFilename withSuffix:(ObjectFileLoader sharedLibrarySuffix).
baseName exists ifTrue:[
- "/ load local file first...
- handle := (ObjectFileLoader loadObjectFile:baseName).
- handle notNil ifTrue:[^ true].
- ].
-
- path := self getPackageDirectoryForPackage:packageID.
- path isNil ifTrue:[^ false].
- path := path asFilename construct:baseName.
- path exists ifFalse:[^ false].
-
- ^ (ObjectFileLoader loadObjectFile:path pathName) notNil
+ "/ 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 := path / 'objbc' / baseName.
+ ].
+ libraryFilename exists ifFalse:[^ false].
+
+ ^ (ObjectFileLoader loadObjectFile:libraryFilename pathName) notNil
"
Smalltalk fileInClassLibrary:'libtable'
@@ -5469,27 +5460,22 @@
packageSubDirectory := aPackageID asPackageId directory.
checkForPackageDirectory :=
- [:moduleDir |
- |packageDir|
-
- (moduleDir exists and:[moduleDir isDirectory]) ifTrue:[
- packageDir := moduleDir construct:packageSubDirectory.
- (packageDir exists and:[packageDir isDirectory]) ifTrue:[
- ^ packageDir
- ]
- ].
- ].
+ [:moduleDir |
+ |packageDir|
+
+ moduleDir isDirectory ifTrue:[
+ packageDir := moduleDir construct:packageSubDirectory.
+ packageDir isDirectory ifTrue:[
+ ^ packageDir
+ ]
+ ].
+ ].
self packagePath do:[:aPath |
- |moduleDir|
-
- moduleDir := aPath asFilename construct:module.
- checkForPackageDirectory value:moduleDir.
- ].
-
- "/ not found - special case for the stx package...
- module = 'stx' ifTrue:[
- checkForPackageDirectory value:('../../' asFilename).
+ |moduleDir|
+
+ moduleDir := aPath asFilename construct:module.
+ checkForPackageDirectory value:moduleDir.
].
^ nil
@@ -7169,5 +7155,5 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.878 2009-05-06 08:22:09 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.879 2009-05-11 15:27:35 stefan Exp $'
! !