# HG changeset patch # User Bob Rosenberg # Date 1271761230 -3600 # Node ID c6ed39028553e3746aa0a56bfac1e1c7745a1b67 # Parent 78e000a8c08afaa0286fccfa6ed24261b1d3b2fc# Parent 207111115051d1924bf5842e9c5cd1e9a1cd002f Merge diff -r 207111115051 -r c6ed39028553 symbian3/app/organizer/package_definition.xml --- a/symbian3/app/organizer/package_definition.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/app/organizer/package_definition.xml Tue Apr 20 12:00:30 2010 +0100 @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> @@ -335,7 +335,7 @@ - + diff -r 207111115051 -r c6ed39028553 symbian3/app/organizer/package_definition_3.0.xml --- a/symbian3/app/organizer/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/app/organizer/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -286,7 +286,7 @@ - + diff -r 207111115051 -r c6ed39028553 symbian3/mw/locationsrv/package_definition.xml --- a/symbian3/mw/locationsrv/package_definition.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/locationsrv/package_definition.xml Tue Apr 20 12:00:30 2010 +0100 @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> @@ -161,12 +161,14 @@ + + + + - - - + diff -r 207111115051 -r c6ed39028553 symbian3/mw/locationsrv/package_definition_3.0.xml --- a/symbian3/mw/locationsrv/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/locationsrv/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -111,14 +111,14 @@ + + + + - - - - diff -r 207111115051 -r c6ed39028553 symbian3/mw/qt/package_definition_3.0.xml --- a/symbian3/mw/qt/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/qt/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -10,7 +10,7 @@ - + /> diff -r 207111115051 -r c6ed39028553 symbian3/mw/remotemgmt/package_definition.xml --- a/symbian3/mw/remotemgmt/package_definition.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/remotemgmt/package_definition.xml Tue Apr 20 12:00:30 2010 +0100 @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> @@ -197,10 +197,10 @@ - + - + diff -r 207111115051 -r c6ed39028553 symbian3/mw/remotemgmt/package_definition_3.0.xml --- a/symbian3/mw/remotemgmt/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/remotemgmt/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -157,10 +157,10 @@ - + - + diff -r 207111115051 -r c6ed39028553 symbian3/mw/web/package_definition.xml --- a/symbian3/mw/web/package_definition.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/web/package_definition.xml Tue Apr 20 12:00:30 2010 +0100 @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> @@ -119,8 +119,8 @@ - - + + @@ -278,7 +278,7 @@ - @@ -307,7 +307,7 @@ - diff -r 207111115051 -r c6ed39028553 symbian3/mw/web/package_definition_3.0.xml --- a/symbian3/mw/web/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/mw/web/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -56,7 +56,7 @@ - + @@ -231,7 +231,7 @@ - @@ -284,7 +284,7 @@ - diff -r 207111115051 -r c6ed39028553 symbian3/os/deviceplatformrelease/package_definition.xml --- a/symbian3/os/deviceplatformrelease/package_definition.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/os/deviceplatformrelease/package_definition.xml Tue Apr 20 12:00:30 2010 +0100 @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> @@ -156,18 +156,18 @@ - + - + - diff -r 207111115051 -r c6ed39028553 symbian3/os/deviceplatformrelease/package_definition_3.0.xml --- a/symbian3/os/deviceplatformrelease/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/os/deviceplatformrelease/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -81,13 +81,13 @@ - + - + - + diff -r 207111115051 -r c6ed39028553 symbian3/os/lbs/package_definition.xml --- a/symbian3/os/lbs/package_definition.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/os/lbs/package_definition.xml Tue Apr 20 12:00:30 2010 +0100 @@ -1,78 +1,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> @@ -139,20 +139,10 @@ - - - - - - - - - - diff -r 207111115051 -r c6ed39028553 symbian3/os/lbs/package_definition_3.0.xml --- a/symbian3/os/lbs/package_definition_3.0.xml Tue Apr 20 10:20:14 2010 +0100 +++ b/symbian3/os/lbs/package_definition_3.0.xml Tue Apr 20 12:00:30 2010 +0100 @@ -63,20 +63,10 @@ - - - - - - - - - - diff -r 207111115051 -r c6ed39028553 sysdeftools/joinsysdef-module.xsl --- a/sysdeftools/joinsysdef-module.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysdeftools/joinsysdef-module.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -385,7 +385,7 @@ - +

