hg/stx-libbasic: comparison ProjectDefinition.st

equal deleted inserted replaced

-:598963c6ff8e
+:abe5bdd75639
 oldSpec := self classNamesAndAttributesAsSpecArray.
 ignored := self ignoredClassNames asSet.
 newSpec := OrderedCollection new.
 ignoreOldEntries ifFalse:[
-	oldSpec do:[:oldEntry |
+oldSpec do:[:oldEntry |
-	    |newEntry className cls |
+|newEntry className cls |
-	    newEntry := oldEntry copy.
+newEntry := oldEntry copy.
-	    className := newEntry first.
+className := newEntry first.
-	    (ignored includes:className) ifFalse:[
+(ignored includes:className) ifFalse:[
-		cls := Smalltalk classNamed:className.
+cls := Smalltalk classNamed:className.
-		ignoreOldDefinition ifTrue:[
+ignoreOldDefinition ifTrue:[
-		    (cls notNil and:[cls isLoaded not]) ifTrue:[
+(cls notNil and:[cls isLoaded not]) ifTrue:[
-			(newEntry includes:#autoload) ifFalse:[
+(newEntry includes:#autoload) ifFalse:[
-			    newEntry := newEntry copyWith:#autoload.
+newEntry := newEntry copyWith:#autoload.
-			].
+].
-		    ].
+].
-		].
+].
-		cls notNil ifTrue:[
+cls notNil ifTrue:[
-		    "JV @ 2010-06-19
+"JV @ 2010-06-19
-		     Force merge default class attributes with existing ones"
+Force merge default class attributes with existing ones"
-		    newEntry := self mergeDefaultClassAttributesFor: cls with: newEntry.
+newEntry := self mergeDefaultClassAttributesFor: cls with: newEntry.
-		    newSpec add:newEntry.
+].
-		]
+newSpec add:newEntry.
-	    ].
+].
-	].
+].
 ].
 self searchForClasses do:[:eachClass |
-	|className attributes oldSpecEntry oldAttributes newEntry|
+|className attributes oldSpecEntry oldAttributes newEntry|
-	className := eachClass name.
+className := eachClass name.
-	(ignored includes:className) ifFalse:[
+(ignored includes:className) ifFalse:[
-	    oldSpecEntry := oldSpec detect:[:entry | entry first = className] ifNone:nil.
+oldSpecEntry := oldSpec detect:[:entry | entry first = className] ifNone:nil.
-	    (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
+(ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
-		(eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
+(eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
-		    (self additionalClassNamesAndAttributes includes:className) ifFalse:[
+(self additionalClassNamesAndAttributes includes:className) ifFalse:[
-			(oldSpecEntry size > 1) ifTrue:[
+(oldSpecEntry size > 1) ifTrue:[
-			    oldAttributes := oldSpecEntry copyFrom:2.
+oldAttributes := oldSpecEntry copyFrom:2.
-			].
+].
-			ignoreOldDefinition ifTrue:[
+ignoreOldDefinition ifTrue:[
-			    "take autoload attribute from classes state in the image"
+"take autoload attribute from classes state in the image"
-			    oldAttributes notNil ifTrue:[
+oldAttributes notNil ifTrue:[
-				attributes := oldAttributes copyWithout:#autoload.
+attributes := oldAttributes copyWithout:#autoload.
-			    ] ifFalse:[
+] ifFalse:[
-				attributes := #()
+attributes := #()
-			    ].
+].
-			    eachClass isLoaded ifFalse:[
+eachClass isLoaded ifFalse:[
-				attributes := attributes copyWith:#autoload.
+attributes := attributes copyWith:#autoload.
-			    ].
+].
-			] ifFalse:[
+] ifFalse:[
-			    "keep any existing attribute"
+"keep any existing attribute"
-			    oldAttributes notNil ifTrue:[
+oldAttributes notNil ifTrue:[
-				attributes := oldAttributes.
+attributes := oldAttributes.
-			    ] ifFalse:[
+] ifFalse:[
-				attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
+attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
-			    ].
+].
-			].
+].
-			"JV @ 2010-06-19
+"JV @ 2010-06-19
-			 Support fo additional class attributes and programming language attribute"
+Support fo additional class attributes and programming language attribute"
-			attributes := self mergeDefaultClassAttributesFor: eachClass with: attributes.
+attributes := self mergeDefaultClassAttributesFor: eachClass with: attributes.
-			newEntry := Array with:className.
+newEntry := Array with:className.
-			attributes notEmptyOrNil ifTrue:[
+attributes notEmptyOrNil ifTrue:[
-			    newEntry := newEntry , attributes.
+newEntry := newEntry , attributes.
-			].
+].
-			newSpec add:newEntry
+newSpec add:newEntry
-		    ]
+]
-		]
+]
-	    ]
+]
-	]
+]
 ].
 ^ self classNamesAndAttributes_codeFor:newSpec
 "
 stx_libbasic3 classNamesAndAttributes_code_ignoreOldEntries:false ignoreOldDefinition:true
 exept_expecco classNamesAndAttributes_code_ignoreOldEntries:false ignoreOldDefinition:true
 "
 "Modified: / 08-08-2006 / 19:24:34 / fm"
 "Created: / 10-10-2006 / 22:00:50 / cg"
-"Modified: / 19-06-2010 / 10:56:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 06-09-2011 / 07:48:52 / cg"
+"Modified: / 29-09-2011 / 12:58:52 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 companyName_code
 ^ self companyName_codeFor:self companyName
 squeak_vmMaker validateDescription
 "
 "Modified: / 27-09-2011 / 18:20:36 / cg"
 !
 validateDescription_extensions
 "
 For every extension method, check:
 a) whether its class package is in package prerequisites
 "
 "Created: / 11-08-2011 / 18:51:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 !ProjectDefinition class methodsFor:'testing'!
 isApplicationDefinition
 ^ false
 ! !
 !ProjectDefinition class methodsFor:'documentation'!
 version
-^ '$Id: ProjectDefinition.st 10694 2011-09-28 12:46:37Z vranyj1 $'
+^ '$Id: ProjectDefinition.st 10697 2011-09-29 11:59:43Z vranyj1 $'
 !
 version_CVS
-^ 'Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.363 2011/09/27 17:36:32 cg Exp '
+^ '�Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.363 2011/09/27 17:36:32 cg Exp �'
 !
 version_SVN
-^ '$Id: ProjectDefinition.st 10694 2011-09-28 12:46:37Z vranyj1 $'
+^ '$Id: ProjectDefinition.st 10697 2011-09-29 11:59:43Z vranyj1 $'
 ! !
 ProjectDefinition initialize!

branch	jv
changeset 17866	abe5bdd75639
parent 17864	e6010e48defb
child 17869	9610c6c94e71