hg/stx-libbasic: comparison ProjectDefinition.st

equal deleted inserted replaced

-:ff3118874df3
+:278e1b963c87
 allPreRequisites
 "answer all (recursive) prerequisite project ids of myself - in random order."
 ^ self allPreRequisitesWithParentDo:[:parent :prereq |
-prereq = self package ifTrue:[ Transcript showCR:('oops: %1 depends on itself' bindWith:prereq) ].
+	prereq = self package ifTrue:[ Transcript showCR:('oops: %1 depends on itself' bindWith:prereq) ].
 ]
 "
 stx_libbasic allPreRequisites
 stx_libbasic2 allPreRequisites
 "Modified: / 28-06-2011 / 14:04:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 allPreRequisitesWithParentDo:aBlock
 "answer all (recursive) prerequisite project ids of myself - in random order.
 If we exclude a project, but one of our prerequisite projects depends on it,
 then what ????"
 |setOfAllPreRequisites toAdd|
 setOfAllPreRequisites := Set new.
 so the following line has been deleted.
 Unfortunately the meaning of 'subproject' has never been well defined. SV."
 "/    toAdd addAll:self effectiveSubProjects.
 [toAdd notEmpty] whileTrue:[
-|aPreRequisiteProjectID def|
+	|aPreRequisiteProjectID def|
-aPreRequisiteProjectID := toAdd removeFirst.
+	aPreRequisiteProjectID := toAdd removeFirst.
-(setOfAllPreRequisites includes:aPreRequisiteProjectID) ifFalse:[
+	(setOfAllPreRequisites includes:aPreRequisiteProjectID) ifFalse:[
-setOfAllPreRequisites add:aPreRequisiteProjectID.
+	    setOfAllPreRequisites add:aPreRequisiteProjectID.
-def := self definitionClassForPackage:aPreRequisiteProjectID.
+	    def := self definitionClassForPackage:aPreRequisiteProjectID.
-def isNil ifTrue:[
+	    def isNil ifTrue:[
-Transcript showCR:'ProjectDefinition ', aPreRequisiteProjectID, ' is missing - cannot find its preRequisites.'.
+		Transcript showCR:'ProjectDefinition ', aPreRequisiteProjectID, ' is missing - cannot find its preRequisites.'.
-] ifFalse:[
+	    ] ifFalse:[
-def effectivePreRequisites
+		def effectivePreRequisites
-select:[:eachSubPreRequisite | (setOfAllPreRequisites includes:eachSubPreRequisite) not]
+		    select:[:eachSubPreRequisite | (setOfAllPreRequisites includes:eachSubPreRequisite) not]
-thenDo:[:eachSubPreRequisite |
+		    thenDo:[:eachSubPreRequisite |
-Transcript show:'ProjectDefinition preRequisites: '; showCR:(aPreRequisiteProjectID, ' requires ', eachSubPreRequisite).
+				Transcript show:'ProjectDefinition preRequisites: '; showCR:(aPreRequisiteProjectID, ' requires ', eachSubPreRequisite).
-aBlock value:def value:eachSubPreRequisite.
+				aBlock value:def value:eachSubPreRequisite.
-toAdd add:eachSubPreRequisite
+				toAdd add:eachSubPreRequisite
-].
+			   ].
-"but subprojects of our prerequisites are also prerequisites"
+		"but subprojects of our prerequisites are also prerequisites"
-def effectiveSubProjects
+		def effectiveSubProjects
-select:[:eachSubSubRequisite | eachSubSubRequisite ~= self package and:[ (setOfAllPreRequisites includes:eachSubSubRequisite) not ]]
+		    select:[:eachSubSubRequisite | eachSubSubRequisite ~= self package and:[ (setOfAllPreRequisites includes:eachSubSubRequisite) not ]]
-thenDo:[:eachSubSubRequisite |
+		    thenDo:[:eachSubSubRequisite |
-Transcript show:'ProjectDefinition preRequisites: '; showCR:(aPreRequisiteProjectID, ' hasSub ', eachSubSubRequisite).
+				Transcript show:'ProjectDefinition preRequisites: '; showCR:(aPreRequisiteProjectID, ' hasSub ', eachSubSubRequisite).
-aBlock value:def value:eachSubSubRequisite.
+				aBlock value:def value:eachSubSubRequisite.
-toAdd add:eachSubSubRequisite
+				toAdd add:eachSubSubRequisite
-].
+			   ].
-].
+	    ].
-]
+	]
 ].
 ^ setOfAllPreRequisites.
 "
 stx_libbasic allPreRequisites
 "generate and return a testSuite containing all of my test-classes"
 |suite classes|
 suite := TestSuite named:self package.
 classes := self classes