diff -r 207111115051 -r c6ed39028553 sysdeftools/joinsysdef.pl --- a/sysdeftools/joinsysdef.pl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysdeftools/joinsysdef.pl Tue Apr 20 12:00:30 2010 +0100 @@ -271,19 +271,15 @@ } # if we're here we can just embed the file # no processing logic is done! It's just embedded blindly - my $metadoc = $parser->parsefile ($file); - my $item =&firstElement($metadoc->getDocumentElement); + my $metadoc = $parser->parsefile ($link); + my $item = $metadoc->getDocumentElement; if(!$item) { print STDERR "Warning: Could not process metadata file: $link\n"; next; # do not alter children } $node->removeAttribute('href'); - foreach my $child (@{$item->getChildNodes}) - { - &blindCopyInto($node,$child); - next; - } + &blindCopyInto($node,$item); } if($node->getAttribute('rel') eq 'link-mapping') {# need to process this now @@ -745,4 +741,5 @@ else {die "cannot process $_";} } close CPP; + $? && die "Call to cpp produced an error"; } diff -r 207111115051 -r c6ed39028553 sysdeftools/mergesysdef-module.xsl --- a/sysdeftools/mergesysdef-module.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysdeftools/mergesysdef-module.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -18,9 +18,9 @@ ERROR: Syntax not supported - + @@ -130,8 +130,8 @@ ERROR: Syntax not supported - - ERROR: Can only merge stand-alone system models + + ERROR: Can only merge system models of the same rank @@ -226,7 +226,7 @@

- +

@@ -316,6 +316,43 @@

+ + + + + + + +

+ + +

+ * + + + + + + + + +

+<----> + + ="" + + + + rel="Generic" + type="auto" + > + + + + + @@ -325,6 +362,7 @@ + @@ -388,7 +426,10 @@ - + + + +

diff -r 207111115051 -r c6ed39028553 sysdeftools/mergesysdef.xsl --- a/sysdeftools/mergesysdef.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysdeftools/mergesysdef.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -22,10 +22,16 @@ - + Syntax not supported - + + Can only merge fragments of the same rank + + +

Upstream

@@ -36,11 +42,14 @@ - +

Downstream

+ + Can only merge fragments of the same rank +

diff -r 207111115051 -r c6ed39028553 sysmodelgen/core/draw-model.xsl --- a/sysmodelgen/core/draw-model.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/core/draw-model.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -33,6 +33,7 @@ + @@ -334,7 +335,7 @@ - + @@ -945,12 +946,12 @@ - + - + -

diff -r 207111115051 -r c6ed39028553 sysmodelgen/core/filtersysdef-module.xsl --- a/sysmodelgen/core/filtersysdef-module.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/core/filtersysdef-module.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -8,7 +8,9 @@ - + + + @@ -21,7 +23,7 @@

- +

@@ -65,6 +67,19 @@ ignore

+ + + + + ignore + + + + + ignore + diff -r 207111115051 -r c6ed39028553 sysmodelgen/core/joinsysdef-module.xsl --- a/sysmodelgen/core/joinsysdef-module.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/core/joinsysdef-module.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -49,7 +49,7 @@ Cannot set "", already set - +

@@ -319,7 +319,6 @@

@@ -440,7 +439,7 @@

- + @@ -451,10 +450,12 @@ + - + +

diff -r 207111115051 -r c6ed39028553 sysmodelgen/core/mergesysdef-module.xsl --- a/sysmodelgen/core/mergesysdef-module.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/core/mergesysdef-module.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -1,14 +1,26 @@ + - http://www.symbian.org/system-definition - Syntax not supported + ERROR: Syntax not supported - - Can only merge stand-alone system models - + @@ -74,7 +86,7 @@

- "" for + Warning: need definition for namespace "" for

@@ -92,7 +104,7 @@ - Cannot create namespace prefix for downstream default namespace + ERROR: Cannot create namespace prefix for downstream default namespace in

