Subversion Repositories DevTools

Rev

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

Rev 281 Rev 285
Line 953... Line 953...
953 
        #
 953 
        #
954 
        #   Process only the required build targets
 954 
        #   Process only the required build targets
955 
        #
 955 
        #
956 
        foreach my $tgt ( keys %{$Tags->{$dir}{platforms}}   )
 956 
        foreach my $tgt ( keys %{$Tags->{$dir}{platforms}}   )
957 
        {
 957 
        {
958 
            next if ( %gbe_platform && not exists $gbe_platform{$tgt} );
 958 
            next if ( %gbe_platform && ! exists $gbe_platform{$tgt} );
959 
            #
 959 
            #
960 
            #   Locate all the makefile dependent files
 960 
            #   Locate all the makefile dependent files
961 
            #
 961 
            #
962 
            my $data = $Tags->{$dir}{full}{$tgt}{'@ScmDepends'};
 962 
            my $data = $Tags->{$dir}{full}{$tgt}{'@ScmDepends'};
963 
            if ( $data )
 963 
            if ( $data )
Line 1203... Line 1203...
1203 
        #   Examine all the %PACKAGE_xxx and %INSTALL_xxx fields thare listed
 1203 
        #   Examine all the %PACKAGE_xxx and %INSTALL_xxx fields thare listed
1204 
        #   in the @PACKAGE_VARS and @INSTALL_VARS array
 1204 
        #   in the @PACKAGE_VARS and @INSTALL_VARS array
1205 
        #
 1205 
        #
1206 
        foreach my $target ( keys %{$Tags->{$dir}{platforms}}   )
 1206 
        foreach my $target ( keys %{$Tags->{$dir}{platforms}}   )
1207 
        {
 1207 
        {
1208 
            next if ( %gbe_platform && not exists $gbe_platform{$target} );
 1208 
            next if ( %gbe_platform && ! exists $gbe_platform{$target} );
1209 
            foreach my $field ( @{$Tags->{$dir}{full}{$target}{'@PACKAGE_VARS'}},
 1209 
            foreach my $field ( @{$Tags->{$dir}{full}{$target}{'@PACKAGE_VARS'}},
1210 
                                @{$Tags->{$dir}{full}{$target}{'@INSTALL_VARS'}} )
 1210 
                                @{$Tags->{$dir}{full}{$target}{'@INSTALL_VARS'}} )
1211 
            {
 1211 
            {
1212 
                foreach my $entry ( keys %{$Tags->{$dir}{full}{$target}{$field}} )
 1212 
                foreach my $entry ( keys %{$Tags->{$dir}{full}{$target}{$field}} )
1213 
                {
 1213 
                {
Line 1350... Line 1350...
1350 
    }
 1350 
    }
1351 
 
 1351 
 
1352 
    my $cfg_filen = $::cf_filelist{$dir};
 1352 
    my $cfg_filen = $::cf_filelist{$dir};
1353 
    unless ( $cfg_filen )
 1353 
    unless ( $cfg_filen )
1354 
    {
 1354 
    {
1355 
        return undef
 - 
 
1356 
            if ( $test );
 1355 
        return if ( $test );
1357 
        Error ("Makefile index entry missing: $dir. Rebuild required");
 1356 
        Error ("Makefile index entry missing: $dir. Rebuild required");
1358 
    }
 1357 
    }
1359 
 
 1358 
 
1360 
 
 1359 
 
1361 
    #
 1360 
    #
Line 1365... Line 1364...
1365 
    %cf_minfo2 = ();
 1364 
    %cf_minfo2 = ();
1366 
    my $cfg_file = "$::ScmRoot/$::ScmInterface/$cfg_filen";
 1365 
    my $cfg_file = "$::ScmRoot/$::ScmInterface/$cfg_filen";
1367 
 
 1366 
 
1368 
    unless ( -f $cfg_file )
 1367 
    unless ( -f $cfg_file )
1369 
    {
 1368 
    {
1370 
        return undef
 - 
 
1371 
            if ( $test );
 1369 
        return if ( $test );
1372 
        Error ("Make data file missing: $cfg_file. Rebuild required");
 1370 
        Error ("Make data file missing: $cfg_file. Rebuild required");
1373 
    }
 1371 
    }
1374 
 
 1372 
 
1375 
    delete $INC{ $cfg_file };
 1373 
    delete $INC{ $cfg_file };
1376 
    require $cfg_file;
 1374 
    require $cfg_file;
1377 
 
 1375 
 
1378 
    Error ("Makefile info2 not present")
 1376 
    Error ("Makefile info2 not present")
1379 
        unless ( keys %::cf_info2 );
 1377 
        unless ( keys %::cf_info2 );
1380
1378
1381 
    Error ("Makefile info2 incorrect version. Rebuild required")
 1379 
    Error ("Makefile info2 incorrect version. Rebuild required")
1382 
        unless ( exists $::cf_info2{version} && $::cf_info2{version} eq 1 );
 1380 
        unless ( exists $::cf_info2{version} && $::cf_info2{version} == 1 );
1383 
 
 1381 
 
1384 
    %{$tag_data{$dir}} = %::cf_info2;
 1382 
    %{$tag_data{$dir}} = %::cf_info2;
1385 
    $tag_data{$dir}{config} = $cfg_file;
 1383 
    $tag_data{$dir}{config} = $cfg_file;
1386 
    %{$tag_data{$dir}{full}} = %::cf_info;
 1384 
    %{$tag_data{$dir}{full}} = %::cf_info;
1387 
 
 1385 
 
Line 1401... Line 1399...
1401 
#
 1399 
#
1402 
# Returns         : An array of commands
 1400 
# Returns         : An array of commands
1403 
#
 1401 
#
1404 
sub ExpandComposite
 1402 
sub ExpandComposite
1405 
{
 1403 
{
1406 
    my ($cmd) = @_;
 1404 
    my @scmds = $_[0];
1407 
    my @cmds;
 1405 
    my @cmds;
1408 
    my @scmds = $cmd;
 - 
 
1409 
    my %seen;
 1406 
    my %seen;
1410 
    while ( @scmds )
 1407 
    while ( @scmds )
1411 
    {
 1408 
    {
1412 
        my $cmd = shift @scmds;
 1409 
        my $cmd = shift @scmds;
1413 
        if ( exists $composite_commands{$cmd} )
 1410 
        if ( exists $composite_commands{$cmd} )