Subversion Repositories DevTools

Rev

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

Rev 279 Rev 345
Line 224... Line 224...
224 
    #   is being built within a development sandbox. In such a sandbox the
 224 
    #   is being built within a development sandbox. In such a sandbox the
225 
    #   version numbers of the packages are ignored. Publishing a package
 225 
    #   version numbers of the packages are ignored. Publishing a package
226 
    #   fromm such an environment is certainly not reproducible - so don't allow
 226 
    #   fromm such an environment is certainly not reproducible - so don't allow
227 
    #   it to happen
 227 
    #   it to happen
228 
    #
 228 
    #
229 
    unless ( $opt_archive eq 'local' || $opt_archive eq 'sandbox'   )
 229 
    unless ( $opt_archive eq 'local' || $opt_archive eq 'sandbox' )
230 
    {
 230 
    {
231 
        if ( $ENV{GBE_DPKG_SBOX} )
 231 
        if ( $ENV{GBE_DPKG_SBOX} )
232 
        {
 232 
        {
233 
            Error ("Cannot publish a package that has been generated",
 233 
            Error ("Cannot publish a package that has been generated",
234 
                   "within a Sandbox as the version of dependent packages",
 234 
                   "within a Sandbox as the version of dependent packages",
Line 510... Line 510...
510 
              "Check JATS config.");
 510 
              "Check JATS config.");
511 
    }
 511 
    }
512 
 
 512 
 
513 
    #
 513 
    #
514 
    #   Transfer of data is complete
 514 
    #   Transfer of data is complete
- 
 
 515 
    #       Deprecated format: ($touchfile0)
515 
    #       Mark the archive with the build type to indicate which parts of
 516 
    #           Mark the archive with the build type to indicate which parts of
- 
 
 517 
    #           a multi-machine build have been performed
- 
 
 518 
    #       New format
- 
 
 519 
    #           Mark the archive with the build machine to indicate which parts of
516 
    #       a multi-machine build have been performed
 520 
    #           a multi-machine build have been performed
517 
    #
 521 
    #
518 
    my $touchfile = $opt_generic ? "$DPKG_DIR/built.generic" : "$DPKG_DIR/built.$GBE_MACHTYPE";
 522 
    my $touchfile = $opt_generic ? "$DPKG_DIR/built.generic" : "$DPKG_DIR/built.$GBE_HOSTNAME";
- 
 
 523 
    my $touchfile0 = "$DPKG_DIR/built.$GBE_MACHTYPE";
519 
 
 524 
 
520 
    #
 525 
    #
521 
    #   Create astring to be appended to the 'built' file
 526 
    #   Create astring to be appended to the 'built' file
522 
    #   Comma seperated list of (possibly) usefule info
 527 
    #   Comma seperated list of (possibly) usefule info
523 
    #       Date-Time ( Local and GMT)
 528 
    #       Date-Time ( Local and GMT)
Line 526... Line 531...
526 
    #
 531 
    #
527 
    my $built_info = localtime() ."," . gmtime() . " GMT,$GBE_MACHTYPE,$GBE_HOSTNAME,$USER,$GBE_ABT";
 532 
    my $built_info = localtime() ."," . gmtime() . " GMT,$GBE_MACHTYPE,$GBE_HOSTNAME,$USER,$GBE_ABT";
528 
    LogFileOp("Mark File",$touchfile);
 533 
    LogFileOp("Mark File",$touchfile);
529 
    FileAppend ( $touchfile, $built_info );
 534 
    FileAppend ( $touchfile, $built_info );
530 
 
 535 
 
- 
 
 536 
    # Maintain the old format until the build daemon has been updated
- 
 
 537 
    #
- 
 
 538 
    LogFileOp("Mark File",$touchfile0);
- 
 
 539 
    FileAppend ( $touchfile0, $built_info );
- 
 
 540
531 
    #
 541 
    #
532 
    #   If there is a .lnk file in the archive then remove it now that the
 542 
    #   If there is a .lnk file in the archive then remove it now that the
533 
    #   archive has been transferred. The .lnk files are created in 'local'
 543 
    #   archive has been transferred. The .lnk files are created in 'local'
534 
    #   archives in order to simplify multi-package builds
 544 
    #   archives in order to simplify multi-package builds
535 
    #
 545 
    #