Changeset 4551

Show
Ignore:
Timestamp:
02/09/07 16:00:32 (1 year ago)
Author:
morris
Message:

Fix building multiple targets

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • build/trunk/build

    r4548 r4551  
    11#!/bin/sh 
    22 
    3 $(dirname $0)/scripts/build.pl $(basename $0) $1 $2 
     3$(dirname $0)/scripts/build.pl $(basename $0) $* 
  • build/trunk/build.conf

    r4550 r4551  
     1# Default projects 
     2projects= 
     3 
    14# Default Xcode targets 
    25xcode_config=Test/Universal 
  • build/trunk/clean

    r4547 r4551  
    11#!/bin/sh 
    22 
    3 $(dirname $0)/scripts/build.pl $(basename $0) $1 $2 
     3$(dirname $0)/scripts/build.pl $(basename $0) $* 
  • build/trunk/nightly

    r4547 r4551  
    11#!/bin/sh 
    22 
    3 $(dirname $0)/scripts/build.pl $(basename $0) $1 $2 
     3$(dirname $0)/scripts/build.pl $(basename $0) $* 
  • build/trunk/projects/wire

    r4547 r4551  
    1 SVN_BRANCH=trunk 
     1SVN_PATH=wire 
    22 
    33CONFIGURE=1 
  • build/trunk/release

    r4547 r4551  
    11#!/bin/sh 
    22 
    3 $(dirname $0)/scripts/build.pl $(basename $0) $1 $2 
     3$(dirname $0)/scripts/build.pl $(basename $0) $* 
  • build/trunk/scripts/build.pl

    r4547 r4551  
    4444 
    4545sub main { 
    46         my($style, $project, $target) = @_; 
    47          
    48         unless($project) { 
    49                 usage(); 
    50         } 
    51          
    52         $target = "all" unless $target; 
     46        my($style, $project) = @_; 
    5347         
    5448        my $c = Config::INI::Simple->new(); 
     
    6054        } 
    6155         
    62         build($style, $project, $target, $config); 
     56        if($project) { 
     57                build($style, $project, $config); 
     58        } 
     59        elsif($config->{"projects"}) { 
     60                map { build($style, $_, $config); } split(/\s+/, $config->{"projects"}); 
     61        } 
     62        else { 
     63                opendir(DH, $PROJECTS_PATH) or die "$PROJECTS_PATH: $!"; 
     64                map { build($style, $_, $config); } grep { !/^\./ } readdir(DH); 
     65                closedir(DH); 
     66        } 
    6367} 
    6468 
    6569 
    6670sub build { 
    67         my($style, $project, $target, $config) = @_; 
     71        my($style, $project, $config) = @_; 
    6872 
    6973        my($host, $os, $arch) = hostinfo(); 
     
    267271 
    268272 
    269 sub usage { 
    270         my($string) = @_; 
    271         my $self = File::Basename::basename($0); 
    272          
    273         print "Usage: $self project [target]\n"; 
    274          
    275         exit(2); 
    276 
    277  
    278  
    279  
    280 sub error { 
    281         my($string) = @_; 
    282         my $self = File::Basename::basename($0); 
    283          
    284         print "$self: $string\n"; 
    285          
    286         exit(2); 
    287 
    288  
    289  
    290 main($ARGV[0], $ARGV[1], $ARGV[2]); 
     273main($ARGV[0], $ARGV[1]);