Subversion Repositories DevTools

Rev

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

Rev 6504 Rev 6511
Line 70... Line 70...
70
our @BUILD_BADNAME          = ();               # Unknown platforms
70
our @BUILD_BADNAME          = ();               # Unknown platforms
71
our @GENERIC_TARGETS        = ();               # Generic targets - only one allowed
71
our @GENERIC_TARGETS        = ();               # Generic targets - only one allowed
72
 
72
 
73
our $BUILDNAME              = "";               # BuildName()
73
our $BUILDNAME              = "";               # BuildName()
74
our $BUILDVERSION           = "";               # BuildName()
74
our $BUILDVERSION           = "";               # BuildName()
-
 
75
our $BUILDBASEVERSION       = "";               # BuildName
75
our $BUILDNAME_PACKAGE;                         # Name
76
our $BUILDNAME_PACKAGE;                         # Name
76
our $BUILDNAME_VERSION;                         # Version
77
our $BUILDNAME_VERSION;                         # Version
77
our $BUILDNAME_PROJECT;                         # Project(optional)
78
our $BUILDNAME_PROJECT;                         # Project(optional)
78
our $BUILDNAME_SUFFIX;                          # Project (available)
79
our $BUILDNAME_SUFFIX;                          # Project (available)
79
our $DEPLOY_PATCH           = 0;                # Deplyment patch number
80
our $DEPLOY_PATCH           = 0;                # Deplyment patch number
Line 1503... Line 1504...
1503
    $BUILDNAME_PROJECT = $build_info->{BUILDNAME_PROJECT};
1504
    $BUILDNAME_PROJECT = $build_info->{BUILDNAME_PROJECT};
1504
    $BUILDNAME_SUFFIX  = $BUILDNAME_PROJECT ? '.' . $BUILDNAME_PROJECT : '';
1505
    $BUILDNAME_SUFFIX  = $BUILDNAME_PROJECT ? '.' . $BUILDNAME_PROJECT : '';
1505
 
1506
 
1506
    $BUILDNAME         = $build_info->{BUILDNAME};
1507
    $BUILDNAME         = $build_info->{BUILDNAME};
1507
    $BUILDVERSION      = $build_info->{BUILDVERSION};
1508
    $BUILDVERSION      = $build_info->{BUILDVERSION};
-
 
1509
    $BUILDBASEVERSION  = $build_info->{BUILDNAME_BASE_VERSION};
1508
 
1510
 
1509
    $DEPLOY_PATCH      = $build_info->{DEPLOY_PATCH} || 0;
1511
    $DEPLOY_PATCH      = $build_info->{DEPLOY_PATCH} || 0;
1510
 
1512
 
1511
    #
1513
    #
1512
    #   Clobber processing done after values have been accumulated
1514
    #   Clobber processing done after values have been accumulated
Line 3986... Line 3988...
3986
\$ScmBuildName                  = \"$BUILDNAME\";
3988
\$ScmBuildName                  = \"$BUILDNAME\";
3987
\$ScmBuildPackage               = \"$BUILDNAME_PACKAGE\";
3989
\$ScmBuildPackage               = \"$BUILDNAME_PACKAGE\";
3988
\$ScmBuildVersion               = \"$BUILDNAME_VERSION\";
3990
\$ScmBuildVersion               = \"$BUILDNAME_VERSION\";
3989
\$ScmBuildProject               = \"$BUILDNAME_PROJECT\";
3991
\$ScmBuildProject               = \"$BUILDNAME_PROJECT\";
3990
\$ScmBuildVersionFull           = \"$BUILDVERSION\";
3992
\$ScmBuildVersionFull           = \"$BUILDVERSION\";
-
 
3993
\$ScmBuildBaseVersion           = \"$BUILDBASEVERSION\";
3991
\$ScmBuildPreviousVersion       = \"$BUILDPREVIOUSVERSION\";
3994
\$ScmBuildPreviousVersion       = \"$BUILDPREVIOUSVERSION\";
3992
\$ScmLocal                      = \"$BUILDLOCAL\";
3995
\$ScmLocal                      = \"$BUILDLOCAL\";
3993
\$ScmDeploymentPatch            = \"$DEPLOY_PATCH\";
3996
\$ScmDeploymentPatch            = \"$DEPLOY_PATCH\";
3994
\$ScmSrcDir                     = \"$Srcdir\";
3997
\$ScmSrcDir                     = \"$Srcdir\";
3995
\$ScmBuildSrc                   = \"$ScmBuildSrc\";
3998
\$ScmBuildSrc                   = \"$ScmBuildSrc\";
Line 4305... Line 4308...
4305
        #
4308
        #
