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"?>
<SystemDefinition schema="3.0.0">
<package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
<collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
<component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
<meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
<unit bldFile="homescreensrv_plat/action_handler_plugin_api/group" filter="!test"/>
<unit bldFile="homescreensrv_plat/action_handler_plugin_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
<meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
<unit bldFile="homescreensrv_plat/content_harvester_plugin_api/group" filter="!test"/>
<unit bldFile="homescreensrv_plat/content_harvester_plugin_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
<meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
<unit bldFile="homescreensrv_plat/menu_sat_interface_api/group" filter="!test"/>
<unit bldFile="homescreensrv_plat/menu_sat_interface_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
<meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
<unit bldFile="homescreensrv_plat/sapi_contentpublishing/group"/>
</component>
<component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
<meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
<unit bldFile="homescreensrv_plat/sapi_actionhandler/group"/>
</component>
</collection>
<collection id="contentpublishingsrv" name="Content Publishing Service" level="server">
<component id="contentpublishingdebug" filter="s60" name="Content Publishing Debug">
<!-- need to move this component outside of contentpublishingutils and into separate component directory -->
<meta rel="config">
<defined condition="CONTENT_PUBLISHER_DEBUG"/>
</meta>
<!-- <unit bldFile="contentpublishingsrv/contentpublishingutils/contentpublishingdebug/group"/> -->
</component>
<component id="contentpublishingutils" filter="s60" name="Content Publishing Utils">
<unit bldFile="contentpublishingsrv/contentpublishingutils/group"/>
</component>
<component id="contentpublishingserver" filter="s60" name="Content Publishing Server">
<unit bldFile="contentpublishingsrv/contentpublishingserver/group"/>
</component>
<component id="contentharvester" filter="s60" name="Content Harvester">
<unit bldFile="contentpublishingsrv/contentharvester/group"/>
</component>
<component id="contentpublishingsrv_build" filter="s60" name="Content Publishing Service Build">
<!-- need to remove links to the above components and just contain the IBY (or move the IBY into another component).
If keeping, it need to move down a directory.-->
<unit bldFile="contentpublishingsrv/group"/>
</component>
</collection>
</package>
</SystemDefinition>