-select:[:each |
+		select:[:each |
-each isLoaded ifFalse:[each autoload].
+		    each isLoaded ifFalse:[each autoload].
-(each isTestCaseLike) and:[ each isAbstract not ]
+		    (each isTestCaseLike) and:[ each isAbstract not ]
-].
+		].
 classes := classes asSortedCollection:[:a :b | a name <= b name ].
 classes do: [:eachClass |
-| tests |
+	| tests |
-tests := eachClass suite tests.
+	tests := eachClass suite tests.
-tests := tests reject:[:test|self shouldExcludeTest: test].
+	tests := tests reject:[:test|self shouldExcludeTest: test].
-suite addTests: tests
+	suite addTests: tests
 ].
 ^ suite
 "Created: / 01-04-2011 / 15:20:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 03-06-2011 / 17:07:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 initializeAllProjectDefinitions
 "needs everything else (especially the compiler etc.) to be initialized.
 Therefore, its not invoked by #initialize, but instead explicitely,
 by Smalltalk"
 |isStandAloneApp|
 isStandAloneApp := Smalltalk isStandAloneApp.
 self allSubclassesDo:[:eachProjectDefinitionClass |
-eachProjectDefinitionClass isAbstract ifFalse:[
+	eachProjectDefinitionClass isAbstract ifFalse:[
-isStandAloneApp ifFalse:[
+	    isStandAloneApp ifFalse:[
-eachProjectDefinitionClass installAutoloadedClasses.
+		eachProjectDefinitionClass installAutoloadedClasses.
-].
+	    ].
-eachProjectDefinitionClass projectIsLoaded:true.
+	    eachProjectDefinitionClass projectIsLoaded:true.
-]
+	]
 ].
 "
 self initialize
 "
 |classesToFixClassFileName|
 classesToFixClassFileName := OrderedCollection new.
 self autoloaded_classNames do:[:className |
-|cls|
+	|cls|
-"/ 'install as autoloaded: ' errorPrint. className errorPrintCR.
+	"/ 'install as autoloaded: ' errorPrint. className errorPrintCR.
-(cls := Smalltalk classNamed:className) isNil ifTrue:[
+	(cls := Smalltalk classNamed:className) isNil ifTrue:[
-Error handle:[:ex |
+	    Error handle:[:ex |
-(self name,' [warning]: failed to install autoloaded: ',className) errorPrintCR.
+		(self name,' [warning]: failed to install autoloaded: ',className) errorPrintCR.
-(self name,' [info]: reason: ',ex description) errorPrintCR.
+		(self name,' [info]: reason: ',ex description) errorPrintCR.
-"/ thisContext fullPrintAll.
+		"/ thisContext fullPrintAll.
-] do:[
+	    ] do:[
-cls := Smalltalk
+		cls := Smalltalk
-installAutoloadedClassNamed:className
+		    installAutoloadedClassNamed:className
-category:'* as yet unknown category *'
+		    category:'* as yet unknown category *'
-package:self package
+		    package:self package
-revision:nil
+		    revision:nil
-].
+	    ].
-cls notNil ifTrue:[
+	    cls notNil ifTrue:[
-classesToFixClassFileName add:cls.
+		classesToFixClassFileName add:cls.
-].
+	    ].
-].
+	].
 ].
 Smalltalk addStartBlock:[
-|abbrevs|
+	|abbrevs|
-abbrevs := self abbrevs.
+	abbrevs := self abbrevs.
-"/ patch the classFileNames
+	"/ patch the classFileNames
-classesToFixClassFileName do:[:cls |
+	classesToFixClassFileName do:[:cls |
-|entry classFilenameFromAbbreviations|
+	    |entry classFilenameFromAbbreviations|
-entry := abbrevs at:cls name ifAbsent:nil.
+	    entry := abbrevs at:cls name ifAbsent:nil.
-entry notNil ifTrue:[
+	    entry notNil ifTrue:[
-classFilenameFromAbbreviations := entry fileName.
+		classFilenameFromAbbreviations := entry fileName.
-classFilenameFromAbbreviations notNil ifTrue:[
+		classFilenameFromAbbreviations notNil ifTrue:[
-classFilenameFromAbbreviations := classFilenameFromAbbreviations,'.st'.
+		    classFilenameFromAbbreviations := classFilenameFromAbbreviations,'.st'.
-(classFilenameFromAbbreviations ~= cls getClassFilename) ifTrue:[
+		    (classFilenameFromAbbreviations ~= cls getClassFilename) ifTrue:[
-cls setClassFilename:classFilenameFromAbbreviations
+			cls setClassFilename:classFilenameFromAbbreviations
-].
+		    ].
-].
+		].
-]
+	    ]
-].
+	].
-"/ patch the categories
+	"/ patch the categories
-Class withoutUpdatingChangesDo:[
+	Class withoutUpdatingChangesDo:[
-|entry|
+	    |entry|
-self classNames do:[:nm |
+	    self classNames do:[:nm |
-|cls|
+		|cls|
-((cls := Smalltalk at: nm) notNil
+		((cls := Smalltalk at: nm) notNil
-and:[ cls isLoaded not
+			and:[ cls isLoaded not
-and:[ (entry := abbrevs at:cls name ifAbsent:[nil]) notNil
+			and:[ (entry := abbrevs at:cls name ifAbsent:[nil]) notNil
-]]) ifTrue:[
+		]]) ifTrue:[
-cls category: (entry category)
+		    cls category: (entry category)
-]
+		]
-]
+	    ]
-]
+	]
 ].
 "
 stx_libbasic installAutoloadedClasses
 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
 "rules for header files (of autoloaded classes).
 For each extended class, which is autoloaded (and therefore, we will not find a header file for it),
 generate a rule to create the header file only."
 ^ String streamContents:[:s |
-(self extensionClassesWithSuperclasses:true) do:[:eachExtendedClass |
+	(self extensionClassesWithSuperclasses:true) do:[:eachExtendedClass |
-|headerFileDirPath baseFilename|
+	    |headerFileDirPath baseFilename|
-(eachExtendedClass isLoaded not or:[eachExtendedClass wasAutoloaded]) ifTrue:[
+	    (eachExtendedClass isLoaded not or:[eachExtendedClass wasAutoloaded]) ifTrue:[
-headerFileDirPath := self perform:pathConverter with:eachExtendedClass package.
+		headerFileDirPath := self perform:pathConverter with:eachExtendedClass package.
-baseFilename := self filenameForClass:eachExtendedClass.
+		baseFilename := self filenameForClass:eachExtendedClass.
-s nextPutAll:(template
+		s nextPutAll:(template
-bindWith:headerFileDirPath
+		    bindWith:headerFileDirPath
-with:baseFilename).
+		    with:baseFilename).
-]
+	    ]
-].
+	].
 ].
 "Created: / 12-09-2011 / 16:23:52 / cg"
 !
 additionalHeaderRules_bc_dot_mak
 "rules for header files (of autoloaded classes)"
 ^ self
-additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_bc_dot_mak)
+	additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_bc_dot_mak)
-pathConverter:#pathToPackage_win32:
+	pathConverter:#pathToPackage_win32:
 "Created: / 12-09-2011 / 15:44:09 / cg"
 !
 additionalHeaderRules_make_dot_proto
 "rules for header files (of autoloaded classes)"
 ^ self
-additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_make_dot_proto)
+	additionalHeaderRulesUsingTemplate:(self singleHeaderRuleTemplate_make_dot_proto)
-pathConverter:#pathToPackage_unix:
+	pathConverter:#pathToPackage_unix:
 "Created: / 12-09-2011 / 15:44:28 / cg"
 !
 additionalLinkLibraries_bc_dot_mak
 bc_dot_mak_mappings
 |d|
 d := Dictionary new.
 d
-at: 'TAB' put: ( Character tab asString );
+	at: 'TAB' put: ( Character tab asString );
-at: 'TOP' put: ( self pathToTop_win32 );
+	at: 'TOP' put: ( self pathToTop_win32 );
-at: 'MODULE' put: ( self module );
+	at: 'MODULE' put: ( self module );
-at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
+	at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
-at: 'MODULE_PATH' put: ( self moduleDirectory_win32 );
+	at: 'MODULE_PATH' put: ( self moduleDirectory_win32 );
-at: 'PRIMARY_TARGET' put: (self primaryTarget_bc_dot_mak);
+	at: 'PRIMARY_TARGET' put: (self primaryTarget_bc_dot_mak);
-at: 'ADDITIONAL_BASE_ADDRESS_DEFINITION' put: (self additionalBaseAddressDefinition_bc_dot_mak ? '');
+	at: 'ADDITIONAL_BASE_ADDRESS_DEFINITION' put: (self additionalBaseAddressDefinition_bc_dot_mak ? '');
-at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_bc_dot_mak ? '');
+	at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_bc_dot_mak ? '');
-at: 'ADDITIONAL_HEADERRULES' put: (self additionalHeaderRules_bc_dot_mak);
+	at: 'ADDITIONAL_HEADERRULES' put: (self additionalHeaderRules_bc_dot_mak);
-at: 'ADDITIONAL_RULES' put: (self additionalRules_bc_dot_mak ? '');
+	at: 'ADDITIONAL_RULES' put: (self additionalRules_bc_dot_mak ? '');
-at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_bc_dot_mak ? '');
+	at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_bc_dot_mak ? '');
-at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_bc_dot_mak ? '');
+	at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_bc_dot_mak ? '');
-at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32 ? '');
+	at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_win32 ? '');
-at: 'LOCAL_DEFINES' put: self localDefines_win32 ? '';
+	at: 'LOCAL_DEFINES' put: self localDefines_win32 ? '';
-at: 'GLOBAL_DEFINES' put: self globalDefines_win32 ? '';
+	at: 'GLOBAL_DEFINES' put: self globalDefines_win32 ? '';
-at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_bc_dot_mak ? '').
+	at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_bc_dot_mak ? '').
 ^ d
 "Created: / 18-08-2006 / 11:43:39 / cg"
 "Modified: / 12-09-2011 / 15:43:30 / cg"
 !
 "Created: / 19-09-2006 / 22:47:43 / cg"
 !
 make_dot_proto_mappings
 ^ Dictionary new
