Subversion Repositories DevTools

Rev

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

Rev 373 Rev 379
Line 8556... Line 8556...
8556 
    {
 8556 
    {
8557 
        my( $root ) = @_;
 8557 
        my( $root ) = @_;
8558 
        my @pathlist;
 8558 
        my @pathlist;
8559 
        my %seen;
 8559 
        my %seen;
8560 
 
 8560 
 
8561 
 
 - 
 
8562 
        #   eg. SCA_WIN32   and SCA_WIN32       and SCA_SOLARIS
 - 
 
8563 
        #       SCA             WIN32_i386          SPARC
 - 
 
8564 
        #       WIN32           SCA                 SCA
 - 
 
8565 
        #       .               WIN32               SOLARIS
 - 
 
8566 
        #                       .                   .
 - 
 
8567 
        #..
 - 
 
8568 
        PushPath( \@pathlist, \%seen, "$root/\$(GBE_PLATFORM)",   $ScmPlatform );
 - 
 
8569 
        PushPath( \@pathlist, \%seen, "$root/\$(GBE_PRODUCT)",    $ScmProduct );
 - 
 
8570 
 
 - 
 
8571 
        #
 8561 
        #
8572 
        #   Insert extra path elements found in BUILDPLATFORM_PARTS
 8562 
        #   Interface and Local directories are now treated quite
8573 
        #   These will be present for BuildProduct (XXXX,-Uses=YYYY)
 - 
 
8574 
        #   Note: Don't do for LOCAL paths, only INTERFACE
 8563 
        #   diffently. The Local is under our control.
8575 
        #
 8564 
        #
8576 
        if ( $root =~ /INTERFACE/ ) {
 8565 
        if ( $root =~ /INTERFACE/ ) {
- 
 
 8566 
 
- 
 
 8567 
            #   eg. SCA_WIN32   and SCA_WIN32       and SCA_SOLARIS
- 
 
 8568 
            #       SCA             WIN32_i386          SPARC
- 
 
 8569 
            #       WIN32           SCA                 SCA
- 
 
 8570 
            #       .               WIN32               SOLARIS
- 
 
 8571 
            #                       .                   .
- 
 
 8572 
            #..
- 
 
 8573 
 
- 
 
 8574 
            #
- 
 
 8575 
            #   For Interface Path List use the 'PARTS' as calculated within
- 
 
 8576 
            #   the build file. Its good enough for everthing else in JATS
- 
 
 8577 
            #
8577 
            my @parts = @{$::BUILDINFO{$ScmPlatform}{PARTS}};
 8578 
            foreach ( @{$::BUILDINFO{$ScmPlatform}{PARTS}} ) {
- 
 
 8579 
                PushPath( \@pathlist, \%seen, "$root/$_",   $_ );
- 
 
 8580 
            }
- 
 
 8581 
        }
- 
 
 8582 
        else
- 
 
 8583 
        {
- 
 
 8584 
            #
8578 
            foreach ( @parts ) {
 8585 
            #   Local directory
- 
 
 8586 
            #   The user can (should) only install stuff into a few known
- 
 
 8587 
            #   locations.
- 
 
 8588 
            #
- 
 
 8589 
            foreach ( $ScmPlatform, $ScmProduct, $ScmTarget ) {
8579 
                PushPath( \@pathlist, \%seen, "$root/$_",   $_ );
 8590 
                PushPath( \@pathlist, \%seen, "$root/$_",   $_ );
8580 
            }
 8591 
            }
8581 
        }
 8592 
        }
8582 
 
 8593 
 
- 
 
 8594 
        #
- 
 
 8595 
        #   Add OS Common Directory
- 
 
 8596 
        ### May need more testing before being added
- 
 
 8597 
        #
- 
 
 8598 
        #if ( exists($::BUILDINFO{$ScmPlatform}{OS_COMMON}) )
- 
 
 8599 
        #{
- 
 
 8600 
        #    my $os_common = $::BUILDINFO{$ScmPlatform}{OS_COMMON};
8583 
        PushPath( \@pathlist, \%seen, "$root/\$(GBE_TARGET)",     $ScmTarget );
 8601 
        #    PushPath( \@pathlist, \%seen, "$root/$os_common", $os_common );
- 
 
 8602 
        #}
8584 
 
 8603 
 
- 
 
 8604 
        #
- 
 
 8605 
        #   Add the root directory too
- 
 
 8606 
        #
8585 
        push @pathlist, "$root";
 8607 
        push @pathlist, "$root";
8586 
 
 - 
 
8587 
        return \@pathlist;
 8608 
        return \@pathlist;
8588 
    }
 8609 
    }
- 
 
 8610
8589 
 
 8611 
 
8590 
#-------------------------------------------------------------------------------
 8612 
#-------------------------------------------------------------------------------
8591 
#
8613 
#
8592 
#
 8614 
#
8593 
    MakeHeader ("Include Search Paths",
 8615 
    MakeHeader ("Include Search Paths",