Subversion Repositories DevTools

Rev

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

Rev 7310 Rev 7311
Line 1081... Line 1081...
1081
    }
1081
    }
1082
 
1082
 
1083
    #
1083
    #
1084
    #   Add platform (tag) to various lists
1084
    #   Add platform (tag) to various lists
1085
    #
1085
    #
1086
    UniquePush( \@BUILDPLATFORMS, $platform ) unless exists ($pInfo->{BADNAME});
1086
    UniquePush( \@BUILDPLATFORMS, $platform )    unless exists ($pInfo->{BADNAME});
1087
    UniquePush( \@DEFBUILDPLATFORMS, $platform ) unless ( $pInfo->{NOT_DEFAULT} );
1087
    UniquePush( \@DEFBUILDPLATFORMS, $platform ) unless ( $pInfo->{NOT_DEFAULT} );
1088
 
1088
 
1089
    #
1089
    #
1090
    #   Create a simple alias if requested
1090
    #   Create a simple alias if requested
1091
    #   Used if a platform creates multiple entires
1091
    #   Used if a platform creates multiple entires
Line 1956... Line 1956...
1956
    Debug( "Name:      $name" );
1956
    Debug( "Name:      $name" );
1957
    Debug( "Version:   $version" );
1957
    Debug( "Version:   $version" );
1958
 
1958
 
1959
    DataDirective("LinkPkgArchive");            # This directive allowed here
1959
    DataDirective("LinkPkgArchive");            # This directive allowed here
1960
 
1960
 
1961
   if ( $IgnorePkgs )
1961
    if ( $IgnorePkgs )
1962
   {
1962
    {
1963
       Log( "LinkPkgArchive .. $name ($version) - Ignored" );
1963
        Log( "LinkPkgArchive .. $name ($version) - Ignored" );
1964
       return;
1964
        return;
1965
   }
1965
    }
1966
 
1966
 
1967
    #
1967
    #
1968
    #   Ensure that we have do not have multiple definitions
1968
    #   Ensure that we have do not have multiple definitions
1969
    #
1969
    #
1970
    if ( PackageEntry::Exists( $name, $version ) )
1970
    if ( PackageEntry::Exists( $name, $version ) )
Line 2489... Line 2489...
2489
    Debug( "Name:      $name" );
2489
    Debug( "Name:      $name" );
2490
    Debug( "Version:   $version" );
2490
    Debug( "Version:   $version" );
2491
 
2491
 
2492
    DataDirective("BuildPkgArchive");           # This directive allowed here
2492
    DataDirective("BuildPkgArchive");           # This directive allowed here
2493
 
2493
 
2494
   if ( $IgnorePkgs )
2494
    if ( $IgnorePkgs )
2495
   {
2495
    {
2496
       Log( "BuildPkgArchive . $name ($version) - Ignored" );
2496
        Log( "BuildPkgArchive . $name ($version) - Ignored" );
2497
       return;
2497
        return;
2498
   }
2498
    }
2499
    
2499
    
2500
    #
2500
    #
2501
    #   Ensure that we have do not have multiple definitions
2501
    #   Ensure that we have do not have multiple definitions
2502
    #
2502
    #
2503
    if ( PackageEntry::Exists( $name, $version ) )
2503
    if ( PackageEntry::Exists( $name, $version ) )
Line 3271... Line 3271...
3271
#
3271
#
3272
sub StartBuildPhase
3272
sub StartBuildPhase
3273
{
3273
{
3274
    my ($last) = @_;
3274
    my ($last) = @_;
3275
 
3275
 
3276
 
-
 
3277
    #
3276
    #
3278
    #   Ensure directive is allowed
3277
    #   Ensure directive is allowed
3279
    #       $BUILDPHASE >  1     - No more directives allowed
3278
    #       $BUILDPHASE >  1     - No more directives allowed
3280
    #       $BUILDPHASE == 1     - Allowed directive
3279
    #       $BUILDPHASE == 1     - Allowed directive
3281
    #
3280
    #
Line 3308... Line 3307...
3308
    #   Calculate defined aliases
3307
    #   Calculate defined aliases
3309
    #       Limit the Aliases to active platforms
3308
    #       Limit the Aliases to active platforms
3310
    #       ie: NATIVE INSTRUMENT PKG_WIN PKG_RPM PKG_DEB SK
3309
    #       ie: NATIVE INSTRUMENT PKG_WIN PKG_RPM PKG_DEB SK
3311
    #
3310
    #
3312
    my %activePlatformMap;
3311
    my %activePlatformMap;
3313
#    foreach my $item (@BUILD_ACTIVEPLATFORMS) {
-
 
3314
    foreach my $item ( keys %BUILDINFO) {
3312
    foreach my $item ( keys %BUILDINFO) {
3315
           my $pInfo = $BUILDINFO{$item};
3313
           my $pInfo = $BUILDINFO{$item};
3316
           next if $pInfo->{NOT_AVAILABLE} > 1; 
3314
           next if $pInfo->{NOT_AVAILABLE} > 1; 
3317
           push @{$activePlatformMap{$pInfo->{TARGET}}}, $item;
3315
           push @{$activePlatformMap{$pInfo->{TARGET}}}, $item;
3318
    }
3316
    }