-at: 'TAB' put: ( Character tab asString );
+	at: 'TAB' put: ( Character tab asString );
-at: 'TOP' put: ( self pathToTop_unix );
+	at: 'TOP' put: ( self pathToTop_unix );
-at: 'LIBRARY_NAME' put: ( self libraryName );
+	at: 'LIBRARY_NAME' put: ( self libraryName );
-at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
+	at: 'SUBDIRECTORIES' put: (self generateSubDirectories);
-at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
+	at: 'LOCAL_INCLUDES' put: (self generateLocalIncludes_unix);
-at: 'LOCAL_DEFINES' put: self localDefines_unix;
+	at: 'LOCAL_DEFINES' put: self localDefines_unix;
-at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
+	at: 'GLOBAL_DEFINES' put: self globalDefines_unix;
-at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
+	at: 'COMMONSYMFLAG' put: (self commonSymbolsFlag);
-at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
+	at: 'HEADEROUTPUTARG' put: (self headerFileOutputArg);
-at: 'PRIMARY_TARGET' put: (self primaryTarget_make_dot_proto);
+	at: 'PRIMARY_TARGET' put: (self primaryTarget_make_dot_proto);
-at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
+	at: 'ADDITIONAL_DEFINITIONS' put: (self additionalDefinitions_make_dot_proto);
-at: 'ADDITIONAL_HEADERRULES' put: (self additionalHeaderRules_make_dot_proto);
+	at: 'ADDITIONAL_HEADERRULES' put: (self additionalHeaderRules_make_dot_proto);
-at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
+	at: 'ADDITIONAL_RULES' put: (self additionalRules_make_dot_proto);
-at: 'ADDITIONAL_RULES_SVN' put: (self additionalRulesSvn_make_dot_proto);
+	at: 'ADDITIONAL_RULES_SVN' put: (self additionalRulesSvn_make_dot_proto);
-at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_make_dot_proto);
+	at: 'ADDITIONAL_TARGETS' put: (self additionalTargets_make_dot_proto);
-at: 'ADDITIONAL_TARGETS_SVN' put: (self additionalTargetsSvn_make_dot_proto);
+	at: 'ADDITIONAL_TARGETS_SVN' put: (self additionalTargetsSvn_make_dot_proto);
-at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
+	at: 'ADDITIONAL_LINK_LIBRARIES' put: (self additionalLinkLibraries_make_dot_proto);
-at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
+	at: 'ADDITIONAL_SHARED_LINK_LIBRARIES' put: (self additionalSharedLinkLibraries_make_dot_proto);
-at: 'DEPENDENCIES' put: (self generateDependencies_unix);
+	at: 'DEPENDENCIES' put: (self generateDependencies_unix);
-at: 'MODULE' put: ( self module );
+	at: 'MODULE' put: ( self module );
-at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
+	at: 'MODULE_DIRECTORY' put: ( self moduleDirectory );
-at: 'MODULE_PATH' put: ( self moduleDirectory );
+	at: 'MODULE_PATH' put: ( self moduleDirectory );
-at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
+	at: 'MAKE_PREREQUISITES' put: (self generateRequiredMakePrerequisites_make_dot_proto);
-yourself
+	yourself
 "Created: / 09-08-2006 / 11:20:45 / fm"
 "Modified: / 09-08-2006 / 16:44:48 / fm"
 "Modified: / 24-06-2009 / 21:50:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 22-08-2009 / 12:03:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !ProjectDefinition class methodsFor:'file mappings support'!
 classNamesByCategory
 "answer a dictionary
