Subversion Repositories DevTools

Rev

Rev 281 | Rev 287 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 281 Rev 283
Line 220... Line 220...
220
    #
220
    #
221
    #   In clobber mode System commands will not force termination
221
    #   In clobber mode System commands will not force termination
222
    #   otherwise, within build.pl, a failed system command will die.
222
    #   otherwise, within build.pl, a failed system command will die.
223
    #
223
    #
224
    SystemConfig ('UseShell' => 1,
224
    SystemConfig ('UseShell' => 1,
225
                  'ExitOnError' => ($Clobber eq 0) );
225
                  'ExitOnError' => ($Clobber == 0) );
226
}
226
}
227
 
227
 
228
 
228
 
229
#-------------------------------------------------------------------------------
229
#-------------------------------------------------------------------------------
230
# Function        : Log
230
# Function        : Log
Line 1017... Line 1017...
1017
    else
1017
    else
1018
    {
1018
    {
1019
        @platforms = ExpandPlatforms( $platform );  # aliasing
1019
        @platforms = ExpandPlatforms( $platform );  # aliasing
1020
    }
1020
    }
1021
 
1021
 
1022
    foreach $platform ( @platforms )
1022
    foreach my $platform ( @platforms )
1023
    {
1023
    {
1024
        next if ( $platform =~ /^--/ );         # argument, ignore
1024
        next if ( $platform =~ /^--/ );         # argument, ignore
1025
 
1025
 
1026
        PlatformArgument( $platform, @arguments );
1026
        PlatformArgument( $platform, @arguments );
1027
    }
1027
    }
Line 1368... Line 1368...
1368
    else
1368
    else
1369
    {
1369
    {
1370
        Log( "DirTree .... $dirfile within $dirhead" );
1370
        Log( "DirTree .... $dirfile within $dirhead" );
1371
        System( "$::GBE_BIN/mkdir -p $dirhead" );
1371
        System( "$::GBE_BIN/mkdir -p $dirhead" );
1372
    
1372
    
1373
        open( DIRFILE, $dirfile ) ||
1373
        open( DIRFILE, '<' ,$dirfile ) ||
1374
            Error( "cannot open '$dirfile'" );
1374
            Error( "cannot open '$dirfile'" );
1375
 
1375
 
1376
        while( $dirname = <DIRFILE> )
1376
        while( $dirname = <DIRFILE> )
1377
        {
1377
        {
1378
            chop $dirname;
1378
            chop $dirname;
Line 1569... Line 1569...
1569
#                   local       1 - From local package repository
1569
#                   local       1 - From local package repository
1570
#
1570
#
1571
sub PackageLocate
1571
sub PackageLocate
1572
{
1572
{
1573
    my ($name, $uversion ) = @_;
1573
    my ($name, $uversion ) = @_;
1574
    my( @dpkgs, $pdir, $pkg );
1574
    my $pkg;
1575
    my $local = 1;
1575
    my $local = 1;
1576
    my $sandbox = 1;
1576
    my $sandbox = 1;
1577
    my $isa_cache = 0;
1577
    my $isa_cache = 0;
1578
    my $version;
1578
    my $version;
1579
    my ($pn, $pv, $ps ) = SplitPackage ($name, $uversion );
1579
    my ($pn, $pv, $ps ) = SplitPackage ($name, $uversion );
Line 1679... Line 1679...
1679
                     "Both a link and a package where found - using the link" )
1679
                     "Both a link and a package where found - using the link" )
1680
                                                            if ( -d $non_link );
1680
                                                            if ( -d $non_link );
1681
 
1681
 
1682
            Debug( "           link found -> $pkg" );
1682
            Debug( "           link found -> $pkg" );
1683
            my $link_src = $pkg;
1683
            my $link_src = $pkg;
1684
            open( LNKFILE, "$pkg" ) || Error( "cannot open '$pkg'" );
1684
            open( LNKFILE, '<', "$pkg" ) || Error( "cannot open '$pkg'" );
1685
            $pkg = <LNKFILE>;                   # real path
1685
            $pkg = <LNKFILE>;                   # real path
1686
            close( LNKFILE );
1686
            close( LNKFILE );
1687
            $pkg = '' unless ( $pkg );
1687
            $pkg = '' unless ( $pkg );
1688
            chomp $pkg;
1688
            chomp $pkg;
1689
 
1689
 
Line 1722... Line 1722...
1722
    #   This is an error, although it can be bypassed
1722
    #   This is an error, although it can be bypassed
1723
    #
1723
    #
1724
    Error ("Required package not found: '$name/$version'" ) unless ( $NoPackageError );
1724
    Error ("Required package not found: '$name/$version'" ) unless ( $NoPackageError );
1725
 
1725
 
1726
    Log( "WARNING .... Package not available: '$name/$version'" );
1726
    Log( "WARNING .... Package not available: '$name/$version'" );
1727
    return undef;
1727
    return;
1728
}
1728
}
1729
 
1729
 
1730
 
1730
 
1731
#-------------------------------------------------------------------------------
1731
#-------------------------------------------------------------------------------
1732
# Function        : LinkEntry
1732
# Function        : LinkEntry
Line 2128... Line 2128...
2128
        #   Expand platforms into known aliases
2128
        #   Expand platforms into known aliases
2129
        #
2129
        #
2130
        for my $word (@filter)
2130
        for my $word (@filter)
2131
        {
2131
        {
2132
            my $platform;
2132
            my $platform;
2133
            my $hash_name;
-
 
2134
 
2133
 
2135
            if ( $word =~ m/^--ALL/i )
2134
            if ( $word =~ m/^--ALL/i )
2136
            {
2135
            {
2137
                %result = %{$part_to_platform{'PLATFORM'}};
2136
                %result = %{$part_to_platform{'PLATFORM'}};
2138
            }
2137
            }
Line 2824... Line 2823...
2824
    my ( $Prefix, $Type, $Mode ) = @_;
2823
    my ( $Prefix, $Type, $Mode ) = @_;
2825
    my $ModePrefix;
2824
    my $ModePrefix;
2826
    my $Style = "C";
2825
    my $Style = "C";
2827
    my $FileName;
2826
    my $FileName;
2828
    my $VersionFiles;
2827
    my $VersionFiles;
2829
    my $IconName;
-
 
2830
    my $DefinitionsOnly;
-
 
2831
    my @opts;
2828
    my @opts;
2832
    my $supports_opts;
2829
    my $supports_opts;
2833
 
2830
 
2834
    StartBuildPhase();                          # Starting the build phase. No more data collection
2831
    StartBuildPhase();                          # Starting the build phase. No more data collection
2835
 
2832
 
Line 3010... Line 3007...
3010
#
3007
#
3011
# Inputs          : None
3008
# Inputs          : None
3012
#
3009
#
3013
# Returns         : Nothing
3010
# Returns         : Nothing
3014
#
3011
#
3015
sub BuildConfig()
3012
sub BuildConfig
3016
{
3013
{
3017
    Error( "No BuildInterface directive encountered\n" )
3014
    Error( "No BuildInterface directive encountered\n" )
3018
        unless ($BUILDINTERFACE);
3015
        unless ($BUILDINTERFACE);
3019
 
3016
 
3020
    my $fh = ConfigurationFile::New( "$BUILDINTERFACE/build.cfg");
3017
    my $fh = ConfigurationFile::New( "$BUILDINTERFACE/build.cfg");