4306
        my $fh = ::ConfigurationFile::New( "$BUILDINTERFACE/set_$platform.bat", '--NoEof', '--Type=bat' );
4309
        my $fh = ::ConfigurationFile::New( "$BUILDINTERFACE/set_$platform.bat", '--NoEof', '--Type=bat' );
4307
        $fh->Write ( "\@echo off\n");
4310
        $fh->Write ( "\@echo off\n");
4308
        $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
4311
        $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
4309
        $fh->Write ( "\nSETLOCAL\n");
4312
        $fh->Write ( "\nSETLOCAL\n");
4310
        foreach ( @pathList )
4313
        foreach ( @pathList ) {
4311
        {
-
 
4312
            $_ =~ s~/~\\~g;
4314
            $_ =~ s~/~\\~g;
4313
            $fh->Write ( "PATH=$_;\%PATH\%\n" );
4315
            $fh->Write ( "PATH=$_;\%PATH\%\n" );
4314
        }
4316
        }
4315
        $fh->Write ( "\n%*\n" );
4317
        $fh->Write ( "\n%*\n" );
4316
        $fh->Write ( "\nENDLOCAL\n");
4318
        $fh->Write ( "\nENDLOCAL\n");
Line 4321... Line 4323...
4321
        #   Create a .sh file for WIN32
4323
        #   Create a .sh file for WIN32
4322
        #   This may be consumed by a shell - as used within JATS
4324
        #   This may be consumed by a shell - as used within JATS
4323
        #
4325
        #
4324
        $fh = ::ConfigurationFile::New( "$BUILDINTERFACE/set_$platform.sh", '--NoEof', '--Type=sh' );
4326
        $fh = ::ConfigurationFile::New( "$BUILDINTERFACE/set_$platform.sh", '--NoEof', '--Type=sh' );
4325
        $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
4327
        $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
4326
        foreach ( @pathList )
4328
        foreach ( @pathList ) {
4327
        {
-
 
4328
            tr~\\/~/~s;
4329
            tr~\\/~/~s;
4329
            $fh->Write ( "PATH=$_\\;\$PATH\n" );
4330
            $fh->Write ( "PATH=$_\\;\$PATH\n" );
4330
        }
4331
        }
4331
        $fh->Write ( "\n" . '[ -n "$*" ] && "$@"'  ."\n" );
4332
        $fh->Write ( "\n" . '[ -n "$*" ] && "$@"'  ."\n" );
4332
        $fh->Close();
4333
        $fh->Close();
Line 4363... Line 4364...
4363
        #   Create a .sh file for Unix
4364
        #   Create a .sh file for Unix
4364
        #
4365
        #
4365
        my $file = "$BUILDINTERFACE/set_$platform.sh";
4366
        my $file = "$BUILDINTERFACE/set_$platform.sh";
4366
        my $fh = ::ConfigurationFile::New( $file , '--NoEof', '--Type=sh' );
4367
        my $fh = ::ConfigurationFile::New( $file , '--NoEof', '--Type=sh' );
4367
        $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
4368
        $fh->Header( "Buildlib ($BuildVersion)","Shared Library Paths" );
4368
        foreach ( reverse @unix_paths, @BUILDTOOLS )
4369
        foreach ( reverse @unix_paths, @BUILDTOOLS ) {
4369
        {
-
 
4370
            $fh->Write ( "export LD_LIBRARY_PATH=$_:\$LD_LIBRARY_PATH\n" );
4370
            $fh->Write ( "export LD_LIBRARY_PATH=$_:\$LD_LIBRARY_PATH\n" );
4371
        }
4371
        }
4372
 
4372
 
4373
        #
4373
        #
4374
        #   Extend the search path to allow tools to be located
4374
        #   Extend the search path to allow tools to be located
4375
        #   Have already extended LD_LIBRARY_PATH to allwo for tools shared libaraies 
4375
        #   Have already extended LD_LIBRARY_PATH to allow for tools shared libaraies 
4376
        #   
4376
        #   
4377
        $fh->Write ( "\n# Extend Tool Search Path\n" );
4377
        $fh->Write ( "\n# Extend Tool Search Path\n" );
4378
        foreach ( @BUILDTOOLS ) {
4378
        foreach ( @BUILDTOOLS ) {
4379
            tr~\\/~/~s;
4379
            tr~\\/~/~s;
4380
            $fh->Write ( "PATH=$_\\;\$PATH\n" );
4380
            $fh->Write ( "PATH=$_:\$PATH\n" );
4381
        }
4381
        }
4382
 
4382
 
4383
        $fh->Write ( "\n\"\$\@\"\n" );
4383
        $fh->Write ( "\n\"\$\@\"\n" );
4384
        $fh->Close();
4384
        $fh->Close();
4385
 
4385