--- a/ProjectDefinition.st Mon Oct 09 14:54:19 2006 +0200
+++ b/ProjectDefinition.st Mon Oct 09 14:54:40 2006 +0200
@@ -804,7 +804,7 @@
|preRequisites|
preRequisites := self preRequisites asSet.
- preRequisites addAll: self searchForPreRequisites keys.
+ preRequisites addAll: (self searchForPreRequisites keys).
self isApplicationDefinition ifTrue:[
preRequisites add:#'stx:libcomp'.
@@ -840,7 +840,7 @@
"Modified: / 08-08-2006 / 19:24:34 / fm"
"Created: / 17-08-2006 / 21:28:09 / cg"
- "Modified: / 04-10-2006 / 16:09:17 / cg"
+ "Modified: / 09-10-2006 / 14:27:20 / cg"
!
productName_code
@@ -2417,7 +2417,7 @@
cls := mthdCls theNonMetaclass.
(already includes:cls) ifFalse:[
cls
- allSuperclassesDo:[:scls |
+ withAllSuperclassesDo:[:scls |
(already includes:scls) ifFalse:[
putSingleClassDependencyEntry value:scls.
already add:scls.
@@ -2464,7 +2464,7 @@
"Modified: / 16-08-2006 / 18:52:10 / User"
"Created: / 14-09-2006 / 12:38:57 / cg"
- "Modified: / 14-09-2006 / 17:04:21 / cg"
+ "Modified: / 09-10-2006 / 14:23:16 / cg"
!
generateDependencies_unix
@@ -2948,15 +2948,13 @@
ifTrue:[ self searchForSiblingProjects ]
ifFalse:[ self searchForSubProjects ].
- usedClassReasons
- keysAndValuesDo:[:usedClass :reasonsPerClass |
- (allSubProjects includes: usedClass package asString)
- ifFalse:[
- usedClass package == Project noProjectID
- ifFalse:[(requiredPackageReasons at:usedClass package ifAbsentPut:[Set new])
- addAll:reasonsPerClass.]
- ].
+ usedClassReasons keysAndValuesDo:[:usedClass :reasonsPerClass |
+ (allSubProjects includes: usedClass package asString) ifFalse:[
+ usedClass package == Project noProjectID ifFalse:[
+ (requiredPackageReasons at:usedClass package ifAbsentPut:[Set new])
+ addAll:reasonsPerClass.]
].
+ ].
"/ Transcript showCR:requiredPackageReasons.
^requiredPackageReasons
@@ -2965,11 +2963,12 @@
self searchForPreRequisites
bosch_dapasx_Application searchForPreRequisites
cg_testproject1 searchForPreRequisites
+ stx_libbasic searchForPreRequisites
"
"Created: / 07-08-2006 / 20:42:39 / fm"
"Modified: / 07-08-2006 / 21:56:25 / fm"
- "Modified: / 20-09-2006 / 17:29:59 / cg"
+ "Modified: / 09-10-2006 / 14:29:15 / cg"
!
searchForProjectsWhichProvideHeaderFiles
@@ -3257,7 +3256,7 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.89 2006-10-09 11:36:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.90 2006-10-09 12:54:40 cg Exp $'
! !
ProjectDefinition initialize!