Subversion Repositories DevTools

Rev

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

Rev 271 Rev 311
Line 272... Line 272...
272
            Error ("BuildConfig. Unknown Option: $_");
272
            Error ("BuildConfig. Unknown Option: $_");
273
        }
273
        }
274
    }
274
    }
275
 
275
 
276
    #
276
    #
277
    #   Locate rqeuired entries
277
    #   Locate required entries
278
    #
278
    #
279
    for my $entry (@{$ScmBuildPkgRules{$platform} })
279
    for my $entry (@{$ScmBuildPkgRules{$platform} })
280
    {
280
    {
281
        #
281
        #
282
        #   Do we need this entry
282
        #   Do we need this entry
Line 293... Line 293...
293
                @subdirs = $subdir;
293
                @subdirs = $subdir;
294
            }
294
            }
295
        }
295
        }
296
 
296
 
297
        #
297
        #
298
        #   If a BuildPkgArchive, then give the interface dir, unless
298
        #   Skip the Pseudo INTERFACE package if we are processing all packages
299
        #   we need all the true paths
299
        #   Skip BuildPkgArchives if we aren't processing all
300
        #
300
        #
-
 
301
        next if ( ($entry->{'TYPE'} eq 'interface') && $all );
301
        if ( ($entry->{'TYPE'} eq 'build' ) && !$all )
302
        next if ( ($entry->{'TYPE'} eq 'build') && !$all );
-
 
303
 
302
        {
304
        #
303
            if ( $interface )
305
        #   Select appropriate root
304
            {
-
 
305
                push @result, $interface;
306
        #       Use provided interface path - not too sure why
306
                $interface = '';
307
        #       Should be able to simplify this
307
            }
308
        #
308
        }
309
        my $dir = $entry->{'ROOT'};
-
 
310
        $dir = $interface if ( $entry->{'TYPE'} eq 'interface' );
-
 
311
 
309
        else
312
        foreach my $subdir ( @subdirs )
310
        {
313
        {
311
            foreach my $subdir ( @subdirs )
-
 
312
            {
-
 
313
                my $dir = $entry->{'ROOT'} . $subdir;
314
            my $dir = $entry->{'ROOT'} . $subdir;
314
                $dir =~ s~/+~/~g;
315
            $dir =~ s~/+~/~g;
315
                $dir =~ s~/+$~~g;
316
            $dir =~ s~/+$~~g;
316
                push @result, $dir;
317
            push @result, $dir;
317
            }
-
 
318
        }
318
        }
319
    }
319
    }
320
 
320
 
321
    return @result;
321
    return @result;
322
}
322
}
Line 378... Line 378...
378
#
378
#
379
# Inputs          : $self                   - Class Ref
379
# Inputs          : $self                   - Class Ref
380
#                   $type                   - 0: Empty
380
#                   $type                   - 0: Empty
381
#                                             1: abs dpkg_archive
381
#                                             1: abs dpkg_archive
382
#                                             2: May be in the interface
382
#                                             2: May be in the interface
-
 
383
#                                             3: Interface, LinkPkgs
383
#
384
#
384
# Returns         : As above
385
# Returns         : As above
385
#
386
#
386
sub getBase
387
sub getBase
387
{
388
{
388
    my ($self, $type ) = @_;
389
    my ($self, $type ) = @_;
389
    if ( $type == 1 ) {
390
    if ( $type == 1 ) {
390
        return $self->{ROOT};
391
        return $self->{ROOT};
391
    } elsif ( $type == 2 ) {
392
    } elsif ( $type == 2 ) {
392
        if ( $self->{TYPE} eq 'link' ) {
393
        if ( $self->{'TYPE'} eq 'build' ) {
393
            return $self->{ROOT};
-
 
394
        } else {
-
 
395
            return $interface;
394
            return $interface;
-
 
395
        } else {
-
 
396
            return $self->{ROOT};
396
        }
397
        }
-
 
398
    } elsif ( $type == 3 ) {
-
 
399
        return if ( $self->{'TYPE'} eq 'build' );
-
 
400
        return return $self->{ROOT};
397
    } else  {
401
    } else  {
398
        return '';
402
        return '';
399
    }
403
    }
400
}
404
}
401
 
405
 
402
 
-
 
403
 
-
 
404
#-------------------------------------------------------------------------------
406
#-------------------------------------------------------------------------------
405
# Function        : getLibDirs
407
# Function        : getLibDirs
406
#
408
#
407
# Description     : Return an array of library directories
409
# Description     : Return an array of library directories
408
#
410
#
409
# Inputs          : $self                   - Class ref
411
# Inputs          : $self                   - Class ref
410
#                   $type                   - 0 : Relative to base of the package
412
#                   $type                   - 0 : Relative to base of the package
411
#                                             1 : abs to the dpkg_archive package
413
#                                             1 : abs to the dpkg_archive package
412
#                                             2 : abs to the interface
414
#                                             2 : abs to the interface
-
 
415
#                                             3: Interface, LinkPkgs
413
#
416
#
414
# Returns         : An array
417
# Returns         : An array
415
#
418
#
416
sub getLibDirs
419
sub getLibDirs
417
{
420
{
Line 433... Line 436...
433
#
436
#
434
# Inputs          : $self                   - Class ref
437
# Inputs          : $self                   - Class ref
435
#                   $type                   - 0 : Relative to base of the package
438
#                   $type                   - 0 : Relative to base of the package
436
#                                             1 : abs to the dpkg_archive package
439
#                                             1 : abs to the dpkg_archive package
437
#                                             2 : abs to the interface
440
#                                             2 : abs to the interface
-
 
441
#                                             3: Interface, LinkPkgs
438
#
442
#
439
# Returns         : An array
443
# Returns         : An array
440
#
444
#
441
sub getIncDirs
445
sub getIncDirs
442
{
446
{