# HG changeset patch # User Claus Gittinger # Date 1321698349 -3600 # Node ID f46f7306eea238e46647b0c971abe01bc95a1981 # Parent 095f081028fcf8025be95298235098c0fcb0a43f changed: #preRequisitesFor: diff -r 095f081028fc -r f46f7306eea2 ProjectDefinition.st --- a/ProjectDefinition.st Sat Nov 19 11:23:29 2011 +0100 +++ b/ProjectDefinition.st Sat Nov 19 11:25:49 2011 +0100 @@ -12,11 +12,11 @@ "{ Package: 'stx:libbasic' }" Object subclass:#ProjectDefinition - instanceVariableNames:'' - classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType - PackagesBeingLoaded Verbose AbbrevDictionary AccessLock' - poolDictionaries:'' - category:'System-Support-Projects' + instanceVariableNames:'' + classVariableNames:'LibraryType GUIApplicationType NonGUIApplicationType + PackagesBeingLoaded Verbose AbbrevDictionary AccessLock' + poolDictionaries:'' + category:'System-Support-Projects' ! ProjectDefinition class instanceVariableNames:'safeForOverwrittenMethods extensionOverwriteInfo projectIsLoaded' @@ -27,10 +27,10 @@ ! Object subclass:#AbbrevEntry - instanceVariableNames:'className fileName category numClassInstVars' - classVariableNames:'' - poolDictionaries:'' - privateIn:ProjectDefinition + instanceVariableNames:'className fileName category numClassInstVars' + classVariableNames:'' + poolDictionaries:'' + privateIn:ProjectDefinition ! !ProjectDefinition class methodsFor:'documentation'! @@ -1884,22 +1884,24 @@ ! preRequisitesFor: packageId - | def | def := self definitionClassForPackage:packageId. - def ifNil: - ["Maybe the package is not loaded? Try to load it..." + def isNil ifTrue:[ + "Maybe the package is not loaded? Try to load it..." (Smalltalk loadPackage: packageId) ifTrue: - [def := self definitionClassForPackage:packageId]]. - ^def - ifNil: + [def := self definitionClassForPackage:packageId] + ]. + ^ def isNil + ifTrue: ["Still no project definition - maybe does not exists?" (ProjectDefinition searchForPreRequisites: packageId) keys] - ifNotNil: + ifFalse: [def effectivePreRequisites] "Created: / 24-02-2011 / 22:47:41 / Jan Vrany " + "Modified: / 18-11-2011 / 14:52:43 / cg" + "Modified (format): / 19-11-2011 / 11:25:36 / cg" ! preRequisitesForBuilding @@ -6580,11 +6582,11 @@ !ProjectDefinition class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.370 2011-10-31 10:18:55 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.371 2011-11-19 10:25:49 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.370 2011-10-31 10:18:55 cg Exp $' + ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.371 2011-11-19 10:25:49 cg Exp $' ! version_SVN