Subversion Repositories DevTools

Rev

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

Rev 4501 Rev 4551
Line 603... Line 603...
603 
    push( @ScmDepends, "$file" );
 603 
    push( @ScmDepends, "$file" );
604 
 
 604 
 
605 
#.. Platform (defines ScmToolset)
 605 
#.. Platform (defines ScmToolset)
606 
#
 606 
#
607 
    if ( ( %::ScmBuildProducts ) &&      # interface/build.cfg
 607 
    if ( ( %::ScmBuildProducts ) &&      # interface/build.cfg
608 
            $::ScmBuildProducts{ $ScmPlatform } )
 608 
           $::ScmBuildProducts{ $ScmPlatform } )
609 
    {
 609 
    {
610 
        my( @args ) = split( ',', $::ScmBuildProducts{ $ScmPlatform } );
 610 
        my( @args ) = split( ',', $::ScmBuildProducts{ $ScmPlatform } );
611 
 
 611 
 
612 
        $ScmProduct = $args[0];
 612 
        $ScmProduct = $args[0];
613 
        $ScmTarget = $args[1];
 613 
        $ScmTarget = $args[1];
Line 628... Line 628...
628 
 
 628 
 
629 
                                                # Platform specific
 629 
                                                # Platform specific
630 
        MakeIf::PackageDirs( \@ScmPlatformDirs, $ScmPlatform );
 630 
        MakeIf::PackageDirs( \@ScmPlatformDirs, $ScmPlatform );
631 
        push @ScmPlatformDirs, "$::GBE_CONFIG"; # .. plus default
 631 
        push @ScmPlatformDirs, "$::GBE_CONFIG"; # .. plus default
632 
 
 632 
 
- 
 
 633 
        #   Map all GENERIC builds onto the one platformm definition
- 
 
 634 
        my $platformDefs = $ScmPlatform;
- 
 
 635 
        $platformDefs = 'GENERIC' if ($::BUILDINFO{$ScmPlatform}{IS_GENERIC});
- 
 
 636 
 
633 
        $file = Require( "PLATFORM", $ScmPlatform,
 637 
        $file = Require( "PLATFORM", $platformDefs,
634 
                    "Platform definition ", @ScmPlatformDirs );
 638 
                    "Platform definition ", @ScmPlatformDirs );
635 
    }
 639 
    }
636 
    push( @ScmDepends, "$file" );
 640 
    push( @ScmDepends, "$file" );
637 
 
 641 
 
638 
    Error( "Toolset undefined for platform $ScmPlatform ...")
 642 
    Error( "Toolset undefined for platform $ScmPlatform ...")