--- a/Smalltalk.st Sun Dec 07 11:37:31 2008 +0100
+++ b/Smalltalk.st Sun Dec 07 11:44:09 2008 +0100
@@ -3915,7 +3915,6 @@
"/ along the package-path
(p := self packagePath) do:[:aPath |
(dirsConsulted includes:aPath) ifFalse:[
- self splashInfo:('Smalltalk [info]: installing autoloaded classes found under "' , aPath ,'"...').
self
recursiveInstallAutoloadedClassesFrom:aPath
rememberIn:dirsConsulted
@@ -3927,7 +3926,6 @@
].
p size == 0 ifTrue:[
'../../../stx' asFilename exists ifTrue:[
- self splashInfo:('Smalltalk [info]: installing autoloaded classes found under "../../.."...').
self
recursiveInstallAutoloadedClassesFrom:'../../..'
rememberIn:dirsConsulted
@@ -4169,11 +4167,12 @@
].
dir := aDirectory asFilename.
-
- (dirsConsulted includes:dir pathName) ifTrue:[
+ dirName := dir pathName.
+
+ (dirsConsulted includes:dirName) ifTrue:[
^ self
].
- dirsConsulted add:dir pathName.
+ dirsConsulted add:dirName.
(dir construct:'NOPACKAGES') exists ifTrue:[
^ self.
@@ -4181,6 +4180,7 @@
(dir construct:'NOSUBAUTOLOAD') exists ifTrue:[
^ self.
].
+
noAutoloadHere := noAutoloadIn.
noAutoloadHere ifFalse:[
(dir construct:'NOAUTOLOAD') exists ifTrue:[
@@ -4198,21 +4198,20 @@
KnownPackages isNil ifTrue:[
KnownPackages := Set new.
].
- dirName := dir pathName.
pkgName := dirName copyFrom:(packageTopPath asFilename pathName) size + 1 + 1.
KnownPackages add:pkgName
].
+ showSplashInLevels > 0 ifTrue:[
+ self splashInfo:('Smalltalk [info]: installing autoloaded classes found under "',dirName,'"...').
+ ].
+
"/
"/ suppress installation as autoloaded in this and everything
"/ below; however, still traverse the directories to find packages ...
"/
noAutoloadHere ifFalse:[
[
- showSplashInLevels > 0 ifTrue:[
- self splashInfo:('Smalltalk [info]: installing autoloaded classes found under "',dir pathName,'"...').
- ].
-
abbrevStream := (dir construct:'abbrev.stc') asFilename readStream.
self installAutoloadedClassesFromStream:abbrevStream.
abbrevStream close.
@@ -4263,6 +4262,10 @@
].
].
+ showSplashInLevels > 0 ifTrue:[
+ self splashInfo:('Smalltalk [info]: installing autoloaded classes found under "',dirName,'"...').
+ ].
+
"
Smalltalk installAutoloadedClasses
"
@@ -7204,5 +7207,5 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.864 2008-12-07 10:37:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.865 2008-12-07 10:44:09 cg Exp $'
! !