hg/stx-libbasic: comparison ProjectDefinition.st

equal deleted inserted replaced

-:daabfcda3d90
+:512cd79cee0e
 "Created: / 07-08-2006 / 19:02:57 / fm"
 "Modified: / 07-08-2006 / 21:25:25 / fm"
 "Modified: / 21-08-2006 / 18:48:31 / cg"
 !
+compiled_classNamesForPlatform
+"answer the classes to be compiled only for the current platformName"
+^ self compiled_classNamesForPlatform:OperatingSystem platformName
+!
 compiled_classNamesForPlatform:platformName
 "answer the classes to be compiled only for platformName
 platformName is one of #unix, #win32 (OperatingSystem platformName)"
 ^ self
 ! !
 !ProjectDefinition class methodsFor:'file generation'!
 basicFileNamesToGenerate
-self subclassResponsibility
+"answer a dictionary (filename -> generator method) with all the files, that have to be generated for this
+package"
-"Created: / 14-09-2006 / 14:36:31 / cg"
+|dict|
+dict := Dictionary withKeysAndValues:#(
+'Make.spec'         #'generate_make_dot_spec'
+'Make.proto'        #'generate_make_dot_proto'
+'bc.mak'            #'generate_bc_dot_mak'
+'abbrev.stc'        #'generate_abbrev_dot_stc'
+'bmake.bat'         #'generate_bmake_dot_mak'
+).
+dict
+at:self rcFilename      put:#'generate_packageName_dot_rc'.
+^ dict.
 !
 fileNamesToGenerate
-^ self basicFileNamesToGenerate reject:[:p | self protectedFileNames includes:(p first) ].
+"answer the files that have to be generated"
-"Modified: / 14-09-2006 / 14:36:10 / cg"
+^ self basicFileNamesToGenerate removeAllKeys:self protectedFileNames ifAbsent:[]
+"
+stx_libbasic fileNamesToGenerate
+"
 !
 forEachFileNameAndGeneratedContentsDo:aTwoArgBlock
 |pairs|
 "Created: / 16-08-2006 / 18:37:52 / User"
 !
 forEachFileNameAndGeneratorMethodDo:aTwoArgBlock
-|fileNamesAndSelectors|
+self fileNamesToGenerate keysAndValuesDo:aTwoArgBlock
-fileNamesAndSelectors := self fileNamesToGenerate.
-fileNamesAndSelectors pairsDo:aTwoArgBlock
 "Modified: / 14-09-2006 / 21:02:37 / cg"
 !
 generateFile:filename