-category -> classNames topological sorted"
+	category -> classNames topological sorted"
 |pivateClassesOf sorter classes classNames mapping|
 mapping := Dictionary new.
 classes := self compiled_classes_common.
 pivateClassesOf := IdentityDictionary new.
 classes do:[:each | pivateClassesOf at:each put:(each allPrivateClasses)].
 sorter := [:a :b |
-"/ a must come before b iff:
+	"/ a must come before b iff:
-"/    b is a subclass of a
+	"/    b is a subclass of a
-"/    b has a private class which is a subclass of a
+	"/    b has a private class which is a subclass of a
-"/    a is a sharedPool, used by b
+	"/    a is a sharedPool, used by b
-|mustComeBefore pivateClassesOfB|
+	|mustComeBefore pivateClassesOfB|
-mustComeBefore := false.
+	mustComeBefore := false.
-mustComeBefore := (a isSharedPool and:[(b sharedPoolNames includes: a name)]).
+	mustComeBefore := (a isSharedPool and:[(b sharedPoolNames includes: a name)]).
-mustComeBefore := mustComeBefore or:[b isSubclassOf:a].
+	mustComeBefore := mustComeBefore or:[b isSubclassOf:a].
-mustComeBefore ifFalse:[
+	mustComeBefore ifFalse:[
-pivateClassesOfB := pivateClassesOf at:b ifAbsent:[ #() ].
+	    pivateClassesOfB := pivateClassesOf at:b ifAbsent:[ #() ].
-pivateClassesOfB do:[:eachClassInB |
+	    pivateClassesOfB do:[:eachClassInB |
-mustComeBefore := mustComeBefore or:[eachClassInB isSubclassOf:a]
+		mustComeBefore := mustComeBefore or:[eachClassInB isSubclassOf:a]
-].
+	    ].
-].
+	].
-mustComeBefore
+	mustComeBefore
 ].
 classes topologicalSort:sorter.
 OperatingSystem knownPlatformNames do:[:platformID |
-|prefix depClasses depClassNames|
+	|prefix depClasses depClassNames|
-prefix := platformID asUppercase.
+	prefix := platformID asUppercase.
-depClasses := self compiled_classesForArchitecture:platformID.
+	depClasses := self compiled_classesForArchitecture:platformID.
-depClasses notEmpty ifTrue:[
+	depClasses notEmpty ifTrue:[
-(self compiled_classNamesForPlatform:platformID)
+	    (self compiled_classNamesForPlatform:platformID)
-select:[:nm | (Smalltalk at:nm ifAbsent:nil) isNil]
+		select:[:nm | (Smalltalk at:nm ifAbsent:nil) isNil]
-thenDo:[:nm | Transcript showCR:nm].
+		thenDo:[:nm | Transcript showCR:nm].
-(depClasses includes:nil) ifTrue:[
+	    (depClasses includes:nil) ifTrue:[
-(Dialog confirm:'Dependencies might be incorrect (some classes are not present).\\Continue anyway ?' withCRs)
+		(Dialog confirm:'Dependencies might be incorrect (some classes are not present).\\Continue anyway ?' withCRs)
-ifFalse:[
+		ifFalse:[
-AbortOperationRequest raise.
+		    AbortOperationRequest raise.
-].
+		].
-depClassNames := self compiled_classNamesForPlatform:platformID.
+		depClassNames := self compiled_classNamesForPlatform:platformID.
-] ifFalse:[
+	    ] ifFalse:[
-depClasses topologicalSort:sorter.
+		depClasses topologicalSort:sorter.
-depClassNames := depClasses collect:[:eachClass| eachClass name].
+		depClassNames := depClasses collect:[:eachClass| eachClass name].
-].
+	    ].
-mapping at:prefix put:depClassNames.
+	    mapping at:prefix put:depClassNames.
-].
+	].
-classNames := classes collect:[:eachClass| eachClass name].
+	classNames := classes collect:[:eachClass| eachClass name].
-self namesAndAttributesIn:(self additionalClassNamesAndAttributes) do: [:nm :attr |
+	self namesAndAttributesIn:(self additionalClassNamesAndAttributes) do: [:nm :attr |
-(attr isEmptyOrNil or:[(attr includes:#autoload) not]) ifTrue:[
+	    (attr isEmptyOrNil or:[(attr includes:#autoload) not]) ifTrue:[
-classNames add:nm.
+		classNames add:nm.
-].
+	    ].
-].
+	].
-mapping at:'COMMON' put:classNames.
+	mapping at:'COMMON' put:classNames.
 ].
 ^ mapping
 "
 stx_libbasic classNamesByCategory
 This is normally no problem for compiled classLibs - however, if a package
 has only be installedAsAutoloaded, some classes might want to ensure that
 when being loaded themself."
 self hasAllExtensionsLoaded ifFalse:[
-self breakPoint:#cg.
+	self breakPoint:#cg.
 ].
 self hasAllClassesFullyLoaded ifFalse:[
-self hasAllClassesLoaded ifFalse:[
+	self hasAllClassesLoaded ifFalse:[
-self breakPoint:#cg.
+	    self breakPoint:#cg.
-].
+	].
-self installAutoloadedClasses.
+	self installAutoloadedClasses.
-self classes do:[:cls | cls autoload ].
+	self classes do:[:cls | cls autoload ].
 ].
 "
 stx_libbasic ensureFullyLoaded
 "
 false if the package's classes have been already present."
 |newStuffHasBeenLoaded meOrMySecondIncarnation|
 self projectIsLoaded ifTrue:[
-asAutoloaded ifFalse:[
+	asAutoloaded ifFalse:[
-"/ to be considered !!
+	    "/ to be considered !!
 "/            self isFullyLoaded ifFalse:[
 "/                self hasAllExtensionsLoaded ifFalse:[
 "/                    self loadExtensions.
 "/                ].
 "/                self loadAllAutoloadedClasses
 "/            ].
-].
+	].
-^ false
+	^ false
 ].
 thisContext isRecursive ifTrue:[self breakPoint:#cg. ^ false].    "/ avoid endless loops
 newStuffHasBeenLoaded := false.
 (self infoPrinting and:[Smalltalk silentLoading not]) ifTrue:[
-"/ thisContext fullPrintAll.
+	"/ thisContext fullPrintAll.
-Transcript showCR:('loading %1%2...'
+	Transcript showCR:('loading %1%2...'
-bindWith:(asAutoloaded ifTrue:['as autoloaded '] ifFalse:[''])
+			    bindWith:(asAutoloaded ifTrue:['as autoloaded '] ifFalse:[''])
-with:self name).
+			    with:self name).
 ].
 self rememberOverwrittenExtensionMethods.
 self activityNotification:'Executing pre-load action'.
 self preLoadAction.
 meOrMySecondIncarnation := self.
 Class withoutUpdatingChangesDo:[
-self activityNotification:'Loading prerequisities'.
+	self activityNotification:'Loading prerequisities'.
-self loadPreRequisitesAsAutoloaded:asAutoloaded.
+	self loadPreRequisitesAsAutoloaded:asAutoloaded.
-self checkPrerequisitesForLoading.
+	self checkPrerequisitesForLoading.
-asAutoloaded ifFalse:[
+	asAutoloaded ifFalse:[
-self loadClassLibrary.
+	    self loadClassLibrary.
-"/ could have overloaded my first incarnation
+	    "/ could have overloaded my first incarnation
-meOrMySecondIncarnation := (Smalltalk at:(self name)) ? self.
+	    meOrMySecondIncarnation := (Smalltalk at:(self name)) ? self.
-meOrMySecondIncarnation ~~ self ifTrue:[
+	    meOrMySecondIncarnation ~~ self ifTrue:[
-meOrMySecondIncarnation fetchSlotsFrom:self.
+		meOrMySecondIncarnation fetchSlotsFrom:self.
-].
+	    ].
-].
+	].
-self hasAllExtensionsLoaded ifFalse:[
+	self hasAllExtensionsLoaded ifFalse:[
-self activityNotification:'Loading extensions'.
+	    self activityNotification:'Loading extensions'.
-newStuffHasBeenLoaded := newStuffHasBeenLoaded | meOrMySecondIncarnation loadExtensions.
+	    newStuffHasBeenLoaded := newStuffHasBeenLoaded | meOrMySecondIncarnation loadExtensions.
-].
+	].
-self hasAllClassesLoaded ifFalse:[
+	self hasAllClassesLoaded ifFalse:[
-self activityNotification:'Loading classes'.
+	    self activityNotification:'Loading classes'.
-newStuffHasBeenLoaded := newStuffHasBeenLoaded | (meOrMySecondIncarnation loadAllClassesAsAutoloaded:asAutoloaded).
+	    newStuffHasBeenLoaded := newStuffHasBeenLoaded | (meOrMySecondIncarnation loadAllClassesAsAutoloaded:asAutoloaded).
-].
+	].
 "/ no, don't load subProjects here - will lead to a recursion, which leads
 "/ to some classes being loaded from source (soap)
-self activityNotification:'Loading sub projects'.
+	self activityNotification:'Loading sub projects'.
-meOrMySecondIncarnation loadSubProjectsAsAutoloaded:asAutoloaded.
+	meOrMySecondIncarnation loadSubProjectsAsAutoloaded:asAutoloaded.
 ].
 self activityNotification:('Executing post-load action for %1' bindWith:self package).
 "/ mhmh - already done for dll-loaded packages
 "/ meOrMySecondIncarnation initializeAllClasses.
 meOrMySecondIncarnation postLoadAction.
 meOrMySecondIncarnation projectIsLoaded:true.
 meOrMySecondIncarnation ~~ self ifTrue:[
-self projectIsLoaded:true.
+	self projectIsLoaded:true.
 ].
 self activityNotification:('Done (%1).' bindWith:self package).
 ^ newStuffHasBeenLoaded
 and cached for future use"
 |abbrevs|
 AccessLock critical:[
-|mustRead file|
+	|mustRead file|
-AbbrevDictionary isNil ifTrue:[
+	AbbrevDictionary isNil ifTrue:[
-AbbrevDictionary := WeakIdentityDictionary new.
+	    AbbrevDictionary := WeakIdentityDictionary new.
-].
+	].
-mustRead := false.
+	mustRead := false.
-abbrevs := AbbrevDictionary at:self ifAbsent:[ mustRead := true. Dictionary new ].
+	abbrevs := AbbrevDictionary at:self ifAbsent:[ mustRead := true. Dictionary new ].
-mustRead ifTrue:[
+	mustRead ifTrue:[
-file := self packageDirectory / 'abbrev.stc'.
+	    file := self packageDirectory / 'abbrev.stc'.
-file exists ifTrue: [
+	    file exists ifTrue: [
-file readingFileDo:[:stream |
+		file readingFileDo:[:stream |
-Smalltalk
+		    Smalltalk
-withAbbreviationsFromStream:stream
+			withAbbreviationsFromStream:stream
-do:[:nm :fn :pkg :cat :sz|
+			do:[:nm :fn :pkg :cat :sz|
-abbrevs at: nm put: (AbbrevEntry new className:nm fileName:fn category:cat numClassInstVars:sz)
+			    abbrevs at: nm put: (AbbrevEntry new className:nm fileName:fn category:cat numClassInstVars:sz)
-]
+			]
-]
+		]
-].
+	    ].
-].
+	].
 ].
 ^abbrevs
 "Created: / 06-03-2011 / 18:25:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 "Modified: / 18-08-2011 / 14:24:15 / cg"
 !
 loadClass: className asAutoloaded: asAutoloaded language: lang
 | packageDir classFile entry category numClassInstVars cls|
 "Handle smalltalk classes specially to provide backward compatibility"
 lang isSmalltalk ifTrue:[
-entry := self abbrevs at: className ifAbsent:[nil].
+	entry := self abbrevs at: className ifAbsent:[nil].
-asAutoloaded ifTrue:[
+	asAutoloaded ifTrue:[
-category := entry isNil ifTrue:[#autoloaded] ifFalse:[entry category].
+	    category := entry isNil ifTrue:[#autoloaded] ifFalse:[entry category].
-numClassInstVars := entry isNil ifTrue:[0] ifFalse:[entry numClassInstVars].
+	    numClassInstVars := entry isNil ifTrue:[0] ifFalse:[entry numClassInstVars].
-cls := Smalltalk
+	    cls := Smalltalk
-installAutoloadedClassNamed: className
+		installAutoloadedClassNamed: className
-category: category
+		category: category
-package: self package
+		package: self package
-revision: nil
+		revision: nil
-numClassInstVars:numClassInstVars.
+		numClassInstVars:numClassInstVars.
-entry notNil ifTrue:[
+	    entry notNil ifTrue:[
-cls setClassFilename:(entry fileName,'.st').
+		cls setClassFilename:(entry fileName,'.st').
-].
+	    ].
-^ cls.
+	    ^ cls.
-].
+	].
-^ Smalltalk
+	^ Smalltalk
-fileInClass:className
+	    fileInClass:className
-package:self package
+	    package:self package
-initialize:false
+	    initialize:false
-lazy:false
+	    lazy:false
-silent:true
+	    silent:true
 ].
 "For non-smalltalk language do"
 asAutoloaded ifTrue:[^self error:'Only Smalltalk classes may be autoloaded (yet)'].
 "my classes are required"
 requiredClasses := (self searchForClassesWithProject: packageId) asSet.
 withSubProjectsBoolean ifTrue:[
-"my subproject's classes are required"
+	"my subproject's classes are required"
-self subProjects do:[:eachProjectName |
+	self subProjects do:[:eachProjectName |
-requiredClasses addAll: (self searchForClassesWithProject:eachProjectName asSymbol)
+	    requiredClasses addAll: (self searchForClassesWithProject:eachProjectName asSymbol)
-].
+	].
 ].
 "all superclasses of my classes and my subProject's classes are required"
 requiredClasses do:[:cls |
-cls allSuperclassesDo:[:eachSuperclass |
+	cls allSuperclassesDo:[:eachSuperclass |
-(usedClassesWithReasons at: eachSuperclass ifAbsentPut:[OrderedSet new])
+	    (usedClassesWithReasons at: eachSuperclass ifAbsentPut:[OrderedSet new])
-add: (eachSuperclass name, ' - superclass of ', cls name).
+		add: (eachSuperclass name, ' - superclass of ', cls name).
-]
+	]
 ].
 "all classes referenced by my classes or my subproject's classes
 are required. But:
-only search for locals refered to by my methods (assuming that superclasses'
+	 only search for locals refered to by my methods (assuming that superclasses'
-prerequisites are specified in their package)."
+	 prerequisites are specified in their package)."
 self addReferencesToClassesFromGlobalsIn:requiredClasses to:usedClassesWithReasons.
 self addReferencesToClassesFromGlobalsInMethods:(self searchForExtensionsWithProject:self package) to:usedClassesWithReasons.
 "all classes for which I define extensions are required"
 self allExtensionClasses do:[:eachExtendedClass |
-(usedClassesWithReasons at:eachExtendedClass ifAbsentPut:[OrderedSet new])
+	(usedClassesWithReasons at:eachExtendedClass ifAbsentPut:[OrderedSet new])
-add: (eachExtendedClass name, ' - extended').
+	    add: (eachExtendedClass name, ' - extended').
-eachExtendedClass allSuperclassesDo:[:eachSuperclass |
+	eachExtendedClass allSuperclassesDo:[:eachSuperclass |
-(usedClassesWithReasons at: eachSuperclass ifAbsentPut:[OrderedSet new])
+	    (usedClassesWithReasons at: eachSuperclass ifAbsentPut:[OrderedSet new])
-add: (eachSuperclass name, ' - superclass of extended ', eachExtendedClass name).
+		add: (eachSuperclass name, ' - superclass of extended ', eachExtendedClass name).
-]
+	]
 ].
 "don't put classes from subProjects into the required list"
 ignoredPackages := (self siblingsAreSubProjects
-ifTrue:[ self searchForSiblingProjects ]
+				ifTrue:[ self searchForSiblingProjects ]
-ifFalse:[ self searchForSubProjects ]) asSet.
+				ifFalse:[ self searchForSubProjects ]) asSet.
 ignoredPackages add:self package.
 ignoredPackages add:PackageId noProjectID.
 "now map classes to packages and collect the reasons"
 requiredPackageReasons := Dictionary new.
 usedClassesWithReasons keysAndValuesDo:[:usedClass :reasonsPerClass | |usedClassPackage|
-usedClassPackage := usedClass package.
+	usedClassPackage := usedClass package.
-(ignoredPackages includes:usedClassPackage) ifFalse:[
+	(ignoredPackages includes:usedClassPackage) ifFalse:[
-(requiredPackageReasons at:usedClassPackage ifAbsentPut:[OrderedSet new])
+	    (requiredPackageReasons at:usedClassPackage ifAbsentPut:[OrderedSet new])
-addAll:reasonsPerClass.
+			    addAll:reasonsPerClass.
-].
+	].
 ].
 ^ requiredPackageReasons
 "
 |classes|
 classes := IdentitySet new.
 self extensionMethodNames pairWiseDo:[:className :selector |
-|mthdCls extendedClass|
+	|mthdCls extendedClass|
-mthdCls := Smalltalk classNamed:className.
+	mthdCls := Smalltalk classNamed:className.
-(mthdCls notNil and:[mthdCls isLoaded]) ifTrue:[
+	(mthdCls notNil and:[mthdCls isLoaded]) ifTrue:[
-extendedClass := mthdCls theNonMetaclass.
+	    extendedClass := mthdCls theNonMetaclass.
-(classes includes:extendedClass) ifFalse:[
+	    (classes includes:extendedClass) ifFalse:[
-withSuperclassesBoolean ifTrue:[
+		withSuperclassesBoolean ifTrue:[
-extendedClass withAllSuperclassesDo:[:eachClass |
+		    extendedClass withAllSuperclassesDo:[:eachClass |
-classes add:eachClass.
+			classes add:eachClass.
-].
+		    ].
-] ifFalse:[
+		] ifFalse:[
-classes add:extendedClass.
+		    classes add:extendedClass.
-].
+		].
-].
+	    ].
-].
+	].
 ].
 ^ classes.
 "
-stx_libboss extensionClasses
+	stx_libboss extensionClasses
 "
 "Created: / 06-09-2011 / 10:17:06 / cg"
 !
 "answer the set of packages, which are extended by this package"
 ^ self allExtensionClasses collect:[:eachClass| eachClass package]
 "
-stx_libboss extensionPackages
+	stx_libboss extensionPackages
 "
 "Modified: / 06-09-2011 / 10:20:47 / cg"
 !
 validateDescription
 |emptyProjects nonProjects emptyOrNonProjects classesInImage classesInDescription|
 emptyProjects := Set withAll:self subProjects.
 Smalltalk allClassesDo:[:cls |
-emptyProjects remove:(cls package) ifAbsent:[].
+	emptyProjects remove:(cls package) ifAbsent:[].
 ].
 nonProjects := self subProjects select:[:p |
-(ProjectDefinition definitionClassForPackage: p) isNil
+		    (ProjectDefinition definitionClassForPackage: p) isNil
-].
+		   ].
 emptyOrNonProjects := Set withAll:emptyProjects.
 emptyOrNonProjects addAll:nonProjects.
 emptyOrNonProjects notEmpty ifTrue:[
-(Dialog
+	(Dialog
-confirm:('The following projects are non-existent, empty or without description:\\    '
+	    confirm:('The following projects are non-existent, empty or without description:\\    '
-, ((emptyOrNonProjects
+		    , ((emptyOrNonProjects
-asSortedCollection
+			    asSortedCollection
-collect:[:p | p allBold])
+				collect:[:p | p allBold])
-asStringWith:'\    ')
+				asStringWith:'\    ')
-, '\\Continue ?') withCRs
+		    , '\\Continue ?') withCRs
-yesLabel:'OK' noLabel:'Cancel')
+	    yesLabel:'OK' noLabel:'Cancel')
-ifFalse:[
+	ifFalse:[
-AbortSignal raise
+	    AbortSignal raise
-].
+	].
 ].
-classesInImage := Smalltalk allClasses select:[:cls | cls package = package].
+classesInImage := Smalltalk allClasses select:[:cls | cls package = self package].
 classesInDescription := self classes asIdentitySet.
 classesInImage ~= classesInDescription ifTrue:[
-Dialog warn:'The set of classes in the image is different from the listed classes in the project definition'
+	Dialog warn:'The set of classes in the image is different from the listed classes in the project definition'
 ].
 "
 squeak_vmMaker validateDescription
 "
 className
 ^ className
 !
 className:classNameArg fileName:fileNameArg category:categoryArg numClassInstVars:numClassInstVarsArg
 className := classNameArg.
 fileName := fileNameArg.
 category := categoryArg.
 numClassInstVars := numClassInstVarsArg.
 ! !
 !ProjectDefinition class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.356 2011-09-14 13:39:47 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.357 2011-09-14 13:48:16 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.356 2011-09-14 13:39:47 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.357 2011-09-14 13:48:16 cg Exp $'
 !
 version_SVN
 ^ '� Id: ProjectDefinition.st 10645 2011-06-09 15:28:45Z vranyj1  �'
 ! !

changeset 13695	278e1b963c87
parent 13694	ff3118874df3
child 13696	814c2dc1a4f8