class: Tools::ProjectBuilder
authorClaus Gittinger <cg@exept.de>
Thu, 21 Mar 2013 23:12:51 +0100
changeset 2984bfb6db857ea8
parent 2983 068c43183acf
child 2985 57ed21d4e926
class: Tools::ProjectBuilder
changed:
#copySupportFilesForCompilation
#makeWithOutputTo:errorTo:
#setupBuildDirectory
ProjectBuilder.st
     1.1 --- a/ProjectBuilder.st	Thu Mar 21 23:12:17 2013 +0100
     1.2 +++ b/ProjectBuilder.st	Thu Mar 21 23:12:51 2013 +0100
     1.3 @@ -547,14 +547,22 @@
     1.4      files := #().
     1.5  
     1.6      OperatingSystem isMSWINDOWSlike ifTrue:[
     1.7 -        files := files , #( 'librun/genDate.com' ).
     1.8 +        files := files , #( 
     1.9 +                        'librun/genDate.com' 
    1.10 +                    ).
    1.11          usedCompiler = 'tcc' ifTrue:[
    1.12              files := files , #( 
    1.13                          'support/tcc'
    1.14                      ).
    1.15          ].
    1.16      ] ifFalse:[
    1.17 -        files := files , #( 'librun/genDate' ).
    1.18 +        files := files , #( 
    1.19 +                        "/ 'librun/genDate'   -- not needed on unix (done via script)
    1.20 +                        'configurations/myConf' 
    1.21 +                        'configurations/vendorConf' 
    1.22 +                        'configurations/conf.inc' 
    1.23 +                        'configurations/COMMON' 
    1.24 +                    ).
    1.25      ].
    1.26  
    1.27      files do:[:relativePath |
    1.28 @@ -564,10 +572,15 @@
    1.29              and:[ (mySTXTopDirectory / relativePath) modificationTime < (buildDirectory / 'stx' / relativePath) modificationTime
    1.30              "/ and:[ (mySTXTopDirectory / dllRelativePath) sameContentsAs:(targetBuildDir / dllRelativePath) ]
    1.31              ]]) ifFalse:[
    1.32 -                (mySTXTopDirectory / relativePath) recursiveCopyTo:(buildDirectory / 'stx' / relativePath).    
    1.33 +                (buildDirectory / 'stx' / relativePath) directory recursiveMakeDirectory.    
    1.34 +                (mySTXTopDirectory / relativePath) isDirectory ifTrue:[
    1.35 +                    (mySTXTopDirectory / relativePath) recursiveCopyTo:(buildDirectory / 'stx' / relativePath) directory.    
    1.36 +                ] ifFalse:[
    1.37 +                    (mySTXTopDirectory / relativePath) copyTo:(buildDirectory / 'stx' / relativePath) directory.    
    1.38 +                ]
    1.39              ]
    1.40          ] ifFalse:[
    1.41 -            self error:'Missing directory: ',relativePath printString mayProceed:true.
    1.42 +            self error:'Missing file or directory: ',relativePath printString mayProceed:true.
    1.43          ].
    1.44      ].
    1.45  
    1.46 @@ -935,7 +948,9 @@
    1.47  
    1.48      OperatingSystem isUNIXlike ifTrue:[
    1.49          "/ generate the makefile first
    1.50 -        self activityNotification:('sh %1/rules/stmkmf' bindWith:mySTXTopDirectory pathName).
    1.51 +        self activityNotification:('sh %1/rules/stmkmf (in %2)' 
    1.52 +                    bindWith:mySTXTopDirectory pathName    
    1.53 +                    with:(buildDirectory / module / directory)).
    1.54          OperatingSystem
    1.55              executeCommand:('sh %1/rules/stmkmf' bindWith:mySTXTopDirectory pathName)
    1.56              inputFrom:nil
    1.57 @@ -1018,6 +1033,8 @@
    1.58  !
    1.59  
    1.60  setupBuildDirectory
    1.61 +    self activityNotification:('Building in %1' bindWith:buildDirectory pathName).
    1.62 +
    1.63      buildDirectory exists ifFalse:[
    1.64          buildDirectory recursiveMakeDirectory.
    1.65      ].
    1.66 @@ -1027,6 +1044,7 @@
    1.67  
    1.68      self copyDirectoryForBuild:'include'.
    1.69      self copyDirectoryForBuild:'rules'.
    1.70 +
    1.71      OperatingSystem isUNIXlike ifTrue:[
    1.72          self recursiveCopyDirectoryForBuild:'configurations'.
    1.73      ]