#BUGFIX by sr
class: RegressionTests::MakefileTests
changed: #run:type:toolchain:
--- a/RegressionTests__MakefileTests.st Tue Dec 06 14:19:31 2016 +0100
+++ b/RegressionTests__MakefileTests.st Tue Dec 06 14:22:11 2016 +0100
@@ -106,68 +106,81 @@
"/ Compile all classes...
Class packageQuerySignal answer:package do:[
- (self class privateClasses select:[:cls | cls packageIdent = packageIdent ]) do:[:cls |
- | copy |
+ (self class privateClasses select:[:cls | cls packageIdent = packageIdent ]) do:[:cls |
+ | copy |
- copy := cls superclass
- subclass: cls nameWithoutPrefix
- instanceVariableNames:(cls instVarNames asStringWith:' ')
- classVariableNames:(cls classVarNames asStringWith:' ')
- poolDictionaries:cls poolDictionaries
- category:'** tmp **'.
- cls methodDictionary do:[:each |
- copy compile:each source classified:each category.
- ].
- cls class methodDictionary do:[:each |
- copy class compile:each source classified:each category.
- ].
- (copy inheritsFrom:StandaloneStartup) ifTrue:[
- startup := copy.
- ].
- ].
- ].
+ copy := cls superclass
+ subclass: cls nameWithoutPrefix
+ instanceVariableNames:(cls instVarNames asStringWith:' ')
+ classVariableNames:(cls classVarNames asStringWith:' ')
+ poolDictionaries:cls poolDictionaries
+ category:'** tmp **'.
+ cls methodDictionary do:[:each |
+ copy compile:each source classified:each category.
+ ].
+ cls class methodDictionary do:[:each |
+ copy class compile:each source classified:each category.
+ ].
+ (copy inheritsFrom:StandaloneStartup) ifTrue:[
+ startup := copy.
+ ].
+ ].
+ ].
"/ Create project definition class.
Class packageQuerySignal answer:package do:[
- packageDef := ProjectDefinition
- definitionClassForPackage:package
- projectType:packageType
- createIfAbsent:true.
- packageDef theNonMetaclass
- forEachContentsMethodsCodeToCompileDo:[:code :category | packageDef theMetaclass compile:code classified:category ]
- "/ignoreOldEntries: false
- ignoreOldDefinition: false.
- packageDef isApplicationDefinition ifTrue:[
- packageDef class compile:'startupClassName ^ ' , startup fullName storeString.
- ].
+ packageDef := ProjectDefinition
+ definitionClassForPackage:package
+ projectType:packageType
+ createIfAbsent:true.
+
+ packageDef class compile:'applicationIconFileName ^ nil'.
+ packageDef theNonMetaclass
+ forEachContentsMethodsCodeToCompileDo:[:code :category | packageDef theMetaclass compile:code classified:category ]
+ "/ignoreOldEntries: false
+ ignoreOldDefinition: false.
+ packageDef isApplicationDefinition ifTrue:[
+ packageDef class compile:'startupClassName ^ ' , startup fullName storeString.
+ ].
].
"/ Fileout to package directory...
packageDef classes do:[:class |
- | container |
+ | container |
- container := (class fullName copyReplaceAll:$: with:$_) , '.st'.
- (packageDir / container)
- writingFileDo:[:f |
- AbstractSourceCodeManager
- fileOutSourceCodeOf:class
- on:f
- withTimeStamp:false
- withInitialize:true
- withDefinition:true
- methodFilter:[:mth | mth package = package ]
- ]
+ container := (class fullName copyReplaceAll:$: with:$_) , '.st'.
+ (packageDir / container)
+ writingFileDo:[:f |
+ AbstractSourceCodeManager
+ fileOutSourceCodeOf:class
+ on:f
+ withTimeStamp:false
+ withInitialize:true
+ withDefinition:true
+ methodFilter:[:mth | mth package = package ]
+ ]
].
"/ Generate build support files...
- packageDef fileNamesToGenerate keys do:[:filename |
- | file |
+ packageDef fileNamesToGenerate keys
+ reject:[:filename |
+ "/ some exclusions javaBundle
+ packageDef javaBundle isNil
+ and:[
+ #(
+ 'java/build.xml'
+ 'java/build.auto.xml'
+ ) includes:filename
+ ]
+ ]
+ thenDo:[:filename |
+ | file |
- file := (packageDir / filename).
- file directory recursiveMakeDirectory.
- file writingFileDo:[:f | f nextPutAll:(packageDef generateFile:filename) ].
- ].
+ file := (packageDir / filename).
+ file directory recursiveMakeDirectory.
+ file writingFileDo:[:f | f nextPutAll:(packageDef generateFile:filename) ].
+ ].
self make.