fixes and more flyby helps
authorClaus Gittinger <cg@exept.de>
Mon, 11 Mar 2013 19:39:57 +0100
changeset 2969d03c40cd3fa5
parent 2968 ceb6bb9078db
child 2970 6d37e90dab00
fixes and more flyby helps
ProjectBuilder.st
     1.1 --- a/ProjectBuilder.st	Mon Mar 11 19:39:52 2013 +0100
     1.2 +++ b/ProjectBuilder.st	Mon Mar 11 19:39:57 2013 +0100
     1.3 @@ -248,7 +248,7 @@
     1.4      "Modified: / 06-09-2012 / 16:15:50 / cg"
     1.5  !
     1.6  
     1.7 -buildWithOutputTo:stdOut errorTo:stdErr
     1.8 +buildWithOutputTo:stdOutArg errorTo:stdErrArg
     1.9      "/ intermediate - this will move into a commonly used utility class
    1.10      "/ (where all the project code support will be collected).
    1.11  
    1.12 @@ -565,7 +565,7 @@
    1.13  
    1.14      OperatingSystem isMSWINDOWSlike ifTrue:[
    1.15          files := #( 
    1.16 -                    'librun/genDate.exe'
    1.17 +                    'librun/genDate.com'
    1.18                      'librun/main.c'
    1.19                      'projects/smalltalk/stx_16x16.ico'
    1.20                      'projects/smalltalk/stx_32x32.ico'
    1.21 @@ -839,8 +839,12 @@
    1.22  
    1.23              cls := Smalltalk classNamed:eachClassName.
    1.24              "/ self assert:cls isLoaded.
    1.25 -            cls isLoaded ifTrue:[    
    1.26 -                self createHeaderFileFor:cls in:packageTargetDir
    1.27 +            cls isNil ifTrue:[
    1.28 +                stdErr nextPutLine:('Missing class: ',eachClassName, ' (not present in system. Warning only:subclasses of it will not be compiled)').
    1.29 +            ] ifFalse:[
    1.30 +                cls isLoaded ifTrue:[    
    1.31 +                    self createHeaderFileFor:cls in:packageTargetDir
    1.32 +                ]
    1.33              ].
    1.34          ].
    1.35          self copyResourcesForPackage:eachPackageToFileout.
    1.36 @@ -889,6 +893,7 @@
    1.37  
    1.38      OperatingSystem isUNIXlike ifTrue:[
    1.39          "/ generate the makefile first
    1.40 +        self activityNotification:('sh %1/rules/stmkmf' bindWith:mySTXTopDirectory pathName).
    1.41          OperatingSystem
    1.42              executeCommand:('sh %1/rules/stmkmf' bindWith:mySTXTopDirectory pathName)
    1.43              inputFrom:nil
    1.44 @@ -900,6 +905,7 @@
    1.45  
    1.46      projectDefinitionClass isLibraryDefinition ifTrue:[
    1.47          "/ generate the library
    1.48 +        self activityNotification:(makeCommand,' classLibRule').
    1.49          OperatingSystem
    1.50              executeCommand:(makeCommand,' classLibRule')
    1.51              inputFrom:nil
    1.52 @@ -908,19 +914,22 @@
    1.53              inDirectory:(buildDirectory / module / directory)
    1.54              onError:[:status | self error:'make failed'].
    1.55      ] ifFalse:[
    1.56 -        OperatingSystem
    1.57 -            "/ generate the executable
    1.58 -            executeCommand:(makeCommand,' exe')
    1.59 -            inputFrom:nil
    1.60 -            outputTo:stdOut
    1.61 -            errorTo:stdErr
    1.62 -            inDirectory:(buildDirectory / module / directory)
    1.63 -            onError:[:status | self error:'make failed'].
    1.64 +        (makeExeOnly ? false) ifTrue:[
    1.65 +            self activityNotification:(makeCommand,' exe').
    1.66 +            OperatingSystem
    1.67 +                "/ generate the executable
    1.68 +                executeCommand:(makeCommand,' exe')
    1.69 +                inputFrom:nil
    1.70 +                outputTo:stdOut
    1.71 +                errorTo:stdErr
    1.72 +                inDirectory:(buildDirectory / module / directory)
    1.73 +                onError:[:status | self error:'make failed'].
    1.74  
    1.75 -        (makeExeOnly ? false) ifFalse:[
    1.76 +        ] ifFalse:[
    1.77              "/ generate the self-installable package
    1.78 +            self activityNotification:(makeCommand,' ALL_NP').
    1.79              OperatingSystem
    1.80 -                executeCommand:(makeCommand,' setup')
    1.81 +                executeCommand:(makeCommand,' ALL_NP')
    1.82                  inputFrom:nil
    1.83                  outputTo:stdOut
    1.84                  errorTo:stdErr