diff -r 97d29037659e -r 1bdf644455fe common/tools/mergeXML.pl --- a/common/tools/mergeXML.pl Mon Oct 05 15:17:20 2009 +0100 +++ b/common/tools/mergeXML.pl Mon Oct 05 16:00:45 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);