author | Simon Howkins <simonh@symbian.org> |
Wed, 05 Aug 2009 17:49:35 +0100 | |
changeset 333 | 7b0a774a0c87 |
parent 331 | f7c6fc4239ac |
child 335 | 15307a7772ea |
permissions | -rw-r--r-- |
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
1 |
#!perl -w |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
2 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
3 |
use strict; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
4 |
|
331
f7c6fc4239ac
Fixed paths and drives for executing script.
Simon Howkins <simonh@symbian.org>
parents:
330
diff
changeset
|
5 |
use FindBin; |
f7c6fc4239ac
Fixed paths and drives for executing script.
Simon Howkins <simonh@symbian.org>
parents:
330
diff
changeset
|
6 |
use lib "$FindBin::Bin/lib"; |
f7c6fc4239ac
Fixed paths and drives for executing script.
Simon Howkins <simonh@symbian.org>
parents:
330
diff
changeset
|
7 |
|
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
8 |
use XML::Parser; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
9 |
use Data::Dumper; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
10 |
use Text::CSV; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
11 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
12 |
my $sourcesCSV = shift or die "First arg must be source csv file"; |
331
f7c6fc4239ac
Fixed paths and drives for executing script.
Simon Howkins <simonh@symbian.org>
parents:
330
diff
changeset
|
13 |
my $backupBaseDir = shift or die "Second arg must be path to tree of package_definitions to use if not found in the source packages"; |
f7c6fc4239ac
Fixed paths and drives for executing script.
Simon Howkins <simonh@symbian.org>
parents:
330
diff
changeset
|
14 |
shift and die "No more than two arguments please"; |
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
15 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
16 |
# Load CSV |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
17 |
open my $csvText, "<", $sourcesCSV or die; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
18 |
my $csv = Text::CSV->new(); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
19 |
my @keys; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
20 |
my @packages; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
21 |
while (my $line = <$csvText>) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
22 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
23 |
chomp $line; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
24 |
next unless $line; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
25 |
unless ($csv->parse($line)) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
26 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
27 |
my $err = $csv->error_input(); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
28 |
die "Failed to parse line '$line': $err"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
29 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
30 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
31 |
if (! @keys) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
32 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
33 |
# First line - note the column names |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
34 |
@keys = $csv->fields(); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
35 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
36 |
else |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
37 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
38 |
# Already got the keys, so get the data |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
39 |
my %package; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
40 |
# Read into a hash slice |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
41 |
@package{@keys} = $csv->fields(); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
42 |
push @packages, \%package; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
43 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
44 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
45 |
close $csvText; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
46 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
47 |
my $parser = new XML::Parser(Style => "Objects") or die; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
48 |
my $outTree; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
49 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
50 |
# For each package in CSV... |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
51 |
foreach my $package (@packages) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
52 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
53 |
warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
54 |
# Look for the pkg defn in the root of the package tree |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
55 |
my $pkgDef = "$package->{dst}/$package->{sysdef}"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
56 |
if (!-f $pkgDef) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
57 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
58 |
# Not there, so try the "backup" location |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
59 |
$pkgDef =~ s{^/sf/}{}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
60 |
$pkgDef =~ s{/[^/]*$}{}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
61 |
# TODO: Where will this be on the build machine? |
331
f7c6fc4239ac
Fixed paths and drives for executing script.
Simon Howkins <simonh@symbian.org>
parents:
330
diff
changeset
|
62 |
$pkgDef = "$backupBaseDir/$pkgDef/package_definition.xml"; |
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
63 |
} |
333
7b0a774a0c87
Made error messages more useful.
Simon Howkins <simonh@symbian.org>
parents:
331
diff
changeset
|
64 |
die "Unable to locate any package_definition at all for $package->{dst}" unless -f $pkgDef; |
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
65 |
|
333
7b0a774a0c87
Made error messages more useful.
Simon Howkins <simonh@symbian.org>
parents:
331
diff
changeset
|
66 |
my $pkgTree = eval { $parser->parsefile($pkgDef) } or die "Failed to parse $pkgDef : $@"; |
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
67 |
if (!$outTree) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
68 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
69 |
# The first file is taken verbatim |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
70 |
$outTree = $pkgTree; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
71 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
72 |
else |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
73 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
74 |
# Merge into output Tree |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
75 |
mergeTrees($outTree->[0], $pkgTree->[0]); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
76 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
77 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
78 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
79 |
#print Data::Dumper->Dump([$outTree->[0]], ["tree"]); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
80 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
81 |
# Output total tree |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
82 |
print "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
83 |
printTree($outTree->[0]); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
84 |
print "\n"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
85 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
86 |
sub mergeTrees |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
87 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
88 |
my $baseTree = shift or die; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
89 |
my $extrasTree = shift or die; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
90 |
|
333
7b0a774a0c87
Made error messages more useful.
Simon Howkins <simonh@symbian.org>
parents:
331
diff
changeset
|
91 |
die ("Package Definitions do not match: ".(ref $baseTree)." vs ".(ref $extrasTree)) unless ref $baseTree eq ref $extrasTree; |
329
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
92 |
return if ref $baseTree eq "main::Characters"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
93 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
94 |
foreach my $extraChild (@{$extrasTree->{Kids}}) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
95 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
96 |
# Work out whether this child should be merged with a namesake, or appended |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
97 |
my $mergeIt = undef; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
98 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
99 |
my $extraChildTag = ref $extraChild; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
100 |
$extraChildTag =~ s{^main::}{}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
101 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
102 |
if ($extraChildTag =~ m{^(SystemDefinition|systemModel)$}) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
103 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
104 |
# Should be merged if there's already one there |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
105 |
# warn "Always merge $extraChildTag"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
106 |
# Look for a namesake in the base |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
107 |
$mergeIt = matchTag($baseTree->{Kids}, $extraChild, undef); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
108 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
109 |
elsif ($extraChildTag =~ m{layer|block|package|collection|component}) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
110 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
111 |
# Should be merged if there is another tag with the same "name" attribute |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
112 |
# warn "Sometimes merge $extraChildTag"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
113 |
# Look for a namesake in the base |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
114 |
$mergeIt = matchTag($baseTree->{Kids}, $extraChild, "name"); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
115 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
116 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
117 |
if ($mergeIt) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
118 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
119 |
# Merge children |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
120 |
mergeTrees($mergeIt, $extraChild); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
121 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
122 |
else |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
123 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
124 |
# Add this child |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
125 |
push @{$baseTree->{Kids}}, $extraChild; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
126 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
127 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
128 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
129 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
130 |
sub matchTag |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
131 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
132 |
my $peers = shift; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
133 |
my $outsider = shift; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
134 |
my $attr = shift; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
135 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
136 |
foreach my $peer (@$peers) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
137 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
138 |
if (ref $peer eq ref $outsider && (!defined $attr || $peer->{$attr} eq $outsider->{$attr})) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
139 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
140 |
return $peer; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
141 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
142 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
143 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
144 |
return undef; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
145 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
146 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
147 |
sub printTree |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
148 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
149 |
my $tree = shift or die; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
150 |
die unless ref $tree; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
151 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
152 |
my $tagName = ref $tree; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
153 |
$tagName =~ s{^main::}{}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
154 |
if ($tagName eq "Characters") |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
155 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
156 |
print $tree->{Text}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
157 |
return; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
158 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
159 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
160 |
print "<$tagName"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
161 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
162 |
foreach my $attr (grep { ! ref $tree->{$_} } keys %$tree) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
163 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
164 |
print " $attr=\"$tree->{$attr}\""; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
165 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
166 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
167 |
my $children = $tree->{Kids}; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
168 |
if (scalar @$children) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
169 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
170 |
print ">"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
171 |
foreach my $child (@$children) |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
172 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
173 |
printTree($child); |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
174 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
175 |
print "</$tagName"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
176 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
177 |
else |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
178 |
{ |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
179 |
print "/" |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
180 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
181 |
|
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
182 |
print ">"; |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
183 |
} |
06c2c867c6ad
Added tool for collating a build definition from the set of package defintions indicated by the sources.csv
Simon Howkins <simonh@symbian.org>
parents:
diff
changeset
|
184 |