--- a/Smalltalk.st Tue Nov 27 19:17:11 2001 +0100
+++ b/Smalltalk.st Mon Dec 03 10:25:21 2001 +0100
@@ -5637,7 +5637,7 @@
!
loadPackageWithId:aPackageId name:packageName fromDirectory:packageDirOrString asAutoloaded:doLoadAsAutoloaded
- |f s packageDir first shLibName|
+ |f s packageDir shLibName|
packageDir := packageDirOrString asFilename.
@@ -5645,7 +5645,9 @@
f := (packageDir construct:packageName) withSuffix:'prj'.
f exists ifTrue:[
(self loadPackage:aPackageId fromProjectFile:f asAutoloaded:doLoadAsAutoloaded) ifTrue:[
- Transcript showCR:('Smalltalk [info]: loaded package: ' , aPackageId , ' from project file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('Smalltalk [info]: loaded package: ' , aPackageId , ' from project file: ' , f pathName).
+ ].
^ true
]
].
@@ -5653,7 +5655,9 @@
f := packageDir construct:'loadAll'.
f exists ifTrue:[
(self loadPackage:aPackageId fromLoadAllFile:f) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from loadAll file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from loadAll file: ' , f pathName).
+ ].
^ true
]
].
@@ -5661,7 +5665,9 @@
f := (packageDir construct:packageName) withSuffix:'zip'.
f exists ifTrue:[
(self loadPackage:aPackageId fromZIPArchive:f asAutoloaded:doLoadAsAutoloaded) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from zip file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from zip file: ' , f pathName).
+ ].
^ true
]
].
@@ -5672,7 +5678,9 @@
f := packageDir construct:shLibName.
f exists ifTrue:[
(self loadPackage:aPackageId fromClassLibrary:f) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from binary classLib file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from binary classLib file: ' , f pathName).
+ ].
^ true
]
].
@@ -5694,7 +5702,9 @@
cls autoload
].
s close.
- Transcript showCR:('loaded package: ' , aPackageId , ' from abbrev file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from abbrev file: ' , f pathName).
+ ].
^ true
].
@@ -5702,7 +5712,9 @@
f := (packageDir construct:'lib') construct:'loadAll'.
f exists ifTrue:[
(self loadPackage:aPackageId fromLoadAllFile:f) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from loadAll file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from loadAll file: ' , f pathName).
+ ].
^ true
]
].
@@ -5711,7 +5723,9 @@
f := (packageDir construct:'lib') construct:shLibName.
f exists ifTrue:[
(self loadPackage:aPackageId fromClassLibrary:f) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from binary classLib file: ' , f pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from binary classLib file: ' , f pathName).
+ ].
^ true
]
].
@@ -5720,7 +5734,9 @@
packageDir directoryContentsAsFilenamesDo:[:aFilename |
(aFilename hasSuffix:ObjectFileLoader sharedLibrarySuffix) ifTrue:[
(self loadPackage:aPackageId fromClassLibrary:aFilename) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from binary classLib file: ' , aFilename pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from binary classLib file: ' , aFilename pathName).
+ ].
^ true
]
]
@@ -5728,7 +5744,9 @@
"/ source files
(self loadPackage:aPackageId fromAllSourceFilesInDirectory:packageDir) ifTrue:[
- Transcript showCR:('loaded package: ' , aPackageId , ' from source files in:' , packageDir pathName).
+ SilentLoading ifFalse:[
+ Transcript showCR:('loaded package: ' , aPackageId , ' from source files in:' , packageDir pathName).
+ ].
^ true
].
^ false
@@ -6107,5 +6125,5 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.516 2001-11-21 15:05:59 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.517 2001-12-03 09:25:21 tm Exp $'
! !