--- a/symbian4/mw/qt/package_definition.xml Wed May 26 17:18:20 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml Wed May 26 17:30:43 2010 +0100
@@ -1,111 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not. -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
- levels NMTOKENS #IMPLIED
- span CDATA #IMPLIED
- level NMTOKEN #IMPLIED
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
- name CDATA #REQUIRED
- long-name CDATA #IMPLIED
- level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a package or prebuilt -->
-<!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 >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile may someday be removed in favour of mrp -->
-<!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
->
-]>
-<SystemDefinition name="Symbian^4" schema="2.0.1">
- <systemModel>
- <layer name="mw" long-name="Middleware" levels="generic specific">
- <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
- <collection name="qtconf" long-name="Qt Config" level="tool">
- <component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="qt_tools" introduced="^2" class="config tool">
- <unit bldFile="/sf/mw/qt/src/s60installs/deviceconfiguration"/>
- </component>
- </collection>
- <collection name="qt_info" long-name="Qt Info" level="mw">
- <component name="qt_build" long-name="Qt Build" introduced="^2">
- <unit bldFile="/sf/mw/qt/." proFile="projects.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
- </component>
- </collection>
- <collection name="qtdemos" long-name="Qt Demos" level="app">
- <component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
- <unit bldFile="/sf/mw/qt/demos" proFile="demos.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
- </component>
- </collection>
- <collection name="qtexamples" long-name="Qt Examples" level="app">
- <component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
- <unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
- </component>
- </collection>
- <collection name="qt_tests" long-name="Qt Tests" level="app">
- <component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
- <unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro"/>
- </component>
- <component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
- <unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs=""QMAKE_MOC=/epoc32/tools/qt/moc.exe" "QMAKE_RCC=/epoc32/tools/qt/rcc.exe" "QMAKE_UIC=/epoc32/tools/qt/uic.exe" -r"/>
- </component>
- </collection>
- </block>
- </layer>
- </systemModel>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
+ This will be removed when sbsv2 builds are working -->
+ <package id="qt" name="Qt" levels="tool mw app">
+ <collection id="qtconf" name="Qt Config" level="tool">
+ <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="qt_tools" introduced="^2">
+ <unit bldFile="src/s60installs/deviceconfiguration"/>
+ </component>
+ </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="-r -config sgimagelite_support"/>
+ </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="-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="-r"/>
+ </component>
+ </collection>
+ <collection id="qt_tests" name="Qt Tests" level="app">
+ <component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="qttestsauto,test">
+ <unit bldFile="tests/auto" qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+ </component>
+ <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test">
+ <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>