# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1275477138 -3600
# Node ID d9662ec4599f5119dd94a28bca5505bc6df50f20
# Parent  a2b996399a2ffd93a9dc4c0caf8c41f0a124b885
Allow multiple config files in joinsysdef.pl. Support ignoring items by namespace on the command line in sysmodelgen

diff -r a2b996399a2f -r d9662ec4599f sysdeftools/joinsysdef.pl
--- a/sysdeftools/joinsysdef.pl	Tue Jun 01 16:18:31 2010 +0100
+++ b/sysdeftools/joinsysdef.pl	Wed Jun 02 12:12:18 2010 +0100
@@ -30,7 +30,7 @@
 
 my $output;
 my $path;
-my $config;
+my @config;
 my @includes;
 my %defineParams;
 my %defines;
@@ -58,7 +58,7 @@
 	(
 	 'path=s' => \$path,
 	'output=s' => \$output,
-	'config=s' => \$config,
+	'config=s' => \@config,
 	'exclude-meta=s' => \@excludeMetaList
 	);
 
@@ -96,9 +96,9 @@
 my %nsmap;
 my %urimap;
 
-if($config ne '') 
+foreach my $conf (@config) 
 	{ # run cpp to get all #defines
-	&getDefines($config);
+	&getDefines($conf);
 	}
 
 my $parser = new XML::DOM::Parser;
@@ -340,7 +340,7 @@
 		$checkversion = $checkversion  || ($tag eq 'component' &&  $item->getNodeType==1 && $item->getAttribute('version') ne '');
 		}
 
-	if($checkversion && $config ne '')
+	if($checkversion && scalar(@config))
 		{ # need to check the conf metadata on the units in this component
 		&doCmpConfig($node);
 		}
@@ -647,7 +647,7 @@
 	my $metanode = shift;
 
 	my $rel = $metanode->getAttribute('rel') || 'Generic';
-	if($rel eq 'config' && $config ne '')
+	if($rel eq 'config' && scalar(@config))
 		{ # only process if there is something to configure
 		&doconfig($metanode);
 		}
diff -r a2b996399a2f -r d9662ec4599f sysmodelgen/src/SysModelGen.pm
--- a/sysmodelgen/src/SysModelGen.pm	Tue Jun 01 16:18:31 2010 +0100
+++ b/sysmodelgen/src/SysModelGen.pm	Wed Jun 02 12:12:18 2010 +0100
@@ -717,7 +717,8 @@
 		"<template name=\"filter\">\n";
 	foreach my $ig (@{$self->{'iIgnore'}}) {
 		print XSLT "\t<ignore xmlns='' ";
-		if($ig=~/^(.*):(.*)$/) {print XSLT "type='$1' name='$2'/>\n"}
+		if($ig=~/^(layer|package|block|logicalset|logicalsubset|subblock|collection|module|component):(.*)$/) {print XSLT "type='$1' name='$2'/>\n"}
+		elsif($ig=~/:.*\//) {print XSLT "namespace='$ig'/>\n"} # assume it's a namespace if it has a colon and a slash
 		else {print XSLT "ref='$ig'/>\n"}
 	}
 	foreach my $ig (@{$self->{'iIgnoreMeta'}}) {