Subversion Repositories DevTools

Rev

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

Rev 6294 Rev 6353
Line 5497... Line 5497...
5497
            push @tool_options, $_;
5497
            push @tool_options, $_;
5498
        }
5498
        }
5499
    }
5499
    }
5500
 
5500
 
5501
    #
5501
    #
-
 
5502
    #   Validate some of the arguments
-
 
5503
    #   Ensure has not specified both --Prod and --Debug
-
 
5504
    #
-
 
5505
    Error ("Makeproject. Conflicting options --Debug and --Prod" )
-
 
5506
        if ( $PROJECTS{$proj}{'Debug'}  && $PROJECTS{$proj}{'Prod'} );
-
 
5507
 
-
 
5508
    #   Ensure that global --OnlyProd/Debug don't prevent builds
-
 
5509
    $PROJECTS{$proj}{'Debug'} = 1 if ($ScmBuildType eq 'D');
-
 
5510
    $PROJECTS{$proj}{'Prod'} = 1 if ($ScmBuildType eq 'P');
-
 
5511
    Error ("Makeproject. Global and Local options --Debug and --Prod prevent project being built" )
-
 
5512
        if ( $PROJECTS{$proj}{'Debug'}  && $PROJECTS{$proj}{'Prod'} );
-
 
5513
 
-
 
5514
    #
5502
    #   Save the information
5515
    #   Save the information
5503
    #
5516
    #
5504
    $PROJECTS{$proj}{'options'} = \@tool_options;
5517
    $PROJECTS{$proj}{'options'} = \@tool_options;
5505
    $PROJECTS{$proj}{'name'} = $proj;
5518
    $PROJECTS{$proj}{'name'} = $proj;
5506
    $PROJECTS{$proj}{'project'} = $project;
5519
    $PROJECTS{$proj}{'project'} = $project;
5507
    $PROJECTS{$proj}{'basedir'} = $basedir;
5520
    $PROJECTS{$proj}{'basedir'} = $basedir;
5508
    $PROJECTS{$proj}{'unittest'} = $unit_tests if ( $unit_tests );
5521
    $PROJECTS{$proj}{'unittest'} = $unit_tests if ( $unit_tests );
5509
    $PROJECTS{$proj}{'autotest'} = $auto_tests if ( $auto_tests );
5522
    $PROJECTS{$proj}{'autotest'} = $auto_tests if ( $auto_tests );
5510
    UniquePush (\@PROJECTS_ORDER, $proj);
5523
    UniquePush (\@PROJECTS_ORDER, $proj);
5511
 
5524
 
5512
    #
-
 
5513
    #   Validate some of the arguments
-
 
5514
    #
-
 
5515
    Error ("Makeproject. Conflicting options --Debug and --Prod" )
-
 
5516
        if ( $PROJECTS{$proj}{'Debug'}  && $PROJECTS{$proj}{'Prod'} );
-
 
5517
}
5525
}
5518
 
5526
 
5519
#-------------------------------------------------------------------------------
5527
#-------------------------------------------------------------------------------
5520
# Function        : _PackageFromProject
5528
# Function        : _PackageFromProject
5521
#
5529
#