Subversion Repositories DevTools

Rev

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

Rev 287 Rev 289
Line 2808... Line 2808...
2808
#                       --Style=style           Output file style
2808
#                       --Style=style           Output file style
2809
#                                               Supported styles:
2809
#                                               Supported styles:
2810
#                                                   "C" - Default
2810
#                                                   "C" - Default
2811
#                                                   "CSharp"
2811
#                                                   "CSharp"
2812
#                                                   "WinRC"
2812
#                                                   "WinRC"
-
 
2813
#                                                   "Delphi"
2813
#                       --File=name             Specifies the output file name
2814
#                       --File=name             Specifies the output file name
2814
#                                               Default is determined by the style
2815
#                                               Default is determined by the style
2815
#
2816
#
2816
#                   Also allows for an 'old' style format in which
2817
#                   Also allows for an 'old' style format in which
2817
#                   the first three arguments are prefix,type and defs
2818
#                   the first three arguments are prefix,type and defs
Line 2900... Line 2901...
2900
        BuildVersionProperties( $FileName, $Prefix );
2901
        BuildVersionProperties( $FileName, $Prefix );
2901
 
2902
 
2902
    } elsif ( $Style =~ /^WinRC/i ) {
2903
    } elsif ( $Style =~ /^WinRC/i ) {
2903
        BuildVersionWinRC( $FileName, @opts );
2904
        BuildVersionWinRC( $FileName, @opts );
2904
 
2905
 
-
 
2906
    } elsif ( $Style =~ /^Delphi/i ) {
-
 
2907
        BuildVersionDelphi( $FileName, $Prefix );
-
 
2908
        
2905
    } elsif ( $Style eq "C" ) {
2909
    } elsif ( $Style eq "C" ) {
2906
        BuildVersionC    ( $Prefix, $Type )     if ( $VersionFiles );
2910
        BuildVersionC    ( $FileName, $Prefix, $Type )     if ( $VersionFiles );
2907
        BuildVersionCdefs( $Mode, $ModePrefix ) if ( $Mode );
2911
        BuildVersionCdefs( $FileName, $Mode, $ModePrefix ) if ( $Mode );
2908
 
2912
 
2909
    } else {
2913
    } else {
2910
        Error("BuildVersion: Unknown style: $Style");
2914
        Error("BuildVersion: Unknown style: $Style");
2911
    }
2915
    }
2912
}
2916
}
Line 3478... Line 3482...
3478
    {
3482
    {
3479
            push @paths, AbsPath("$BUILDINTERFACE/lib/$_");
3483
            push @paths, AbsPath("$BUILDINTERFACE/lib/$_");
3480
    }
3484
    }
3481
 
3485
 
3482
    #
3486
    #
-
 
3487
    #   $so may be a scalar of an array
-
 
3488
    #   Covert scalar to an array
-
 
3489
    #
-
 
3490
    my @solist = (ref($so) eq 'ARRAY') ? @$so : $so;
-
 
3491
 
-
 
3492
    #
3483
    #   For each LinkPkgArchive
3493
    #   For each LinkPkgArchive
3484
    #
3494
    #
3485
    foreach my $package ( @{$PKGRULES{$platform}} )
3495
    foreach my $package ( @{$PKGRULES{$platform}} )
3486
    {
3496
    {
3487
        next unless ( $package->{'type'} eq 'link' );
3497
        next unless ( $package->{'type'} eq 'link' );
3488
 
3498
 
3489
        my $base = $package->{'base'};
3499
        my $base = $package->{'base'};
3490
        for my $path ( @{$package->{'PLIBDIRS'}} )
3500
        for my $path ( @{$package->{'PLIBDIRS'}} )
3491
        {
3501
        {
-
 
3502
            my @so_libs;
3492
            my @so_libs = glob ( "$base$path/*$so");
3503
            push @so_libs, glob ( "$base$path/*$_") foreach ( @solist );
3493
            next unless scalar @so_libs;
3504
            next unless scalar @so_libs;
3494
 
-
 
3495
            push @paths, $base . $path;;
3505
            push @paths, $base . $path;;
3496
        }
3506
        }
3497
    }
3507
    }
3498
 
3508
 
3499
    #
3509
    #
Line 3511... Line 3521...
3511
#
3521
#
3512
#                   Known Files will be deleted on clobber
3522
#                   Known Files will be deleted on clobber
3513
#
3523
#
3514
# Inputs          : $path
3524
# Inputs          : $path
3515
#                   $file
3525
#                   $file
-
 
3526
#                   $noadd                    - Don't add to known
3516
#
3527
#
3517
# Returns         : Path and filename
3528
# Returns         : Path and filename
3518
#
3529
#
3519
 
3530
 
3520
sub BuildAddKnownFile
3531
sub BuildAddKnownFile
3521
{
3532
{
3522
    my ($path, $file) = @_;
3533
    my ($path, $file, $noadd) = @_;
3523
    $path .= '/'. $file;
3534
    $path .= '/'. $file;
3524
    $BUILD_KNOWNFILES {$file} = $path;
3535
    $BUILD_KNOWNFILES {$file} = $path
-
 
3536
        unless ( defined($noadd) && $noadd);
3525
    push @CLOBBERFILES, $path;
3537
    push @CLOBBERFILES, $path;
3526
    
3538
    
3527
    return $path;
3539
    return $path;
3528
}
3540
}
3529
 
3541
 
3530
 
-
 
3531
#-------------------------------------------------------------------------------
3542
#-------------------------------------------------------------------------------
3532
# Function        : Usage
3543
# Function        : Usage
3533
#
3544
#
3534
# Description     : Display program usage information
3545
# Description     : Display program usage information
3535
#
3546
#