class: Tools::ProjectBuilder
authorClaus Gittinger <cg@exept.de>
Tue, 28 Jan 2014 21:48:47 +0100
changeset 3072117522ff72bc
parent 3071 e69992cb4b24
child 3073 ad458a6e1a83
class: Tools::ProjectBuilder
changed: #makeWithOutputTo:errorTo:
ProjectBuilder.st
     1.1 --- a/ProjectBuilder.st	Sun Jan 26 13:41:15 2014 +0100
     1.2 +++ b/ProjectBuilder.st	Tue Jan 28 21:48:47 2014 +0100
     1.3 @@ -942,7 +942,7 @@
     1.4  !
     1.5  
     1.6  makeWithOutputTo:stdOut errorTo:stdErr
     1.7 -    |module directory makeCommand|
     1.8 +    |module directory makeCommand forceArg|
     1.9  
    1.10      module := package module.
    1.11      directory := package directory.
    1.12 @@ -952,10 +952,13 @@
    1.13          usedCompiler := ParserFlags usedCompiler.
    1.14      ].
    1.15      makeCommand := self makeCommandOfCompiler:usedCompiler.
    1.16 -
    1.17 +    forceArg := ''.
    1.18 +    
    1.19      "/ makeCommand := makeCommand, ' TOP=', mySTXTopDirectory pathName.
    1.20  
    1.21      OperatingSystem isUNIXlike ifTrue:[
    1.22 +        forceArg := ' FORCE='.
    1.23 +
    1.24          "/ generate the makefile first
    1.25          self activityNotification:('sh %1/rules/stmkmf (in %2)' 
    1.26                      bindWith:mySTXTopDirectory pathName    
    1.27 @@ -973,7 +976,7 @@
    1.28          "/ generate the library
    1.29          self activityNotification:(makeCommand,' classLibRule').
    1.30          OperatingSystem
    1.31 -            executeCommand:(makeCommand,' classLibRule FORCE=')
    1.32 +            executeCommand:(makeCommand,' classLibRule',forceArg)
    1.33              inputFrom:nil
    1.34              outputTo:stdOut
    1.35              errorTo:stdErr
    1.36 @@ -984,7 +987,7 @@
    1.37              self activityNotification:(makeCommand,' exe').
    1.38              OperatingSystem
    1.39                  "/ generate the executable
    1.40 -                executeCommand:(makeCommand,' exe FORCE=')
    1.41 +                executeCommand:(makeCommand,' exe',forceArg)
    1.42                  inputFrom:nil
    1.43                  outputTo:stdOut
    1.44                  errorTo:stdErr
    1.45 @@ -1004,8 +1007,7 @@
    1.46          ]
    1.47      ]
    1.48  
    1.49 -    "Modified: / 03-09-2012 / 19:47:15 / cg"
    1.50 -    "Modified (comment): / 06-09-2012 / 16:22:38 / cg"
    1.51 +    "Modified: / 28-01-2014 / 21:48:07 / cg"
    1.52  !
    1.53  
    1.54  objDirForUsedCompiler