Subversion Repositories DevTools

Rev

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

Rev 5969 Rev 5986
Line 25... Line 25...
25
use FileUtils;
25
use FileUtils;
26
use Pod::Usage;
26
use Pod::Usage;
27
use Getopt::Long;
27
use Getopt::Long;
28
use File::Path;
28
use File::Path;
29
use XML::Writer;
29
use XML::Writer;
-
 
30
use ArrayHashUtils;
30
 
31
 
31
our $BuildVersion           = "2.1.0";
32
our $BuildVersion           = "2.1.0";
32
 
33
 
33
#.. Switchs
34
#.. Switchs
34
#
35
#
Line 3597... Line 3598...
3597
{
3598
{
3598
    return if ( $Clobber );
3599
    return if ( $Clobber );
3599
 
3600
 
3600
    # Always delete the file - in case we toggle build forms
3601
    # Always delete the file - in case we toggle build forms
3601
    #
3602
    #
3602
    my $markerFile = BuildAddKnownFile( $Cwd, 'noBuild.gbe');
3603
    my $markerFile = BuildAddKnownFile( $::ScmRoot, 'noBuild.gbe');
3603
    unlink($markerFile);
3604
    unlink($markerFile);
3604
 
3605
 
3605
    TouchFile($markerFile)
3606
    TouchFile($markerFile)
3606
        if ($NoBuild);
3607
        if ($NoBuild);
3607
}
3608
}
Line 4124... Line 4125...
4124
    #       Local directory         - for installed components
4125
    #       Local directory         - for installed components
4125
    #       Interface directory     - for BuildPkgArchives
4126
    #       Interface directory     - for BuildPkgArchives
4126
    #
4127
    #
4127
    if ( $BUILDLOCAL )
4128
    if ( $BUILDLOCAL )
4128
    {
4129
    {
-
 
4130
        my @localParts;
-
 
4131
        UniquePush \@localParts, $BUILDINFO{$platform}{PLATFORM} , $BUILDINFO{$platform}{PRODUCT}, $BUILDINFO{$platform}{TARGET};
4129
        foreach ( @parts )
4132
        foreach ( @localParts )
4130
        {
4133
        {
4131
            push @paths, AbsPath("$BUILDLOCAL/lib/$_");
4134
            push @paths, AbsPath("$BUILDLOCAL/lib/$_");
4132
        }
4135
        }
4133
    }
4136
    }
4134
 
4137
 
Line 4223... Line 4226...
4223
# Returns         : 
4226
# Returns         : 
4224
#
4227
#
4225
sub BuildPropertyPages
4228
sub BuildPropertyPages
4226
{
4229
{
4227
    StartBuildPhase();                      # Starting the build phase. No more data collection
4230
    StartBuildPhase();                      # Starting the build phase. No more data collection
-
 
4231
    return if $Clobber;
4228
    foreach my $platform ( keys %BUILDINFO )
4232
    foreach my $platform ( keys %BUILDINFO )
4229
    {
4233
    {
4230
        next unless $BUILDINFO{$platform}{MSBUILDPROPS};
4234
        next unless $BUILDINFO{$platform}{MSBUILDPROPS};
4231
        my $propsFile = $Srcdir . '/jats_'. $BUILDINFO{$platform}{TARGET} . '.props';
4235
        my $propsFile = BuildAddKnownFile ($Srcdir, 'jats_'. $BUILDINFO{$platform}{TARGET} . '.props');
4232
        Message("BuildPropertyPages: $propsFile");
-
 
4233
 
4236
 
4234
        #
-
 
4235
        #   Remove files that are created
-
 
4236
        #
-
 
4237
        if ( $Clobber )
-
 
4238
        {
-
 
4239
            unlink $propsFile;
4237
        Message("BuildPropertyPages: $propsFile");
4240
            next;
-
 
4241
        }
-
 
4242
 
4238
 
4243
        my %macros;
4239
        my %macros;
4244
        my @libpaths;
4240
        my @libpaths;
4245
        my @incpaths;
4241
        my @incpaths;
4246
        my @parts = @{$BUILDINFO{$platform}{PARTS}};
4242
        my @parts = @{$BUILDINFO{$platform}{PARTS}};
Line 4264... Line 4260...
4264
        if ( $BUILDLOCAL )
4260
        if ( $BUILDLOCAL )
4265
        {
4261
        {
4266
            my $macroName = 'GBE_LOCALDIR';
4262
            my $macroName = 'GBE_LOCALDIR';
4267
            $macros{$macroName} = WinFullPath("$BUILDLOCAL") ;
4263
            $macros{$macroName} = WinFullPath("$BUILDLOCAL") ;
4268
            $macroName = '$(' . $macroName . ')';
4264
            $macroName = '$(' . $macroName . ')';
-
 
4265
            my @localParts;
-
 
4266
            UniquePush \@localParts, $BUILDINFO{$platform}{PLATFORM} , $BUILDINFO{$platform}{PRODUCT}, $BUILDINFO{$platform}{TARGET};
4269
            foreach ( @parts )
4267
            foreach ( @localParts )
4270
            {
4268
            {
4271
                push @libpaths, catdir($macroName, 'lib', $_);
4269
                push @libpaths, catdir($macroName, 'lib', $_);
4272
                push @incpaths, catdir($macroName ,'include' ,$_);
4270
                push @incpaths, catdir($macroName ,'include' ,$_);
4273
            }
4271
            }
4274
            push @incpaths, catdir($macroName ,'include');
4272
            push @incpaths, catdir($macroName ,'include');