Subversion Repositories DevTools

Rev

Rev 6887 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6887 Rev 7433
Line 276... Line 276...
276
    #
276
    #
277
    #   Determine base dir
277
    #   Determine base dir
278
    #       LinkPkgArchive  : From the package
278
    #       LinkPkgArchive  : From the package
279
    #       BuildPkgArchive : From the interface directory
279
    #       BuildPkgArchive : From the interface directory
280
    #
280
    #
-
 
281
    my $pbase_dir = $self->{'base'};                        # Package relative base directory
281
    my $base_dir = $self->{'base'};
282
    my $base_dir = $self->{'base'};                         # Base directory to use
282
    $base_dir = "$::Cwd/$BUILDINTERFACE"
283
    $base_dir = "$::CwdFull/$BUILDINTERFACE"
283
        if ( $self->{'type'} eq 'build' );
284
        if ( $self->{'type'} eq 'build' );
284
 
285
 
285
    my @searchList;
286
    my @searchList;
286
    my $path = "/tools/bin";
287
    my $path = "/tools/bin";
287
    foreach my $suffix ( "/$::GBE_MACHTYPE", "/$::GBE_MACHTYPE/bin", "" ) {
288
    foreach my $suffix ( "/$::GBE_MACHTYPE", "/$::GBE_MACHTYPE/bin", "" ) {
Line 293... Line 294...
293
        push @searchList, $path . $suffix;
294
        push @searchList, $path . $suffix;
294
    }
295
    }
295
 
296
 
296
    for my $path (@searchList )
297
    for my $path (@searchList )
297
    {
298
    {
-
 
299
        #   Test against the Package Directory
-
 
300
        #       So that we correctly identify packages witg tools
-
 
301
        #   Store the Use base directory
-
 
302
        #       So that BuildPkgArchive will be in the interface    
-
 
303
 
298
        my $dir = $base_dir . $path;
304
        my $dir = $base_dir . $path;
299
        if ( isUsefulDir( $dir ) )
305
        if ( isUsefulDir( $pbase_dir . $path ) )
300
        {
306
        {
301
            ::UniquePush( \@{$self->{'TOOLDIRS'}}, $dir );
307
            ::UniquePush( \@{$self->{'TOOLDIRS'}}, $dir );
302
            ::UniquePush( \@BUILDTOOLS, $dir );
308
            ::UniquePush( \@BUILDTOOLS, $dir );
303
        }
309
        }
304
    }
310
    }