class: Smalltalk
authorClaus Gittinger <cg@exept.de>
Tue, 19 Mar 2013 18:14:35 +0100
changeset 14914 94528daabcab
parent 14913 9db2037b017e
child 14915 a6cc6e21f9cf
class: Smalltalk changed: #loadPackage:fromDirectory:asAutoloaded: when loading a package via the projectDefinition, also load the prereqs
Smalltalk.st
--- a/Smalltalk.st	Tue Mar 19 18:03:13 2013 +0100
+++ b/Smalltalk.st	Tue Mar 19 18:14:35 2013 +0100
@@ -2549,13 +2549,16 @@
                 ].
             ].
             projectDefinitionClass := ProjectDefinition definitionClassForPackage:aPackageString.
-            projectDefinitionClass notNil ifTrue:[
-                projectDefinitionClass loadDirectory:(projectDefinitionFilename asFilename directory)
-            ]
+"/ done below
+"/            projectDefinitionClass notNil ifTrue:[
+"/                projectDefinitionClass loadPreRequisitesAsAutoloaded:doLoadAsAutoloaded.
+"/                projectDefinitionClass loadDirectory:(projectDefinitionFilename asFilename directory)
+"/            ]
         ].
     ].
     projectDefinitionClass notNil ifTrue:[
         projectDefinitionClass autoload.
+        projectDefinitionClass loadPreRequisitesAsAutoloaded:doLoadAsAutoloaded.
         somethingHasBeenLoaded := projectDefinitionClass loadAsAutoloaded:doLoadAsAutoloaded.
         (silent not and:[somethingHasBeenLoaded]) ifTrue:[
             Transcript showCR:('Smalltalk [info]: loaded package: ' , aPackageString , ' from project definition').
@@ -7878,11 +7881,11 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1014 2013-03-19 17:03:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1015 2013-03-19 17:14:35 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1014 2013-03-19 17:03:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1015 2013-03-19 17:14:35 cg Exp $'
 !
 
 version_SVN