catchup merge.
--- a/common/tools/brag/bragForDiamonds.xsl Mon Oct 05 17:17:06 2009 +0100
+++ b/common/tools/brag/bragForDiamonds.xsl Mon Oct 05 17:17:29 2009 +0100
@@ -8,6 +8,7 @@
<xsl:variable name="unknownCount" select="count(phase/step/failures[@level!='critical' and @level!='major' and @level!='minor']/failure)"/>
<diamonds-build>
+ <schema>13</schema>
<build>
<status>
<xsl:choose>
--- a/common/tools/mergeXML.pl Mon Oct 05 17:17:06 2009 +0100
+++ b/common/tools/mergeXML.pl Mon Oct 05 17:17:29 2009 +0100
@@ -38,7 +38,7 @@
{
print <<"EOT";
-mergeXML.pl --xsl=brag.xsl --merge=SystemDefinition,systemModel,layer(name),block(name),package(name) sysModel1.xml [model2.xml ...] > output.xml
+mergeXML.pl --xsl=brag.xsl --merge=SystemDefinition,systemModel,layer(name),block(name),package(name) sysModel1.xml [model*.xml ...] > output.xml
EOT
exit(0 + !$help);
}
@@ -52,6 +52,9 @@
$mergeTags->{$tag} = $attribute;
}
+# Expand wildcards
+@ARGV = map { glob $_ } @ARGV;
+
# Merge all the trees together
my $outTree = mergeMultipleTrees($mergeTags, @ARGV);