--- a/CompilerCompatibility/mw/vpnclient/package_definition.xml Mon Mar 15 18:47:03 2010 +0000
+++ b/CompilerCompatibility/mw/vpnclient/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,61 +49,136 @@
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">
-<block name="vpnclient">
-<collection name="s60">
-<component name="vpnclient">
-<unit bldFile="/sf/mw/vpnclient/group" mrp=""/>
-</component>
-</collection>
-</block>
+<layer name="mw" long-name="Middleware" levels="generic specific">
+<block name="vpnclient" level="specific" long-name="VPN Client" levels="engine ui api">
+ <!-- is the !oem_build filter needed? -->
+ <collection name="vpnapiimpl" long-name="VPN API Implementation" level="api">
+ <component name="vpnapi" filter="s60" long-name="VPN API">
+ <unit bldFile="/sf/mw/vpnclient/vpnapiimpl/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ <collection name="vpnengine" long-name="VPN Engine" level="engine">
+ <!-- too many components in this collection.
+ Probably best to group the binaries together into larger components
+ or maybe split the collection into more reasonable groups -->
+ <component name="eventmediatorapi" filter="s60" long-name="Event Mediator API">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediatorapi/group" filter="!oem_build"/>
+ </component>
+ <component name="eventviewer" filter="s60" long-name="Event Viewer">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/eventviewer/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnins" filter="s60" long-name="VPN Installer">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnins/group" filter="!oem_build"/>
+ </component>
+ <component name="ikepolparser" filter="s60" long-name="IKE Policy Parser">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikepolparser/group" filter="!oem_build"/>
+ </component>
+ <component name="utlbase64" filter="s60" long-name="Base64 Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlbase64/group" filter="!oem_build"/>
+ </component>
+ <component name="utlcrypto" filter="s60" long-name="Crypto Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlcrypto/group" filter="!oem_build"/>
+ </component>
+ <component name="utlxml" filter="s60" long-name="XML Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlxml/group" filter="!oem_build"/>
+ </component>
+ <component name="utlpkcs10" filter="s60" long-name="PKCS#10 Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs10/group" filter="!oem_build"/>
+ </component>
+ <component name="pkiserviceapi" filter="s60" long-name="PKI Service API">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiserviceapi/group" filter="!oem_build"/>
+ </component>
+ <component name="ikecert" filter="s60" long-name="IKE Certificate Management">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikecert/group" filter="!oem_build"/>
+ </component>
+ <component name="kmdapi" filter="s60" long-name="Key Management Daemon API">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdapi/group" filter="!oem_build"/>
+ </component>
+ <component name="kmdserver" filter="s60" long-name="Key Management Daemon Server">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/kmdserver/group" filter="!oem_build"/>
+ </component>
+ <component name="ikeutils" filter="s60" long-name="Internet Key Exchange Utils">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikeutils/group" filter="!oem_build"/>
+ </component>
+ <component name="ikev1lib" filter="s60" long-name="IKEv1 Library">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev1lib/group" filter="!oem_build"/>
+ </component>
+ <component name="ikev2lib" filter="s60" long-name="IKEv2 Library">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikev2lib/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnipsecpolparser" filter="s60" long-name="VPN IPsec Policy Parser">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnipsecpolparser/group" filter="!oem_build"/>
+ </component>
+ <component name="sit" filter="s60" long-name="Socket Interaction Thread">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/sit/group" filter="!oem_build"/>
+ </component>
+ <component name="vpntcwrapper" filter="s60" long-name="VPN Terminal Control Wrapper">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpntcwrapper/group" filter="!oem_build"/>
+ </component>
+ <component name="eventmediator" filter="s60" long-name="Event Mediator">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/eventmediator/group" filter="!oem_build"/>
+ </component>
+ <component name="pkiservice" filter="s60" long-name="PKI Service">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/pkiservice/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnconnagt" filter="s60" long-name="VPN Connection Agent">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnconnagt/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnmanager" filter="s60" long-name="VPN Manager">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpnmanager/group" filter="!oem_build"/>
+ </component>
+ <component name="vpncleaner" filter="s60" long-name="VPN Cleaner">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/vpncleaner/group" filter="!oem_build"/>
+ </component>
+ <component name="utlpkcs12" filter="s60" long-name="PKCS#12 Utilities">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/utlpkcs12/group" filter="!oem_build"/>
+ </component>
+ <component name="dmadengine" filter="s60" long-name="DM Adapter Engine">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadengine/group" filter="!oem_build"/>
+ </component>
+ <component name="dmadipsecvpn" filter="s60" long-name="IPsec VPN DM Adapter" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadipsecvpn/group" filter="!oem_build"/>
+ </component>
+ <component name="dmadpki" filter="s60" long-name="PKI DM Adapter" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/dmadpki/group" filter="!oem_build"/>
+ </component>
+ <component name="ikesocket" filter="s60" long-name="IKE Socket" introduced="^3">
+ <unit bldFile="/sf/mw/vpnclient/vpnengine/ikesocket/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ <collection name="vpnui" long-name="VPN UI" level="ui">
+ <component name="vpnecomnotifier" filter="s60" long-name="VPN ECOM Notifier" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnecomnotifier/group" filter="!oem_build"/>
+ </component>
+ <component name="vpndialogmanager" filter="s60" long-name="VPN Dialog Manager">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpndialogmanager/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnmanagementui" filter="s60" long-name="VPN Management UI" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnmanagementui/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnpolins" filter="s60" long-name="VPN Policy Installer">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolins/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnpolicyrecognizer" filter="s60" long-name="VPN Policy Recognizer" plugin="Y">
+ <unit bldFile="/sf/mw/vpnclient/vpnui/vpnpolicyrecognizer/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ <collection name="vpnclient_info" long-name="VPN Client Info" level="api">
+ <component name="vpnclient_help" filter="s60" long-name="VPN Client Help">
+ <unit bldFile="/sf/mw/vpnclient/help/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnclient_build" filter="s60" long-name="VPN Client Build">
+ <!-- should split this up into the other components and remove this-->
+ <unit bldFile="/sf/mw/vpnclient/group" filter="!oem_build"/>
+ </component>
+ <component name="vpnc_plat" filter="s60" long-name="VPN Client Platform Interfaces" class="api">
+ <unit bldFile="/sf/mw/vpnclient/vpnc_plat/vpnapi/group" filter="!oem_build"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
-</SystemDefinition>
+</SystemDefinition>
\ No newline at end of file