Subversion Repositories DevTools

Rev

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

Rev 5578 Rev 5582
Line 125... Line 125...
125
# Description:
125
# Description:
126
#       This sub-routine is used to generate a consistent informational log
126
#       This sub-routine is used to generate a consistent informational log
127
#------------------------------------------------------------------------------
127
#------------------------------------------------------------------------------
128
{
128
{
129
    my ($opr, $file) = @_;
129
    my ($opr, $file) = @_;
-
 
130
 
130
    $file =~ s/\Q$DPKG_ROOT\E/DPKG/;
131
    $file =~ s/\Q$DPKG_ROOT\E/DPKG/;
131
    $file =~ s/\Q$SRC_ROOT\E/PKG/;
132
    $file =~ s/\Q$SRC_ROOT\E/PKG/;
132
    $file =~ s/\Q$CWD_DIR\E/CWD/;
133
    $file =~ s/\Q$CWD_DIR\E/CWD/;
133
 
134
 
134
    Information (sprintf( "%-15s [%s]", $opr, $file));
135
    Information (sprintf( "%-15s [%s]", $opr, $file));
Line 220... Line 221...
220
    #       Use lots of attributes and only elements for arrays
221
    #       Use lots of attributes and only elements for arrays
221
    #       Save as one attribute per line - for readability
222
    #       Save as one attribute per line - for readability
222
    #
223
    #
223
    $opt_outfile = $opt_generic ? "built.files.generic.xml" : "built.files.$GBE_HOSTNAME.xml";
224
    $opt_outfile = $opt_generic ? "built.files.generic.xml" : "built.files.$GBE_HOSTNAME.xml";
224
    $opt_outfile = catfile( $targetDir, $opt_outfile); 
225
    $opt_outfile = catfile( $targetDir, $opt_outfile); 
225
    push @tmpFiles, $opt_outfile;
-
 
226
 
226
 
227
    LogFileOp ('Meta File', $opt_outfile);
227
    LogFileOp ('Meta File', $opt_outfile);
228
    my $xs = XML::Simple->new( NoAttr =>0, AttrIndent => 1 );
228
    my $xs = XML::Simple->new( NoAttr =>0, AttrIndent => 1 );
229
 
229
 
230
    open (my $XML, '>', $opt_outfile) || Error ("Cannot create output file: $opt_outfile", $!);
230
    open (my $XML, '>', $opt_outfile) || Error ("Cannot create output file: $opt_outfile", $!);
Line 587... Line 587...
587
        }
587
        }
588
 
588
 
589
        $DESCPKG_FILE = $item;
589
        $DESCPKG_FILE = $item;
590
        my($dir)= File::Basename::dirname($item);
590
        my($dir)= File::Basename::dirname($item);
591
        $DPKG_NAME = File::Basename::basename($dir);
591
        $DPKG_NAME = File::Basename::basename($dir);
592
        $SRC_ROOT = $dir;
592
        $SRC_ROOT = catdir($dir);
593
    }
593
    }
594
}
594
}
595
 
595
 
596
 
596
 
597
#------------------------------------------------------------------------------
597
#------------------------------------------------------------------------------
Line 956... Line 956...
956
    #   to contain the metadata. 
956
    #   to contain the metadata. 
957
    #   Delete any existing dir of the same name to ensure its clean.
957
    #   Delete any existing dir of the same name to ensure its clean.
958
    #
958
    #
959
    if ( $SRC_ROOT eq '' )
959
    if ( $SRC_ROOT eq '' )
960
    {
960
    {
961
        $SRC_ROOT = AbsPath('pkg/noBuild');
961
        $SRC_ROOT = catdir(AbsPath('pkg/noBuild'));
962
        RmDirTree ($SRC_ROOT);
962
        RmDirTree ($SRC_ROOT);
963
        mkpath($SRC_ROOT, 0, 0775);
963
        mkpath($SRC_ROOT, 0, 0775);
964
    }
964
    }
965
 
965
 
966
    #
966
    #
Line 989... Line 989...
989
              "Check JATS config.");
989
              "Check JATS config.");
990
    }
990
    }
991
 
991
 
992
    #
992
    #
993
    #   Create the MD5 info file
993
    #   Create the MD5 info file
-
 
994
    #   Mark it as a temp file as it not being created locally
994
    #   
995
    #   
995
    writeFileInfo($SRC_ROOT);
996
    writeFileInfo($SRC_ROOT);
-
 
997
    push @tmpFiles, $opt_outfile;
996
 
998
 
997
    #
999
    #
998
    #   Create the target path in the target archive
1000
    #   Create the target path in the target archive
999
    #
1001
    #
1000
    LogFileOp ('Creating', $DPKG_DIR);
1002
    LogFileOp ('Creating', $DPKG_DIR);
Line 1062... Line 1064...
1062
# Returns         : Will not return on error
1064
# Returns         : Will not return on error
1063
#
1065
#
1064
sub createWindowsTar
1066
sub createWindowsTar
1065
{
1067
{
1066
    my ($tarPath) = @_;
1068
    my ($tarPath) = @_;
1067
    my @verboseArgs;
1069
    my @verboseArgs = qw(-bb1);
1068
    my $verboseCopyArg = '9';
1070
    my $verboseCopyArg = '9';
1069
    #
1071
    #
1070
    #   Ensure that the target file does not exist
1072
    #   Ensure that the target file does not exist
1071
    #   7z cannot ovewrite it
1073
    #   7z cannot ovewrite it
1072
    #
1074
    #