CompilerCompatibility/mw/appinstall/package_definition.xml
changeset 139 012b7ecead80
parent 32 f796f85fb016
child 212 a44ae815a47f
--- a/CompilerCompatibility/mw/appinstall/package_definition.xml	Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/mw/appinstall/package_definition.xml	Tue Mar 16 16:25:56 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ELEMENT SystemDefinition (systemModel)>
  <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
   schema CDATA #REQUIRED>
@@ -49,94 +49,86 @@
   prebuilt NMTOKEN #IMPLIED
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
- <!ELEMENT SystemBuild (option*|target+|targetList+|list+|configuration+)*>
- <!ATTLIST SystemBuild schema CDATA #REQUIRED>
- <!ELEMENT list (ref+)>
- <!ATTLIST list
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT ref EMPTY>
- <!ATTLIST ref item CDATA #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y|N) #REQUIRED>
- <!ELEMENT configuration (listRef+|ref+|task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task (listRef*,(buildLayer|specialInstructions))>
- <!ELEMENT listRef EMPTY>
- <!ATTLIST listRef list CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y|N) #REQUIRED
-  targetParallel (Y|N) 'N'>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  root CDATA #IMPLIED
-  command CDATA #REQUIRED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^3">
+<SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
 <block name="appinstall" level="generic" long-name="Application Installation" levels="tool framework generic api">
-<collection name="installationservices" long-name="Installation Services" level="generic">
-<component name="swi" long-name="Secure Software Install" purpose="optional">
-<unit bldFile="/sf/mw/appinstall/installationservices/swi/group" mrp="/sf/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
-</component>
-<component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
-<unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
-</component>
-<component name="switestfw" long-name="Software Install Test Framework" deprecated="tb92" introduced="7.0" purpose="development">
-<unit mrp="/sf/mw/appinstall/installationservices/switestfw/group/install_testframework.mrp"/>
-</component>
-<component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
-<unit bldFile="/sf/mw/appinstall/installationservices/swiconfig/group" mrp="/sf/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
-</component>
-</collection>
-<collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
-<component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
-<unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-</component>
-<component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
-<unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
-</component>
-<component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
-<unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-</component>
-<component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
-<unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/group" mrp="/sf/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
-</component>
-</collection>
-<collection name="appinstall_info" long-name="Application Installation Info" level="api">
-<component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC">
-<unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-</component>
-</collection>
-<collection name="s60">
-<component name="appinstall">
-<unit bldFile="/sf/mw/appinstall/group" mrp=""/>
-</component>
-</collection>
-</block>
+    <collection name="ncdengine" long-name="Nokia Content Discover" level="framework">
+     <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+     <component name="ncdengine_engine" filter="s60" long-name="NCD Engine" introduced="^1">
+      <unit bldFile="/sf/mw/appinstall/ncdengine/engine/group"/>
+     </component>
+     <component name="debuglogger" filter="s60" long-name="NCD Debug Logger" introduced="^1" class="placeholder">
+      <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
+     </component>
+     <component name="ncdengine_build" filter="s60" long-name="NCD Build" introduced="^1">
+      <unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
+     </component>
+    </collection>
+    <collection name="appinstaller" long-name="Application Installer" level="generic">
+     <component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
+      <unit bldFile="/sf/mw/appinstall/appinstaller/appmngr2/group"/>
+     </component>
+     <component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
+      <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
+     </component>
+    </collection>
+    <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
+     <!-- the collection is really a component. Move down a directory.-->
+     <component name="iaupdateapi_stub_build" long-name="IA Update API Stub Build" filter="s60" introduced="^2">
+      <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
+     </component>
+    </collection>
+    <collection name="iaupdate" long-name="Independent Apps Update" level="api">
+     <!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
+     <component name="iad" long-name="Software Update" filter="s60" introduced="^2">
+      <unit bldFile="/sf/mw/appinstall/iaupdate/iad/group"/>
+     </component>
+     <component name="iaupdate_help" filter="s60" long-name="IA Update Help" introduced="^2">
+      <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
+     </component>
+     <component name="iaupdate_build" filter="s60" long-name="IA Update Build" introduced="^2">
+      <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
+     </component>
+    </collection>
+    <collection name="installationservices" long-name="Installation Services" level="generic">
+     <component name="swi" long-name="Secure Software Install" purpose="optional">
+      <unit bldFile="/sf/mw/appinstall/installationservices/swi/group" mrp="/sf/mw/appinstall/installationservices/swi/group/security_swi.mrp"/>
+     </component>
+     <component name="swidevicetools" long-name="Secure Software Install Device Tools" introduced="8.1" purpose="development">
+      <unit bldFile="/sf/mw/appinstall/installationservices/swidevicetools/group" mrp="/sf/mw/appinstall/installationservices/swidevicetools/group/security_switools_device.mrp"/>
+     </component>
+     <component name="swiconfig" long-name="Software Install Config" introduced="9.1" purpose="optional" class="config">
+      <unit bldFile="/sf/mw/appinstall/installationservices/swiconfig/group" mrp="/sf/mw/appinstall/installationservices/swiconfig/group/install_config.mrp"/>
+     </component>
+    </collection>
+    <collection name="secureswitools" long-name="Secure Software Install Tools" level="tool">
+     <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC">
+      <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
+     </component>
+     <component name="swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC">
+      <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/>
+     </component>
+     <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC">
+      <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
+     </component>
+     <component name="swisistools" long-name="Secure Software Install SIS Tools" purpose="optional" class="PC">
+      <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/group" mrp="/sf/mw/appinstall/secureswitools/swisistools/group/security_sistools.mrp"/>
+     </component>
+    </collection>
+    <collection name="appinstall_info" long-name="Application Installation Info" level="api">
+     <component name="appinstall_pub" filter="s60" long-name="Application Installation Public Interfaces" class="api">
+      <unit bldFile="/sf/mw/appinstall/appinstall_pub/group"/>
+     </component>
+     <component name="appinstall_plat" filter="s60" long-name="Application Installation Platform Interfaces" class="api">
+      <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
+     </component>
+     <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="^2" purpose="development" class="config PC">
+      <unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
+     </component>
+    </collection>
+   </block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file