-self basicFileNamesToGenerate
+|action|
-pairsDo:[:fn :action |
-filename = fn ifTrue:[
+action := self basicFileNamesToGenerate at:filename ifAbsent:[].
-^ self perform:action
+action notNil ifTrue:[
-].
+^ self perform:action
 ].
-(filename = 'app.rc' or:[filename = 'lib.rc' or:[filename = self rcFilename]]) ifTrue:[
+(filename = 'app.rc' or:[filename = 'lib.rc']) ifTrue:[
 ^ self generate_packageName_dot_rc
 ].
 (filename = 'loadAll') ifTrue:[
 ^ self generate_loadAll
 ].
 "
 "Modified: / 09-08-2006 / 11:31:21 / fm"
 !
-nsiFilename
-^ self packageName,'.nsi'.
-"Created: / 14-09-2006 / 21:03:41 / cg"
-!
 protectedFileNames
 "names of files which should NOT be generated
 - redefine this to protect a hand-written Make.proto"
 ^ #()
 !
 generateDependencies:whichArchitecture
 ^ String
 streamContents:[:s |
-|classNames classesPresent classesLoaded classesSorted classNamesSorted putDependencyForClassBlock
+|classNames classesPresent classesLoaded clsBaseName putDependencyForClassBlock
-archClassNames archClassesLoaded
+putDependencyForClassBaseNameBlock
+archClassNames archClassesPresent archClassesLoaded
 putSingleClassDependencyEntryBlock putDependencyForExtensionsBlock|
 putSingleClassDependencyEntryBlock := [:cls |
 |sclsBaseName|
 inPackage:cls package
 architecture:whichArchitecture).
 s nextPutAll:'.$(H)'.
 ].
-putDependencyForClassBlock := [:cls |
+putDependencyForClassBaseNameBlock := [:clsBaseName |
-|clsBaseName already|
-clsBaseName := cls classFilename asFilename withoutSuffix baseName.
 s nextPutAll:'$(OUTDIR)'.
 s nextPutAll:clsBaseName.
 s nextPutAll:'.$(O)'.
 s nextPutAll:' '.
 s nextPutAll:clsBaseName.
 s nextPutAll:'.$(H)'.
 s nextPutAll:': '.
 s nextPutAll:clsBaseName.
 s nextPutAll:'.st'.
+].
+putDependencyForClassBlock := [:cls |
+|clsBaseName already|
+clsBaseName := cls classFilename asFilename withoutSuffix baseName.
+putDependencyForClassBaseNameBlock value:clsBaseName.
 cls isLoaded ifTrue:[
-already := Set new.
+already := IdentitySet new.
 cls
 allSuperclassesDo:[:scls |
 putSingleClassDependencyEntryBlock value:scls.
 already add:scls.
 ].
 collect:[:className | Smalltalk classNamed:className]
 thenSelect:[:cls | cls notNil].
 classesLoaded := classesPresent
 select:[:cls | cls isLoaded].
-classesSorted := Class classesSortedByLoadOrder:classesLoaded.
+(Class classesSortedByLoadOrder:classesLoaded) do:putDependencyForClassBlock.
-classesSorted do:putDependencyForClassBlock.
 (classesPresent select:[:cls | cls isLoaded not]) do:putDependencyForClassBlock.
 self namesAndAttributesIn:(self additionalClassNamesAndAttributes)
 do:[:className :attr |
 |cls|
 putDependencyForClassBlock value:cls.
 ]
 ].
 ].
 archClassNames := self compiled_classNamesForPlatform:whichArchitecture.
-archClassesLoaded := archClassNames
+archClassesPresent := archClassNames
 collect:[:className | Smalltalk classNamed:className]
-thenSelect:[:cls | cls notNil and:[ cls isLoaded ] ].
+thenSelect:[:cls | cls notNil].
-archClassesLoaded notEmpty ifTrue:[
+archClassesLoaded := archClassesPresent
-(Class classesSortedByLoadOrder:archClassesLoaded)
+select:[:cls | cls isLoaded].
-		    do:putDependencyForClassBlock.
-].
+(Class classesSortedByLoadOrder:archClassesLoaded) do:putDependencyForClassBlock.
+"some classes are not loaded - probably this is the wrong architecture.
+Sorry, but for these classes, we do not know the superclass chain"
+archClassesPresent
+select:[:cls | cls isLoaded not]
+thenDo:putDependencyForClassBlock.
+"for the following classes, we do not know the superclass chain
+and neither the real class file name"
+archClassNames
+select:[:eachClassName | (Smalltalk classNamed:eachClassName) isNil]
+thenDo:[:eachClassName |
+putDependencyForClassBaseNameBlock value:(eachClassName copyReplaceAll:$: with:$_).
+s nextPutLine:' $(STCHDR)'.
+].
 self hasExtensionMethods ifTrue:putDependencyForExtensionsBlock.
 ]
 "
 stx_libbasic3 generateDependencies:#unix
 stx_libbasic3 generateDependencies:#win32
 "
-"Modified: / 16-08-2006 / 18:52:10 / User"
 "Created: / 14-09-2006 / 12:38:57 / cg"
 "Modified: / 25-10-2006 / 16:01:13 / cg"
 !
 generateDependencies_unix
 ! !
 !ProjectDefinition class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.172 2008-01-23 10:46:42 stefan Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.173 2008-02-05 10:26:11 stefan Exp $'
 ! !
 ProjectDefinition initialize!

changeset 10864	512cd79cee0e
parent 10849	3c5732b4c798
child 10869	e8176ae800f0