@@ -116,10 +128,10 @@ - Syntax not supported + ERROR: Syntax not supported - - Can only merge stand-alone system models + + ERROR: Can only merge system models of the same rank diff -r 207111115051 -r c6ed39028553 sysmodelgen/core/mergesysdef.xsl --- a/sysmodelgen/core/mergesysdef.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/core/mergesysdef.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -22,10 +22,16 @@ - + Syntax not supported - + + Can only merge fragments of the same rank + + +

Upstream

@@ -36,11 +42,14 @@ - +

Downstream

+ + Can only merge fragments of the same rank +

diff -r 207111115051 -r c6ed39028553 sysmodelgen/extra/makeabbrev.xsl --- a/sysmodelgen/extra/makeabbrev.xsl Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/extra/makeabbrev.xsl Tue Apr 20 12:00:30 2010 +0100 @@ -14,6 +14,8 @@ + +

@@ -104,7 +106,7 @@ - +

diff -r 207111115051 -r c6ed39028553 sysmodelgen/src/SysModelGen.pm --- a/sysmodelgen/src/SysModelGen.pm Tue Apr 20 10:20:14 2010 +0100 +++ b/sysmodelgen/src/SysModelGen.pm Tue Apr 20 12:00:30 2010 +0100 @@ -147,7 +147,9 @@ 'iHide' => { 'type' => 'attr[=val]', 'ordered' => 1,'param' => "hide-attr=s", 'class' =>'Model Control', 'desc' => 'A mechanism of filtering which allows filtering based on component attribute values. If a value is set for that attribute, the component will not be shown on the model. Use in conjunction with -show-attr for fine contol of what is shown. "class" and "filter" attribtues are handled specially -- see the documentation for details'}, 'iIgnore' => { 'type' => 'item', 'multi' => 1, 'param' => "ignore=s", 'xpath' => '/model/ignore', - 'class' =>'Model Control', 'desc' => 'A model entity to not draw, in the form "[item-type]:[item-name]". Any number of these can be used. Defaults to "layer:Tools and Utils and SDKENG" ,"layer:MISC", "block:Techview"'}, + 'class' =>'Model Control', 'desc' => 'The ID of a model entity to not draw. Any number of these can be used'}, + 'iIgnoreMeta' => { 'type' => 'item', 'multi' => 1, 'param' => "ignore-meta=s", 'xpath' => '/model/ignore', + 'class' =>'Model Control', 'desc' => 'The "rel" meta value to ignore. Takes the form of [relvalue] or [relvalue]:[type]. Any number of these can be used'}, 'iNavCtrl' =>{'param' => "navctrl=s" , 'type'=>'boolean' , 'xpath' => '/model/layout/@navctrl', 'class' =>'Model Control', 'desc' => 'If set, a navigation control widget will appear in the upper left corner of the model. The control might not work on some SVG viewers.'}, @@ -188,7 +190,7 @@ 'iXsltParam' =>{ 'multi' => 2, 'param' => "xslt-param=s", 'class' =>'Build Control', 'desc' => 'Advanced: Parameters to feed directly to the XSLT transforms'}, 'iLegendNote' =>{ 'multi' => 1, 'param' => "note=s", 'xpath' => '/model/layout/legend/note', - 'class' => 'Labels', 'desc' => 'Free text to appear inside the legend box, on the rightmost side. If multiple ones are provided, they will appear as separate boxes from left to right. Newlines and other special characters can be entity-encoded (e.g. )'} + 'class' => 'Labels', 'desc' => 'Free text to appear inside the legend box, on the rightmost side. If multiple ones are provided, they will appear as separate boxes from left to right. Newlines and other special characters can be entity-encoded (e.g. ). When using entities in an INI file, you *must* quote the value, otherwise the # will be treated as a comment delimiter.',} ); $self->{iArgs} = \%Args; @@ -668,7 +670,7 @@ } elsif(!$cur->{'multi'}){ $info{$match}.="\t\n"; } - } elsif($param eq 'iIgnore' or $param eq 'iLinkExpr' or $param eq 'iSysDefFile') { + } elsif($param eq 'iIgnore' or $param eq 'iIgnoreMeta' or $param eq 'iLinkExpr' or $param eq 'iSysDefFile') { print XSLT "\n";