--- a/symbian3/app/screensaver/package_definition.xml Mon Mar 15 18:29:08 2010 +0000
+++ b/symbian3/app/screensaver/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,33 @@
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" long-name="Applications" levels="services apps">
-<block name="screensaver" level="apps" long-name="Screen Saver Apps">
-<collection name="s60">
-<component name="screensaver">
-<unit bldFile="/sf/app/screensaver/group" mrp=""/>
-</component>
-</collection>
-</block>
+<block name="screensaver" level="apps" long-name="Screen Saver Apps" levels="plugin ui">
+ <!-- is this a user-facing application or a daemon? -->
+ <!-- units need to be commented out until configuration is in place. They are currently #included from screensaver_build-->
+ <collection name="scrsaver" long-name="Screen Saver" level="plugin">
+ <component name="scrsaverplugins" filter="s60" long-name="Screen Saver Plugins" plugin="Y">
+ <!-- must have only one component. #include from a common bld.inf, or move up a directory and make scrsaverplugins a collection -->
+ <!--<unit bldFile="scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/"/>
+ <unit bldFile="scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/"/>-->
+ </component>
+ <component name="scrsaver_slideshowplugin" filter="s60" long-name="Screen Saver Slideshow Plugin" plugin="Y">
+ <!--<unit bldFile="scrsaver/scrsaverplugins/SlideshowPlugin/group"/> -->
+ </component>
+ <component name="screensaveraiwplugin" filter="s60" long-name="Screen Saver AIW Plugin" plugin="Y">
+ <!-- <unit bldFile="scrsaver/screensaveraiwplugin/group"/>-->
+ </component>
+ </collection>
+ <collection name="screensaver_info" long-name="Screen Saver Apps Info" level="ui">
+ <component name="screensaver_build" filter="s60" long-name="Screen Saver Application">
+ <!--the app should be a separate component -->
+ <unit bldFile="/sf/app/screensaver/group"/>
+ </component>
+ </collection>
+ </block>
</layer>
</systemModel>
</SystemDefinition>
\ No newline at end of file