#BUGFIX by cg
authorClaus Gittinger <cg@exept.de>
Mon, 06 Jun 2016 15:57:16 +0200
changeset 33085cbec72e27fa
parent 3307 58f20c91f623
child 3309 cc9feb931733
#BUGFIX by cg
class: Tools::ProjectBuilder
changed:
#buildWithOutputTo:errorTo:
#makeCommandOfCompiler:
#makeWithOutputTo:errorTo:
ProjectBuilder.st
     1.1 --- a/ProjectBuilder.st	Mon Jun 06 14:45:52 2016 +0200
     1.2 +++ b/ProjectBuilder.st	Mon Jun 06 15:57:16 2016 +0200
     1.3 @@ -273,6 +273,7 @@
     1.4  
     1.5      usedCompiler isNil ifTrue:[
     1.6          usedCompiler := ParserFlags usedCompiler.
     1.7 +        usedCompiler isNil ifTrue:[ self error:'no compiler defined (settings)'. ].
     1.8      ].
     1.9  
    1.10      projectDefinitionClass := ProjectDefinition definitionClassForPackage:package.
    1.11 @@ -327,7 +328,7 @@
    1.12      ].
    1.13      self activityNotification:'Generating source files...'.
    1.14      self generateSourceFiles.
    1.15 -    self makeQuick ifFalse:[
    1.16 +    false "self makeQuick" ifFalse:[
    1.17          self activityNotification:'Copying dlls for linkage...'.
    1.18          self copyDLLsForLinkage.
    1.19          self activityNotification:'Copying support files for compilation and linkage...'.
    1.20 @@ -335,10 +336,9 @@
    1.21          self copySupportFilesForLinkage.
    1.22          self copyStartupFilesFromSmalltalk.
    1.23      ].
    1.24 -    self activityNotification:'Executing make...'.
    1.25      self makeWithOutputTo:stdOut errorTo:stdErr.
    1.26  
    1.27 -    "Modified: / 06-06-2016 / 12:13:01 / cg"
    1.28 +    "Modified: / 06-06-2016 / 15:16:28 / cg"
    1.29  ! !
    1.30  
    1.31  !ProjectBuilder methodsFor:'building/private'!
    1.32 @@ -934,27 +934,30 @@
    1.33  !
    1.34  
    1.35  makeCommandOfCompiler:usedCompiler
    1.36 -    usedCompiler = 'bcc' ifTrue:[ 
    1.37 -        ^ 'bmake'.
    1.38 -    ].
    1.39 -    usedCompiler = 'vc' ifTrue:[ 
    1.40 -        ^ 'vcmake'. "/ compilerFlag := '-DUSEVC' 
    1.41 -    ].
    1.42 -    usedCompiler = 'lcc' ifTrue:[ 
    1.43 -        ^ 'lccmake'. "/ compilerFlag := '-DUSELCC' 
    1.44 -    ].
    1.45 -    usedCompiler = 'tcc' ifTrue:[ 
    1.46 -        ^ 'tccmake'. "/ compilerFlag := '-DUSELCC' 
    1.47 -    ].
    1.48 -    usedCompiler = 'mingw' ifTrue:[ 
    1.49 -        ^ 'mingwmake'.  "/ compilerFlag := '-DUSEMINGW' 
    1.50 -    ].
    1.51 -    true "usedCompiler = 'gcc'" ifTrue:[ 
    1.52 -        ^ 'make'.       "/ compilerFlag := '-DUSEGCC' 
    1.53 +    usedCompiler notNil ifTrue:[
    1.54 +        usedCompiler = 'bcc' ifTrue:[ 
    1.55 +            ^ 'bmake'.
    1.56 +        ].
    1.57 +        usedCompiler = 'vc' ifTrue:[ 
    1.58 +            ^ 'vcmake'. "/ compilerFlag := '-DUSEVC' 
    1.59 +        ].
    1.60 +        usedCompiler = 'lcc' ifTrue:[ 
    1.61 +            ^ 'lccmake'. "/ compilerFlag := '-DUSELCC' 
    1.62 +        ].
    1.63 +        usedCompiler = 'tcc' ifTrue:[ 
    1.64 +            ^ 'tccmake'. "/ compilerFlag := '-DUSELCC' 
    1.65 +        ].
    1.66 +        usedCompiler = 'mingw' ifTrue:[ 
    1.67 +            ^ 'mingwmake'.  "/ compilerFlag := '-DUSEMINGW' 
    1.68 +        ].
    1.69 +        true "usedCompiler = 'gcc'" ifTrue:[ 
    1.70 +            ^ 'make'.       "/ compilerFlag := '-DUSEGCC' 
    1.71 +        ].
    1.72      ].
    1.73      self error:'unknown compiler specified'.
    1.74  
    1.75      "Created: / 03-09-2012 / 19:46:07 / cg"
    1.76 +    "Modified: / 06-06-2016 / 15:11:54 / cg"
    1.77  !
    1.78  
    1.79  makeWithOutputTo:stdOut errorTo:stdErr
    1.80 @@ -963,11 +966,13 @@
    1.81      module := package module.
    1.82      directory := package directory.
    1.83  
    1.84 -    makeCommand := ParserFlags makeCommand.
    1.85 +    "/ makeCommand := ParserFlags makeCommand.
    1.86      usedCompiler isNil ifTrue:[
    1.87          usedCompiler := ParserFlags usedCompiler.
    1.88 +        usedCompiler isNil ifTrue:[ self error:'no compiler defined (settings)'. ].
    1.89      ].
    1.90      makeCommand := self makeCommandOfCompiler:usedCompiler.
    1.91 +    self activityNotification:'Executing make... (',makeCommand,')'.
    1.92      forceArg := ''.
    1.93      
    1.94      "/ makeCommand := makeCommand, ' TOP=', mySTXTopDirectory pathName.
    1.95 @@ -1019,7 +1024,7 @@
    1.96          ]
    1.97      ]
    1.98  
    1.99 -    "Modified: / 28-01-2014 / 21:48:07 / cg"
   1.100 +    "Modified: / 06-06-2016 / 15:17:00 / cg"
   1.101  !
   1.102  
   1.103  objDirForUsedCompiler