--- a/symbian3/app/conntools/package_definition.xml Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/app/conntools/package_definition.xml Mon Mar 15 18:47:03 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,61 +49,23 @@
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="app">
-<block name="conntools">
-<collection name="s60">
-<component name="conntools">
-<unit bldFile="/sf/app/conntools/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="app" long-name="Applications" levels="services apps">
+<block name="conntools" level="services" long-name="Connectivity Tools" levels="config app">
+ <collection name="nettools" long-name="Net Tools" level="app">
+ <component name="conntest" filter="s60" long-name="Connection Test" purpose="development">
+ <unit bldFile="/sf/app/conntools/nettools/conntest/group"/>
+ </component>
+ </collection>
+ <collection name="emulatorlan" long-name="Emulator LAN" level="config">
+ <!-- component is actually a colleciton, should be moved down a directory -->
+ <component name="emulatorlan_build" filter="s60" long-name="Emulator LAN Build" purpose="development" class="config">
+ <unit bldFile="/sf/app/conntools/emulatorlan/group"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file