--- a/symbian3/mw/appinstall/package_definition.xml	Wed Dec 02 18:06:06 2009 +0000
+++ b/symbian3/mw/appinstall/package_definition.xml	Fri Dec 04 13:41:37 2009 +0000
@@ -1,96 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition name="foundation" schema="2.0.1">
+<!DOCTYPE SystemDefinition [
+ <!ELEMENT SystemDefinition (systemModel?,SystemBuild?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (block*|collection*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT block (subblock*|collection*)*>
+ <!ATTLIST block
+  levels NMTOKENS #IMPLIED
+  span CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT subblock (collection)*>
+ <!ATTLIST subblock
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED>
+ <!ELEMENT collection (component)*>
+ <!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED>
+ <!ELEMENT component (unit)*>
+ <!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>
+ <!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>
+ <!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">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="appinstall" long-name="Application Installation" tech_domain="rt" level="generic" levels="tool framework generic api">
-    <collection name="appinstaller" long-name="App Installer" level="generic">
-     <component name="appmngr2" long-name="App Mngr2" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstaller/appmngr2/group"/>
-     </component>
-     <component name="appinstui" long-name="App Installer UI" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
-     </component>
-     <component unofficial="yes" name="appinstaller_build" long-name="App Installer Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstaller/group"/>
-     </component>
-    </collection>
-    <collection name="ncdengine" long-name="NCD Engine" level="framework">
-     <component name="ncdengine_engine" long-name="Engine" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/ncdengine/engine/group"/>
-     </component>
-     <component name="debuglogger" long-name="Debug Logger" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appinstall/ncdengine/debuglogger/group"/> -->
-     </component>
-     <component unofficial="yes" name="ncdengine_build" long-name="NCD Engine Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/ncdengine/group"/>
-     </component>
-    </collection>
-    <collection name="iaupdateapi_stub" long-name="IA Update API Stub" level="api">
-     <component name="iaupdateapi_stub_build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdateapi_stub/group"/>
-     </component>
-    </collection>
-    <collection name="iaupdate" long-name="IA Update" level="api">
-     <component name="iad" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdate/iad/group"/>
-     </component>
-     <component name="iaupdate_help" long-name="Help" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdate/help/group"/>
-     </component>
-     <component unofficial="yes" name="iaupdate_build" long-name="IA Update Build" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/iaupdate/group"/>
-     </component>
-    </collection>
-    <collection name="appinstall_info" long-name="Application Installation Info" level="api">
-     <component unofficial="yes" name="appinstall_pub" long-name="Application Installation Public Interfaces" class="api" origin-model="foundation">
-      <unit bldFile="/sf/mw/appinstall/appinstall_pub/group"/>
-      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/selfsignedstartupapp/group"/> -->
-      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_pub/startup_list_management_api/tsrc/bc/startuplistmanagementapi/startupapp/group"/> -->
-     </component>
-     <component unofficial="yes" name="appinstall_test" long-name="Application Installation Test" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appinstall/tsrc/group"/> -->
-     </component>
-     <component unofficial="yes" name="appinstall_plat" long-name="Application Installation Platform Interfaces" class="api" origin-model="foundation">
-      <!-- <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/data_src/sistest"/> -->
-      <unit bldFile="/sf/mw/appinstall/appinstall_plat/appmngr2runtimeapi/tsrc/group"/>
-      <unit bldFile="/sf/mw/appinstall/appinstall_plat/group"/>
-     </component>
-    <component name="appinstall_metadata" long-name="Application Installation Metadata" introduced="tb91" purpose="development" class="config PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appinstall/appinstall_info/appinstall_metadata/appinstall_metadata.mrp"/>
-     </component>
-    </collection>
-	<!-- Collection manually added due to faulty merge XSLT -->
-	<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" introduced="7.0" deprecated="tb92" purpose="development">
-	  <unit bldFile="/sf/mw/appinstall/installationservices/switestfw/group" 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 manually removed and merged to OS-->
-     <!--<component name="swisistools">
-       -  <unit bldFile="/sf/mw/appinstall/secureswitools/swisistools/test/tinterpretsisinteg/tintsistef"/>  -
-      </component>-->
-    <component name="makekeys" long-name="MakeKeys" filter="gt" introduced="6.0" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit bldFile="/sf/mw/appinstall/secureswitools/makekeys/group" mrp="/sf/mw/appinstall/secureswitools/makekeys/group/security_makekeys.mrp"/>
-     </component>
-     <component name="n:swianalysistoolkit" long-name="SWI Analysis Toolkit" purpose="development" class="PC" plugin="N" origin-model="Symbian">
-      <!-- The following unit is removed as non-contributed -->
-      <!-- <unit bldFile="/sf/mw/appinstall/secureswitools/swianalysistoolkit/group" mrp="mw/appinstall/secureswitools/swianalysistoolkit/group/security_switools.mrp"/> -->
-     </component>
-     <component name="openssllib" long-name="OpenSSL Library" purpose="optional" class="PC" plugin="N" origin-model="Symbian">
-      <unit mrp="/sf/mw/appinstall/secureswitools/openssllib/security_openssl.mrp"/>
-     </component>
-    </collection>
-   </block>
+<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>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file