--- a/symbian4/mw/searchsrv/package_definition.xml Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml Wed May 26 17:30:43 2010 +0100
@@ -1,145 +1,70 @@
<?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^4" schema="2.0.1">
- <systemModel>
- <layer name="mw" long-name="Middleware" levels="generic specific">
- <block name="searchsrv" level="specific" long-name="Search Services" levels="services engine generic api">
- <collection name="searchsrv_plat" long-name="Search Services Platform Interfaces" level="api">
- <component name="cpix_utility_api" long-name="CPIX Utility API" filter="s60" introduced="^4" class="api">
- <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_utility_api/group"/>
- </component>
- <component name="cpix_framework_api" long-name="CPIX Framework API" filter="s60" introduced="^4" class="api">
- <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_framework_api/group"/>
- </component>
- <component name="cpix_search_api" long-name="CPIX Search API" filter="s60" introduced="^4" class="api">
- <unit bldFile="/sf/mw/searchsrv/searchsrv_plat/cpix_search_api/group"/>
- </component>
- </collection>
- <collection name="searchengine" long-name="Search Engine" level="engine">
- <component name="searchengine_util" long-name="Search Engine Utils" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/searchengine/util/group"/>
- </component>
- <component name="searchengine_oss" long-name="Search Engine OSS" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/searchengine/oss/group"/>
- </component>
- <component name="cpix" long-name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/searchengine/cpix/group"/>
- </component>
- </collection>
- <collection name="searcher" long-name="Searcher" level="generic">
- <component name="searchclient" long-name="Search Client" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/searcher/SearchClient/group"/>
- </component>
- <component name="searchserver" long-name="Search Server" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/searcher/SearchServer/group"/>
- </component>
- <component name="searcher_test" long-name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
- <!-- #include from common bld.inf or split into two components -->
- <unit bldFile="/sf/mw/searchsrv/searcher/tsrc/RobustnessTest/group"/>
- <unit bldFile="/sf/mw/searchsrv/searcher/tsrc/LogPlayer/group"/>
- </component>
- </collection>
- <collection name="searchsrv_harvester" long-name="Search Services Harvester" level="services">
- <component name="searchsrv_pluginfw" long-name="Search Server" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/harvester/pluginfw/group"/>
- </component>
- <component name="searchsrv_harvesterserver" long-name="Search Harvester Server" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/harvester/HarvesterServer/group"/>
- </component>
- </collection>
- <collection name="searchsrv_watchdog" long-name="Search Services Watch Dog" level="services">
- <component name="searchsrv_watchdog_build" long-name="Search Services Watch Dog Build" filter="s60" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/WatchDog/group"/>
- </component>
- </collection>
- <collection name="qcpix" long-name="Qt CPIX" level="engine">
- <component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/qcpix" proFile="qcpix.pro"/>
- </component>
- </collection>
- <collection name="searchsrv_info" long-name="Search Services Info">
- <component name="searchsrv_build" long-name="Search Services Build" introduced="^4">
- <!-- move exports to own component and remove this -->
- <unit bldFile="/sf/mw/searchsrv/group"/>
- </component>
- <component name="searchsrv_test" long-name="Search Services Test" purpose="development" filter="test" introduced="^4">
- <unit bldFile="/sf/mw/searchsrv/tsrc/CPixMWTester/group"/>
- </component>
- </collection>
- </block>
- </layer>
- </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="searchsrv" name="Search Services" levels="services engine generic api">
+ <collection id="searchsrv_plat" name="Search Services Platform Interfaces" level="api">
+ <component id="cpix_utility_api" name="CPIX Utility API" filter="s60" class="api" introduced="^4">
+ <meta rel="Api" href="searchsrv_plat/cpix_utility_api/cpix_utility_api.metaxml"/>
+ <unit bldFile="searchsrv_plat/cpix_utility_api/group"/>
+ </component>
+ <component id="cpix_framework_api" name="CPIX Framework API" filter="s60" class="api" introduced="^4">
+ <meta rel="Api" href="searchsrv_plat/cpix_framework_api/cpix_framework_api.metaxml"/>
+ <unit bldFile="searchsrv_plat/cpix_framework_api/group"/>
+ </component>
+ <component id="cpix_search_api" name="CPIX Search API" filter="s60" class="api" introduced="^4">
+ <meta rel="Api" href="searchsrv_plat/cpix_search_api/cpix_search_api.metaxml"/>
+ <unit bldFile="searchsrv_plat/cpix_search_api/group"/>
+ </component>
+ </collection>
+ <collection id="searchengine" name="Search Engine" level="engine">
+ <component id="searchengine_util" name="Search Engine Utils" filter="s60" introduced="^4">
+ <unit bldFile="searchengine/util/group"/>
+ </component>
+ <component id="searchengine_oss" name="Search Engine OSS" filter="s60" introduced="^4">
+ <unit bldFile="searchengine/oss/group"/>
+ </component>
+ <component id="cpix" name="Cross Platform Indexing Engine" filter="s60" introduced="^4">
+ <unit bldFile="searchengine/cpix/group"/>
+ </component>
+ </collection>
+ <collection id="searcher" name="Searcher" level="generic">
+ <component id="searchclient" name="Search Client" filter="s60" introduced="^4">
+ <unit bldFile="searcher/SearchClient/group"/>
+ </component>
+ <component id="searchserver" name="Search Server" filter="s60" introduced="^4">
+ <unit bldFile="searcher/SearchServer/group"/>
+ </component>
+ <component id="searcher_test" name="Searcher Tests" filter="s60" purpose="development" introduced="^4">
+ <!-- #include from common bld.inf or split into two components -->
+ <unit bldFile="searcher/tsrc/RobustnessTest/group"/>
+ <unit bldFile="searcher/tsrc/LogPlayer/group"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_harvester" name="Search Services Harvester" level="services">
+ <component id="searchsrv_pluginfw" name="Search Server" filter="s60" introduced="^4">
+ <unit bldFile="harvester/pluginfw/group"/>
+ </component>
+ <component id="searchsrv_harvesterserver" name="Search Harvester Server" filter="s60" introduced="^4">
+ <unit bldFile="harvester/HarvesterServer/group"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_watchdog" name="Search Services Watch Dog" level="services">
+ <component id="searchsrv_watchdog_build" name="Search Services Watch Dog Build" filter="s60" introduced="^4">
+ <unit bldFile="WatchDog/group"/>
+ </component>
+ </collection>
+ <collection id="qcpix" name="Qt CPIX" level="engine">
+ <component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
+ <unit bldFile="qcpix" qt:proFile="qcpix.pro"/>
+ </component>
+ </collection>
+ <collection id="searchsrv_info" name="Search Services Info">
+ <component id="searchsrv_build" name="Search Services Build" introduced="^4">
+ <!-- move exports to own component and remove this -->
+ <unit bldFile="group"/>
+ </component>
+ <component id="searchsrv_test" name="Search Services Test" purpose="development" filter="test" introduced="^4">
+ <unit bldFile="tsrc/CPixMWTester/group"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>