Subversion Repositories DevTools

Rev

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

Rev 5578 Rev 5582
Line 238... Line 238...
238 
        $pkgData{$srcfile}{basename} = $basename;
 238 
        $pkgData{$srcfile}{basename} = $basename;
239 
        mkpath ($basename);
 239 
        mkpath ($basename);
240 
        Error ("Temp subdir $basename not created: $!") unless -d $basename;
 240 
        Error ("Temp subdir $basename not created: $!") unless -d $basename;
241 
        my $rv = System ('tar', '-xzmf', $srcfile,
241 
        my $rv = System ('tar', '-xzmf', $srcfile,
242 
                            IsVerbose(1) ? '-v' : undef,
242 
                            IsVerbose(1) ? '-v' : undef,
243 
                            '-C', $basename,
243 
                            '-C', $basename,
- 
 
 244 
                            '--no-anchored',
244 
                            '--wildcards', './built.files.*.xml' );
 245 
                            '--wildcards', 'built.files.*.xml' );
245 
        Error("Tar extraction error: $srcfile") if ($rv);
 246 
        Error("Tar extraction error: $srcfile") if ($rv);
246 
    }
 247 
    }
247 
 
 248 
 
248 
    #
 249 
    #
249 
    #   Read in the XML from each of the files
 250 
    #   Read in the XML from each of the files
Line 254... Line 255...
254 
    my %fileData;
 255 
    my %fileData;
255 
    my @newXml;
 256 
    my @newXml;
256 
    foreach my $srcfile ( keys %pkgData )
 257 
    foreach my $srcfile ( keys %pkgData )
257 
    {
 258 
    {
258 
        my @extracted = glob(catfile($pkgData{$srcfile}{basename}, 'built.files.*.xml'));
 259 
        my @extracted = glob(catfile($pkgData{$srcfile}{basename}, 'built.files.*.xml'));
- 
 
 260 
        Error("built.files.*.xml not found in root of extracted package") unless @extracted;
- 
 
 261 
        Warning("Multiple built.files.*.xml files", @extracted) if (scalar @extracted > 1);
259 
        foreach my $srcfile ( @extracted)
 262 
        foreach my $srcfile ( @extracted)
260 
        {
 263 
        {
- 
 
 264 
            Verbose3("Parse XML in: $srcfile");
261 
            my $ref = XML::Simple::XMLin($srcfile, ForceArray => 1, KeyAttr => []);
 265 
            my $ref = XML::Simple::XMLin($srcfile, ForceArray => 1, KeyAttr => []);
262 
            #DebugDumpData("REF - $srcfile, " .ref($ref), $ref);
 266 
            #DebugDumpData("REF - $srcfile, " .ref($ref), $ref);
263 
 
 267 
 
264 
            my $entryExists;
 268 
            my $entryExists;
265 
            my $keepEntry;
 269 
            my $keepEntry;
Line 725... Line 729...
725 
    -[no]mergeErrors   - Allow merge errors
 729 
    -[no]mergeErrors   - Allow merge errors
726 
    -[no]preDelete     - Predelete generated package
 730 
    -[no]preDelete     - Predelete generated package
727 
    -[no]keepFragments - Delete input package fragments
 731 
    -[no]keepFragments - Delete input package fragments
728 
    -[no]testArchive   - Perform operations within a test archive
 732 
    -[no]testArchive   - Perform operations within a test archive
729 
    -output=path       - Base of test package archive
 733 
    -output=path       - Base of test package archive
- 
 
 734 
    -tmpdir=path       - Specified temp directory
730 
 
 735 
 
731 
=head1 OPTIONS
 736 
=head1 OPTIONS
732 
 
 737 
 
733 
=over 8
 738 
=over 8
734 
 
 739 
 
Line 800... Line 805...
800 
This option allows the user to specify to root of a test package archive.
 805 
This option allows the user to specify to root of a test package archive.
801 
The dafualt is to use the value provided by GBE_DPKG - the main package archive.
 806 
The dafualt is to use the value provided by GBE_DPKG - the main package archive.
802 
 
 807 
 
803 
This option is intended for testing use only.
 808 
This option is intended for testing use only.
804 
 
 809 
 
- 
 
 810 
=item B<-tmpdir=path>
- 
 
 811 
 
- 
 
 812 
This option allow the user to specify a directory to be used to store temp files.
- 
 
 813 
It will not be deleted at the end of processing.
- 
 
 814 
 
- 
 
 815 
This option is intended for testing use only.
- 
 
 816 
 
805 
=back
 817 
=back
806 
 
 818 
 
807 
=head1 DESCRIPTION
 819 
=head1 DESCRIPTION
808 
 
 820 
 
809 
This utility program is used by the build system to assemble (merge) build artifacts from several
 821 
This utility program is used by the build system to assemble (merge) build artifacts from several