--- a/symbian3/mw/networkingdm/package_definition.xml Thu May 20 17:32:19 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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">
-<block name="networkingdm">
-<collection name="s60">
-<component name="networkingdm">
-<unit bldFile="/sf/mw/networkingdm/group" mrp=""/>
-</component>
-</collection>
-</block>
-</layer>
-</systemModel>
-</SystemDefinition>
--- a/symbian3/mw/networkingdm/sources.csv Thu May 20 17:32:19 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Thu May 20 17:32:19 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Thu May 20 17:37:00 2010 +0100
@@ -177,6 +177,7 @@
<package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition_3.0.xml"/>
<package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition_3.0.xml"/>
<package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition_3.0.xml"/>
+ <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition_3.0.xml"/>
</layer>
<layer id="app" name="Applications" levels="services apps">
<package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition_3.0.xml"/>
--- a/symbian4/mw/qt/package_definition_3.0.xml Thu May 20 17:32:19 2010 +0100
+++ b/symbian4/mw/qt/package_definition_3.0.xml Thu May 20 17:37:00 2010 +0100
@@ -10,25 +10,25 @@
</collection>
<collection id="qt_info" name="Qt Info" level="mw">
<component id="qt_build" name="Qt Build" introduced="^2">
- <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+ <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qtdemos" name="Qt Demos" level="app">
<component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
- <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+ <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qtexamples" name="Qt Examples" level="app">
<component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="qtexamples">
- <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+ <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
<collection id="qt_tests" name="Qt Tests" level="app">
<component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
- <unit bldFile="tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+ <unit bldFile="tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
</component>
<component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
- <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
+ <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
</component>
</collection>
</package>