Subversion Repositories DevTools

Rev

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

Rev 7304 Rev 7307
Line 347... Line 347...
347 
# Returns         : Reserved word or none
 347 
# Returns         : Reserved word or none
348 
#
 348 
#
349 
sub isKeyword
 349 
sub isKeyword
350 
{
 350 
{
351 
    my ($test) = @_;
 351 
    my ($test) = @_;
352 
    foreach my $keyword ( qw (NATIVE TOOLSET GENERIC INSTRUMENT PKG_DEB PKG_RPM PRG_WIN))
 352 
    foreach my $keyword ( @PlatformConfig::BuildKeywords )
353 
    {
 353 
    {
354 
        return $keyword if (uc($test) eq $keyword);
 354 
        return $keyword if (uc($test) eq $keyword);
355 
    }
 355 
    }
356 
 
 356 
 
357 
    return undef;
 357 
    return undef;
Line 420... Line 420...
420 
        }
 420 
        }
421 
    }
 421 
    }
422 
    Error( "BuildAlias() missing alias specifications" )
 422 
    Error( "BuildAlias() missing alias specifications" )
423 
        if ( $alias eq "" );
 423 
        if ( $alias eq "" );
424 
 
 424 
 
- 
 
 425 
    if ( isKeyword($alias) ) {
425 
    Error ("BuildAlias() attempt to alias a keyword: $alias")
 426 
        Error   ("BuildAlias() attempt to alias a keyword: $alias") unless defined($::GBE_ABT);
426 
        if ( isKeyword($alias) );
 427 
        Warning ("BuildAlias() attempt to alias a keyword: $alias -- builtin ignored");
- 
 
 428 
    }
427 
 
 429 
 
428 
    #
 430 
    #
429 
    #   If we need to recalculate the alias based on targets, then tag the alias
 431 
    #   If we need to recalculate the alias based on targets, then tag the alias
430 
    #   to be processed
 432 
    #   to be processed
431 
    #
 433 
    #
Line 1492... Line 1494...
1492 
    Log( "DPKG_REPLI . $::GBE_DPKG_REPLICA" );
 1494 
    Log( "DPKG_REPLI . $::GBE_DPKG_REPLICA" );
1493 
    Log( "DPKG_CACHE . $::GBE_DPKG_CACHE" );
 1495 
    Log( "DPKG_CACHE . $::GBE_DPKG_CACHE" );
1494 
    Log( "DPKG_LOCAL . $::GBE_DPKG_LOCAL" );
 1496 
    Log( "DPKG_LOCAL . $::GBE_DPKG_LOCAL" );
1495 
    Log( "DPKG_SBOX .. $::GBE_DPKG_SBOX" );
 1497 
    Log( "DPKG_SBOX .. $::GBE_DPKG_SBOX" );
1496 
    Log( "Sandbox .... Development" );
 1498 
    Log( "Sandbox .... Development" );
1497 
    Log( "LocalFilter. $::GBE_SANDBOX/buildfilter") if ( $::GBE_SANDBOX && -f $::GBE_SANDBOX . '/buildfilter' );
 1499 
    Log( "LocalFilter. $::GBE_DPKG_SBOX/buildfilter") if ( $::GBE_DPKG_SBOX && -f $::GBE_DPKG_SBOX . '/buildfilter' );
1498 
 
 1500 
 
1499 
    #
 1501 
    #
1500 
    #   Generate a list of platforms that are completely unknown to JATS
 1502 
    #   Generate a list of platforms that are completely unknown to JATS
1501 
    #   May be the result of a user typo or a guess
 1503 
    #   May be the result of a user typo or a guess
1502 
    #
 1504 
    #
Line 2087... Line 2089...
2087 
            my $link_src = $pkg;
 2089 
            my $link_src = $pkg;
2088 
            $pkg = TagFileRead($pkg);
 2090 
            $pkg = TagFileRead($pkg);
2089 
            $pkg =~ s~\\~/~g;
 2091 
            $pkg =~ s~\\~/~g;
2090 
            if ($pkg =~ s~^GBE_SANDBOX/~$::GBE_SANDBOX/~)
 2092 
            if ($pkg =~ s~^GBE_SANDBOX/~$::GBE_SANDBOX/~)
2091 
            {
 2093 
            {
- 
 
 2094 
                    $pkgFromSandbox++;
- 
 
 2095 
 
2092 
                    # If the target sandbox is in the 'deploymode' then the package
 2096 
                    # If the target sandbox is in the 'deploymode' then the package
2093 
                    # will not be in the expected location. It will be in a 'build/deploy'
 2097 
                    # will not be in the expected location. It will be in a 'build/deploy'
2094 
                    # subdir. Remove the pkg/name dir to get to the root of the package
 2098 
                    # subdir. Remove the pkg/name dir to get to the root of the package
2095 
                    my @dirs = File::Spec->splitdir( $pkg );
 2099 
                    my @dirs = File::Spec->splitdir( $pkg );
2096 
                    splice(@dirs, -2);
 2100 
                    splice(@dirs, -2);
Line 3340... Line 3344...
3340 
    #   Calculate the aliases that are being extracted from targets
 3344 
    #   Calculate the aliases that are being extracted from targets
3341 
    #
 3345 
    #
3342 
    Process_TargetAlias();
 3346 
    Process_TargetAlias();
3343 
 
 3347 
 
3344 
    #
 3348 
    #
3345 
    #   Calculate NATIVE and INSTRUMENT alias
 3349 
    #   Calculate defined aliases
3346 
    #       Limit the Aliases to active platforms
 3350 
    #       Limit the Aliases to active platforms
3347 
    #       Another LMOS kudge. LMOS targets pick up alias from their base target
 3351 
    #       Another LMOS kudge. LMOS targets pick up alias from their base target
- 
 
 3352 
    #       ie: NATIVE INSTRUMENT PKG_WIN PKG_RPM PKG_DEB SK
3348 
    #
 3353 
    #
3349 
    foreach my $alias (qw( NATIVE INSTRUMENT PKG_WIN PKG_RPM PKG_DEB))
 3354 
    foreach my $alias ( @PlatformConfig::BuildAliases )
3350 
    {
 3355 
    {
3351 
        if (exists $BUILDALIAS{$alias})
 3356 
        if (exists $BUILDALIAS{$alias})
3352 
        {
 3357 
        {
- 
 
 3358 
            # Will occur if GBE_ABT has been set, for backward compatibility
3353 
            Warning("User has manually specified a $alias alias",'Default alias will not be set.');
 3359 
            Warning("User has manually specified a $alias alias",'Default alias will not be set.');
3354 
        }
 3360 
        }
3355 
        else
 3361 
        else
3356 
        {
 3362 
        {
3357 
            my %activePlatformMap;
 3363 
            my %activePlatformMap;