sysmodelgen bugfix when drawing collections next to nested packages. Major revision to validation script checklinks.pl (it's now reliable). joinsysdef.pl now reports errors on duplicate IDs.
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE SystemDefinition [
<!ELEMENT SystemDefinition ( systemModel )>
<!ATTLIST SystemDefinition
name CDATA #REQUIRED
schema CDATA #REQUIRED
>
<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
<!-- System Model Section of DTD -->
<!ELEMENT systemModel (layer+)>
<!ELEMENT layer (block* | collection*)*>
<!-- Kernel Services, Base Services, OS Services, Etc -->
<!ATTLIST layer
name CDATA #REQUIRED
long-name CDATA #IMPLIED
levels NMTOKENS #IMPLIED
span CDATA #IMPLIED
>
<!ELEMENT block (subblock* | collection*)*>
<!-- Generic OS services, Comms Services, etc -->
<!ATTLIST block
levels NMTOKENS #IMPLIED
span CDATA #IMPLIED
level NMTOKEN #IMPLIED
name CDATA #REQUIRED
long-name CDATA #IMPLIED
>
<!ELEMENT subblock (collection)*>
<!-- Cellular Baseband Services, Networking Services, etc -->
<!ATTLIST subblock
name CDATA #REQUIRED
long-name CDATA #IMPLIED
>
<!ELEMENT collection (component)*>
<!-- Screen Driver, Content Handling, etc -->
<!ATTLIST collection
name CDATA #REQUIRED
long-name CDATA #IMPLIED
level NMTOKEN #IMPLIED
>
<!ELEMENT component (unit)*>
<!-- contains units or is a package or prebuilt -->
<!ATTLIST component
name CDATA #REQUIRED
long-name CDATA #IMPLIED
deprecated CDATA #IMPLIED
introduced CDATA #IMPLIED
contract CDATA #IMPLIED
plugin (Y|N) "N"
filter CDATA #IMPLIED
class NMTOKENS #IMPLIED
supports CDATA #IMPLIED
purpose ( optional | mandatory | development ) "optional"
>
<!ELEMENT unit EMPTY >
<!-- must be buildable (bld.inf) -->
<!-- bldFile may someday be removed in favour of mrp -->
<!ATTLIST unit
mrp CDATA #IMPLIED
filter CDATA #IMPLIED
bldFile CDATA #IMPLIED
root CDATA #IMPLIED
version NMTOKEN #IMPLIED
prebuilt NMTOKEN #IMPLIED
late (Y|N) #IMPLIED
priority CDATA #IMPLIED
>
]>
<SystemDefinition name="Symbian^3" schema="2.0.1">
<systemModel>
<layer name="app" long-name="Applications" levels="services apps">
<block name="contentcontrol" level="services" long-name="Content Control Daemons" levels="plugin app">
<collection name="contentctrl_plat" long-name="Content Control Daemons Platforn Interfaces" level="app">
<component name="oma_ds_presync_plugin_api" long-name="OMA DS PreSync Plugin API" filter="s60" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/oma_ds_presync_plugin_api/group"/>
</component>
<component name="ds_agenda_handler_plugin_api" long-name="DS Agenda Handler Plugin API" filter="s60" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_agenda_handler_plugin_api/group"/>
</component>
<component name="ds_folder_util_api" long-name="DS Folder Util API" filter="s60" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
</component>
<component name="adapter_customization_api" long-name="Adapter Customization API" filter="s60" introduced="^3" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
</component>
<component name="ds_data_modification_api" long-name="DS Data Modification API" filter="s60" introduced="^3" class="api">
<unit bldFile="/sf/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
</component>
</collection>
<collection name="dsdcmoadapter" long-name="Data Sync DCMO Adapter" level="plugin">
<!-- Component at wrong rank, should move down a directory -->
<component name="dsdcmoadapter_build" filter="s60" long-name="Data Sync Control DCMO Adapter">
<unit bldFile="/sf/app/contentcontrol/dsdcmoadapter/group"/>
</component>
</collection>
<collection name="omads" long-name="OMA Data Sync" level="app">
<component name="omadsappui" filter="s60" long-name="OMA DS Application UI">
<unit bldFile="/sf/app/contentcontrol/omads/omadsappui/group"/>
</component>
<component name="omadsextensions" filter="s60" long-name="OMA DS Extensions" plugin="Y">
<unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
</component>
</collection>
</block>
</layer>
</systemModel>
</SystemDefinition>