Subversion Repositories DevTools

Rev

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

Rev 5262 Rev 5410
Line 494... Line 494...
494 
{
 494 
{
495 
 
 495 
 
496 
    #
 496 
    #
497 
    #   Merge any delayed aliases with the complete set of alias
 497 
    #   Merge any delayed aliases with the complete set of alias
498 
    #   Delayed alias are not used in expansions during the processing
 498 
    #   Delayed alias are not used in expansions during the processing
499 
    #   of platforms and targets, but can be used to pick up
 499 
    #   of platforms and targets, but can be used to pick up errors
500 
    #
 500 
    #
501 
    while ( my($key,$value) = each(%BUILDALIAS_DELAY) )
 501 
    while ( my($key,$value) = each(%BUILDALIAS_DELAY) )
502 
    {
 502 
    {
503 
        if ( exists($BUILDALIAS{$key}) )
 503 
        if ( exists($BUILDALIAS{$key}) )
504 
        {
 504 
        {
505 
            Warning( "BuildAlias() duplicates internal alias '$key' -- internal alias ignored" );
 505 
            abtWarning("BuildAlias() duplicates internal alias '$key'");
506 
            next;
 506 
            next;
507 
        }
 507 
        }
508 
        $BUILDALIAS{$key} = $value;
 508 
        $BUILDALIAS{$key} = $value;
509 
    }
 509 
    }
- 
 
 510 
    ErrorDoExit();
510 
 
 511 
 
511 
    foreach my $alias ( keys %BUILDALIAS_TARGETS )
 512 
    foreach my $alias ( keys %BUILDALIAS_TARGETS )
512 
    {
 513 
    {
513 
        Debug( "BuildTargetAlias($alias)" );
 514 
        Debug( "BuildTargetAlias($alias)" );
514 
 
 515 
 
Line 933... Line 934...
933 
    #
 934 
    #
934 
    my $platform = $pInfo->{PLATFORM};
 935 
    my $platform = $pInfo->{PLATFORM};
935 
 
 936 
 
936 
    if ( defined ( $BUILDINFO{$platform}) && ! $Clobber)
 937 
    if ( defined ( $BUILDINFO{$platform}) && ! $Clobber)
937 
    {
 938 
    {
938 
        my $msg = "$fname() duplicate platform '$platform'";
 939 
        abtWarning("$fname() duplicate platform '$platform'");
939 
 
 - 
 
940 
        #   ABT Mode is a bit more forgiving, but only for backward compatability
 - 
 
941 
        #   Otherwise force users to fix the build.p files.
 - 
 
942 
        if ( $::GBE_ABT )
- 
 
943 
        {
 - 
 
944 
            Warning( $msg . ' -- ignored in ABT Mode' );
 - 
 
945 
            return;
 - 
 
946 
        }
 - 
 
947 
        Error($msg);
 940 
        ErrorDoExit();
948 
    }
 941 
    }
949 
 
 942 
 
950 
    #
 943 
    #
951 
    #   Add platform (tag) to various lists
 944 
    #   Add platform (tag) to various lists
952 
    #
 945 
    #
Line 4035... Line 4028...
4035 
 
 4028 
 
4036 
    return $path;
 4029 
    return $path;
4037 
}
 4030 
}
4038 
 
 4031 
 
4039 
#-------------------------------------------------------------------------------
 4032 
#-------------------------------------------------------------------------------
- 
 
 4033 
# Function        : abtWarning
- 
 
 4034 
#
- 
 
 4035 
# Description     : User Error, Build System Warning
- 
 
 4036 
#                   Used to tighten up builds, but to retain BuildSystem compatability
- 
 
 4037 
#
- 
 
 4038 
#                   Must use "ErrorDoExit();" to force termination
- 
 
 4039 
#                   Multiple error messages can be displayed before termination
- 
 
 4040 
#
- 
 
 4041 
#                   ABT Mode is a bit more forgiving, but only for backward compatability
- 
 
 4042 
#                   Otherwise force users to fix the build.pl files.
- 
 
 4043 
#
- 
 
 4044 
# Inputs          : $msg            - Message to display
- 
 
 4045 
#
- 
 
 4046 
# Returns         : May not return
- 
 
 4047 
#
- 
 
 4048 
sub abtWarning
- 
 
 4049 
{
- 
 
 4050 
    my ($msg) = @_;
- 
 
 4051 
    if ( $::GBE_ABT )
- 
 
 4052 
    {
- 
 
 4053 
        Warning( $msg . ' -- ignored in ABT Mode' );
- 
 
 4054 
        return;
- 
 
 4055 
    }
- 
 
 4056 
    ReportError($msg);
- 
 
 4057 
}
- 
 
 4058 
 
- 
 
 4059 
#-------------------------------------------------------------------------------
4040 
# Function        : Usage
 4060 
# Function        : Usage
4041 
#
 4061 
#
4042 
# Description     : Display program usage information
 4062 
# Description     : Display program usage information
4043 
#
 4063 
#
4044 
# Inputs          : args            - Text message to display
 4064 
# Inputs          : args            - Text message to display