--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adaptation/codecs.aricent/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="codecs.aricent" name="Aricent Codecs">
+ <collection id="utilities" name="Aricent Utilities">
+ <component id="ariprocessengine" name="Aricent Process Engine">
+ <unit bldFile="utilities/ariprocessengine/group" />
+ </component>
+ <component id="aristatemachine" name="Aricent State Machine">
+ <unit bldFile="utilities/aristatemachine/group" />
+ </component>
+ </collection>
+ <collection id="aaclc_enc" level="plugin">
+ <component id="ariaaclcencmmfcodec">
+ <unit bldFile="aaclc_enc/ariaaclcencmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="amrnb_dec" level="plugin">
+ <component id="ariamrnbdecmmfcodec">
+ <unit bldFile="amrnb_dec/ariamrnbdecmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="amrnb_enc" level="plugin">
+ <component id="ariamrnbencmmfcodec">
+ <unit bldFile="amrnb_enc/ariamrnbencmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="amrwb_dec" level="plugin">
+ <component id="ariamrwbdecmmfcodec">
+ <unit bldFile="amrwb_dec/ariamrwbdecmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="h264_dec" level="plugin">
+ <component id="arih264dechwdevice">
+ <unit bldFile="h264_dec/arih264dechwdevice/group" />
+ </component>
+ </collection>
+ <collection id="h264_enc" level="plugin">
+ <component id="arih264enchwdevice">
+ <unit bldFile="h264_enc/arih264enchwdevice/group" />
+ </component>
+ </collection>
+ <collection id="heaac_dec" level="plugin">
+ <component id="ariheaacdecmmfcodec">
+ <unit bldFile="heaac_dec/ariheaacdecmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="mp3_dec" level="plugin">
+ <component id="arimp3decmmfcodec">
+ <unit bldFile="mp3_dec/arimp3decmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="mp4asp_dec" level="plugin">
+ <component id="arimpeg4aspdechwdevice">
+ <unit bldFile="mp4asp_dec/arimpeg4aspdechwdevice/group" />
+ </component>
+ </collection>
+ <collection id="mp4sp_enc" level="plugin">
+ <component id="arimp4spenchwdevice">
+ <unit bldFile="mp4sp_enc/arimp4spenchwdevice/group" />
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/adaptation/codecs.aricent/sources.csv Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,2 @@
+source,dst,type,pattern,sysdef
+http://developer.symbian.org/oss/MCL/sf/adaptation/codecs.aricent/,/sf/adaptation/codecs.aricent,branch,default,layers.sysdef.xml
--- a/symbian3/mw/remotemgmt/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian3/mw/remotemgmt/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -163,6 +163,9 @@
<component id="syncml_ds_customization_api" name="SyncML DS Customization API" class="api" filter="s60" introduced="^3">
<unit bldFile="remotemgmt_plat/syncml_ds_customization_api/group"/>
</component>
+ <component id="lawmo_plugin_api" name="Lawmo Plugin API" class="api" filter="s60" introduced="^3">
+ <unit bldFile="remotemgmt_plat/lawmo_plugin_api/group"/>
+ </component>
</collection>
<collection id="policymanagement" name="Policy Management" level="generic">
<component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
--- a/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -104,6 +104,7 @@
<package id="stubs" tech-domain="hb" level="high" href="../../../../adaptation/stubs/package_definition.xml"/>
<package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition.xml"/>
<package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition.xml"/>
+ <package id="codecs.aricent" tech-domain="mm" level="low" href="../../../../adaptation/codecs.aricent/package_definition.xml" />
</layer>
<layer id="os" name="OS" levels="hw services">
<package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>
--- a/symbian3/os/deviceplatformrelease/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian3/os/deviceplatformrelease/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -90,6 +90,9 @@
<component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config" introduced="^3">
<unit bldFile="sf_config/rombuild/zoom2/group"/>
</component>
+ <component name="rombuild_sfrefhw" filter="sf_build" long-name="sf_refhw iMaker Config" purpose="development" introduced="^3" class="config">
+ <unit bldFile="os/deviceplatformrelease/sf_config/rombuild/sf_refhw/group"/>
+ </component>
</collection>
<!-- should be located locally in buildplatforms/group. NB. This is a different package! -->
<collection id="s60bld" name="S60 Build">
--- a/symbian3/os/lbs/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian3/os/lbs/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -65,19 +65,27 @@
</component>
<component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+ <unit bldFile="networkprotocolmodules/suplproxyprotocolmodule/group" mrp="networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
</component>
<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+ <unit bldFile="networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+ </component>
+ <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplprotocolmodule/HostSettingsApi/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+ </component>
+ <component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+ <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+ <unit bldFile="networkprotocolmodules/suplprotocolmodule/SuplPushAPI/group" mrp="networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
</component>
<component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="networkprotocolmodules/common/suplrrlpasn1/group"/>
+ <unit bldFile="networkprotocolmodules/suplpmcore/suplrrlpasn1/group"/>
</component>
<component id="suplrrlpprotocol" name="SUPL RRLP Protocol Module">
<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
- <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+ <unit bldFile="networkprotocolmodules/suplcontrolplaneprotocols/suplrrlpprotocol/group"/>
</component>
</collection>
<collection id="lbsapitest" name="Location API Tests" level="application-interface">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/openmaxil.nokia/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.1">
+ <package id="openmaxil.nokia" name="Nokia OpenMAX IL Adaptation" levels="adaptation hw-if device-fw">
+
+ <collection id="omxilcomp" name="OpenMAX IL Components" level="adaptation">
+ <component id="omxilgeneric" name="Generic OpenMAX IL Components" introduced="^3" purpose="optional" class="plugin">
+ <unit version="1" bldFile="omxilcomp/omxilgeneric/group"/>
+ </component>
+
+ <component id="omxilaudioemulator" name="OpenMAX IL Audio Emulator" introduced="^3" purpose="optional" class="plugin">
+ <unit version="1" bldFile="omxilcomp/omxilaudioemulator/group"/>
+ </component>
+
+ <component id="omxiltestcomp" name="OpenMAX IL Test Components" introduced="^3" purpose="development" class="plugin">
+ <unit version="1" bldFile="omxilcomp/omxiltestcomp/group"/>
+ </component>
+ </collection>
+
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adaptation/codecs.aricent/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="codecs.aricent" name="Aricent Codecs" levels="util plugin">
+ <collection id="aricent_utilities" name="Aricent Utilities" level="util">
+ <component id="ariprocessengine" name="Aricent Process Engine" filter="sf_build" introduced="^4">
+ <unit bldFile="utilities/ariprocessengine/group" />
+ </component>
+ <component id="aristatemachine" name="Aricent State Machine" filter="sf_build" introduced="^4">
+ <unit bldFile="utilities/aristatemachine/group" />
+ </component>
+ </collection>
+ <collection id="aaclc_enc" name="AAC LC Encoding" level="plugin">
+ <component id="ariaaclcencmmfcodec" name="Aricent AAC LC Encoding MMF Codec" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="aaclc_enc/ariaaclcencmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="amrnb_dec" name="AMR NB Decoding" level="plugin">
+ <component id="ariamrnbdecmmfcodec" name="Aricent AMR NB Decoding MMF Codec" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="amrnb_dec/ariamrnbdecmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="amrnb_enc" name="AMR NB Encoding" level="plugin">
+ <component id="ariamrnbencmmfcodec" name="Aricent AMR NB Encoding MMF Codec" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="amrnb_enc/ariamrnbencmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="amrwb_dec" name="AMR WB Decoding" level="plugin">
+ <component id="ariamrwbdecmmfcodec" name="Aricent AMR WB Decoding MMF Codec" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="amrwb_dec/ariamrwbdecmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="h264_dec" name="H264 Decoding" level="plugin">
+ <component id="arih264dechwdevice" name="Aricent H264 Decoding Hardware Device" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="h264_dec/arih264dechwdevice/group" />
+ </component>
+ </collection>
+ <collection id="h264_enc" name="H264 Encoding" level="plugin">
+ <component id="arih264enchwdevice" name="Aricent H264 Encoding Hardware Device" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="h264_enc/arih264enchwdevice/group" />
+ </component>
+ </collection>
+ <collection id="heaac_dec" name="HE AAC Decoding" level="plugin">
+ <component id="ariheaacdecmmfcodec" name="Aricent HE AAC Decoding MMF Codec" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="heaac_dec/ariheaacdecmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="mp3_dec" name="MP3 Decoding" level="plugin">
+ <component id="arimp3decmmfcodec" name="Aricent MP3 Decoding MMF Codec" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="mp3_dec/arimp3decmmfcodec/group" />
+ </component>
+ </collection>
+ <collection id="mp4asp_dec" name="MP4 ASP Decoding" level="plugin">
+ <component id="arimpeg4aspdechwdevice" name="Aricent MP4 ASP Decoding Hardware Device" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="mp4asp_dec/arimpeg4aspdechwdevice/group" />
+ </component>
+ </collection>
+ <collection id="mp4sp_enc" name="MP4 SP Encoding" level="plugin">
+ <component id="arimp4spenchwdevice" name="MP4 SP Encoding Hardware Device" filter="sf_build" introduced="^4" class="plugin">
+ <unit bldFile="mp4sp_enc/arimp4spenchwdevice/group" />
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
\ No newline at end of file
--- a/symbian4/app/browserui/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,7 +2,7 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="browserui" name="Browser UI" levels="utils support ui">
<collection id="browserui_info" name="Browser UI Info" level="ui">
- <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
+ <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4" filter="s60">
<unit bldFile="." qt:proFile="browserui.pro"/>
</component>
</collection>
--- a/symbian4/app/contentcontrol/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -10,6 +10,10 @@
<meta rel="Api" href="contentctrl_plat/ds_data_modification_api/ds_data_modification_api.metaxml"/>
<unit bldFile="contentctrl_plat/ds_data_modification_api/group"/>
</component>
+ <component id="ds_contact_adapter_customization_api" name="DS Contact Adapter Customization API" class="api" filter="s60" introduced="^4">
+ <meta rel="Api" href="contentctrl_plat/ds_contact_adapter_customization_api/ds_contact_adapter_customization_api.metaxml"/>
+ <unit bldFile="contentctrl_plat/ds_contact_adapter_customization_api/group"/>
+ </component>
</collection>
<collection id="connectivitymodules" name="Connectivity Modules" level="framework">
<component id="secon" filter="s60" name="Service Controllers">
--- a/symbian4/app/firsttimeuse/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -9,7 +9,7 @@
<collection id="runtimeproviders" name="Runtime Providers" level="support"/>
<collection id="firsttimeuse_info" name="First Time Use Info" level="ui">
- <component id="firsttimeuse_build" name="First Time Use Build">
+ <component id="firsttimeuse_build" name="First Time Use Build" filter="s60">
<unit bldFile="." qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
</component>
</collection>
--- a/symbian4/app/homescreen/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="homescreen" name="Home Screen Apps" levels="support task ss hs">
- <collection id="homescreen_test" name="Home Screen Test" level="support">
+ <collection id="homescreen_test" name="Home Screen Test" level="support">
<component id="homescreen_tsrc_build" name="Home Screen Test Build" filter="test,unit_test">
<unit bldFile="tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
- </component>
- </collection>
+ </component>
+ </collection>
+ <collection id="homescreen_plat" name="Home Screen Platform API" level="support">
+ <component id="homescreen_plat_build" name="Home Screen Platform API Build">
+ <unit bldFile="homescreen_plat" qt:proFile="homescreen_plat.pro"/>
+ </component>
+ </collection>
<collection id="homescreenapp" name="Home Screen Application" level="hs">
<component id="hsutils" name="Home Screen Utils" introduced="^4">
<unit bldFile="homescreenapp/hsutils" qt:proFile="hsutils.pro" qt:qmakeArgs="-r -config rom"/>
@@ -13,9 +18,6 @@
<component id="hsdomainmodel" name="HS Domain Model" introduced="^4">
<unit bldFile="homescreenapp/hsdomainmodel" qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
</component>
- <component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin">
- <unit bldFile="homescreenapp/runtimeplugins" qt:proFile="runtimeplugins.pro" qt:qmakeArgs="-r -config rom"/>
- </component>
<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin">
<unit bldFile="homescreenapp/serviceproviders" qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
</component>
@@ -37,10 +39,7 @@
<component id="hswidgetuninstaller" name="HS Widget Uninstaller" introduced="^4">
<unit bldFile="homescreenapp/hswidgetuninstaller" qt:proFile="hswidgetuninstaller.pro" qt:qmakeArgs="-r -config rom"/>
</component>
- <component id="homescreenapp_rom" name="Home Screen App ROM" introduced="^4">
- <unit bldFile="homescreenapp" qt:proFile="homescreenapp_exports_to_rom.pri" qt:qmakeArgs="-r -config rom"/>
- </component>
- </collection>
+ </collection>
<collection id="screensaver" name="Screen Saver" level="ss">
<!-- break collection into components, or move down a dir and make it a component -->
<component id="screensaver_build" name="Screen Saver Build">
--- a/symbian4/app/jrt/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,67 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="jrt" name="Java Runtime" levels="util generic rt ui">
- <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
- <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
- <meta rel="Api" href="jrt_plat/java_registry_api/java_registry_api.metaxml"/>
- <unit bldFile="jrt_plat/java_registry_api/build"/>
- </component>
- <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
- <meta rel="Api" href="jrt_plat/java_env_info_api/java_env_info_api.metaxml"/>
- <unit bldFile="jrt_plat/java_env_info_api/build"/>
- </component>
- <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
- <meta rel="Api" href="jrt_plat/java_debug_api/java_debug_api.metaxml"/>
- <unit bldFile="jrt_plat/java_debug_api/build"/>
- </component>
- </collection>
- <collection id="java_stubs" name="Java Stubs" level="rt">
- <component id="java_stubs_build" name="Build Native Java" filter="sf_build" introduced="^4">
- <unit bldFile="java_stubs/group"/>
- </component>
- </collection>
- <collection id="build_nativejava" name="Build Native Java">
- <component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
- <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
- </collection>
- <collection id="javacommons" name="Java Commons" level="generic">
- <component id="javacommons_build" filter="s60" name="JRT Build">
- <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="javacommons" qt:proFile="javacommons.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
- </collection>
- <collection id="javaruntimes" name="Java Runtimes" level="rt">
- <component id="javaruntimes_build" filter="s60" name="JRT Build">
- <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
- </collection>
- <collection id="javauis" name="Java UIs" level="ui">
- <component id="javauis_build" filter="s60" name="JRT Build">
- <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="javauis" qt:proFile="javauis.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
-
- </collection>
- <collection id="javamanager" level="generic">
- <component id="javamanager_build" filter="s60" name="JRT Build">
- <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="javamanager" qt:proFile="javamanager.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
- </collection>
- <collection id="javatools" name="Java Tools" level="util">
- <component id="javatools_build" filter="s60" name="JRT Build">
- <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="javatools" qt:proFile="javatools.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
- </collection>
- <collection id="javaextensions" name="Java Extensions" level="generic">
- <component id="javaextensions_build" filter="s60" name="JRT Build">
- <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
- <unit bldFile="javaextensions" qt:proFile="javaextensions.pro" qt:qmakeArgs="-r RD_JAVA_SF_BUILD=1" filter="sf_build"/>
- </component>
- </collection>
- </package>
+<SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.0">
+ <package id="jrt" name="Java Runtime" levels="util generic rt ui">
+ <collection id="jrt_plat" name="JRT Platform Interfaces" level="ui">
+ <component id="java_registry_api" name="Java Registry API" class="api" filter="s60">
+ <meta rel="Api" href="jrt_plat/java_registry_api/java_registry_api.metaxml"/>
+ <unit bldFile="jrt_plat/java_registry_api/build"/>
+ </component>
+ <component id="java_env_info_api" name="Java Environment Info API" class="api" filter="s60">
+ <meta rel="Api" href="jrt_plat/java_env_info_api/java_env_info_api.metaxml"/>
+ <unit bldFile="jrt_plat/java_env_info_api/build"/>
+ </component>
+ <component id="java_debug_api" name="Java Debug API" class="api" filter="s60">
+ <meta rel="Api" href="jrt_plat/java_debug_api/java_debug_api.metaxml"/>
+ <unit bldFile="jrt_plat/java_debug_api/build"/>
+ </component>
+ </collection>
+ <collection id="build_nativejava" name="Build Native Java">
+ <component id="nativejava" name="Build Native Java" filter="s60" introduced="^4">
+ <unit bldFile="build"/>
+ </component>
+ </collection>
+ <collection id="javacommons" name="Java Commons" level="generic">
+ <component id="javacommons_build" filter="s60" name="Java Commons Build">
+ <unit bldFile="javacommons" qt:proFile="javacommons.pro"/>
+ </component>
+ </collection>
+ <collection id="javaruntimes" name="Java Runtimes" level="rt">
+ <component id="javaruntimes_build" filter="s60" name="Java Runtimes Build">
+ <unit bldFile="javaruntimes" qt:proFile="javaruntimes.pro"/>
+ </component>
+ </collection>
+ <collection id="javauis" name="Java UIs" level="ui">
+ <component id="javauis_build" filter="s60" name="Java UIs Build">
+ <unit bldFile="javauis" qt:proFile="javauis.pro"/>
+ </component>
+ </collection>
+ <collection id="javamanager" name="Java Manager" level="generic">
+ <component id="javamanager_build" filter="s60" name="Java Manager Build">
+ <unit bldFile="javamanager" qt:proFile="javamanager.pro"/>
+ </component>
+ </collection>
+ <collection id="javatools" name="Java Tools" level="util">
+ <component id="javatools_build" filter="s60" name="Java Tools Build">
+ <unit bldFile="javatools" qt:proFile="javatools.pro"/>
+ </component>
+ </collection>
+ <collection id="javaextensions" name="Java Extensions" level="generic">
+ <component id="javaextensions_build" filter="s60" name="Java Extensions Build">
+ <unit bldFile="javaextensions" qt:proFile="javaextensions.pro"/>
+ </component>
+ </collection>
+ </package>
</SystemDefinition>
--- a/symbian4/app/phone/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,147 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="phone" name="Phone Apps" levels="engine plugin ui app">
- <collection id="phoneapp" name="Phone Application" level="app">
- <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
- <unit bldFile="phoneapp/blacklist/group"/>
- </component>
- <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
- <unit bldFile="phoneapp/phoneuicontrol/group"/>
- </component>
- <component id="phoneuistates" filter="s60" name="Phone UI States">
- <unit bldFile="phoneapp/phoneuistates/group"/>
- </component>
- <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
- <unit bldFile="phoneapp/phoneuiutils/group"/>
- </component>
- <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
- <unit bldFile="phoneapp/silenceactionplugin/group"/>
- </component>
- <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
- <unit bldFile="phoneapp/phonemediatorcenter/group"/>
- </component>
- <component id="phoneuiview2" filter="s60" name="Phone UI View">
- <unit bldFile="phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
- </component>
- <component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
- <unit bldFile="phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
- </component>
- <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
- <unit bldFile="phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
- </component>
- <component id="phoneui2" filter="s60" name="Phone UI">
- <unit bldFile="phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
- </component>
- </collection>
- <collection id="phoneengine" name="Phone Engine" level="engine">
- <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
- <unit bldFile="phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
- </component>
- <component id="audiohandling" filter="s60" name="Phone Audio Handling">
- <unit bldFile="phoneengine/audiohandling/group"/>
- </component>
- <component id="callhandling" filter="s60" name="Call Handling">
- <unit bldFile="phoneengine/callhandling/group"/>
- </component>
- <component id="contacthandling2" filter="s60" name="Phone Contact Handling">
- <unit bldFile="phoneengine/contacthandling2/group"/>
- </component>
- <component id="loghandling" filter="s60" name="Phone Log Handling">
- <unit bldFile="phoneengine/loghandling/group"/>
- </component>
- <component id="engineinfo" filter="s60" name="Phone Engine Info">
- <unit bldFile="phoneengine/engineinfo/group"/>
- </component>
- <component id="phonemodel" filter="s60" name="Phone Model">
- <unit bldFile="phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
- </component>
- <component id="servicehandling" filter="s60" name="Phone Service Handling">
- <unit bldFile="phoneengine/servicehandling/group"/>
- </component>
- <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
- <unit bldFile="phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
- </component>
- </collection>
- <collection id="phoneuis" name="Phone UIs" level="ui">
- <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
- <unit bldFile="phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
- </component>
- <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
- <unit bldFile="phoneuis/telephonydevicemode/group"/>
- </component>
- </collection>
- <collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
- <component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/3d_ringing_tone_enabler_api/3d_ringing_tone_enabler_api.metaxml"/>
- <unit bldFile="phone_plat/3d_ringing_tone_enabler_api/group"/>
- </component>
- <component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/telephony_comms_information_api/telephony_comms_information_api.metaxml"/>
- <unit bldFile="phone_plat/telephony_comms_information_api/group"/>
- </component>
- <component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/telephony_information_api/telephony_information_api.metaxml"/>
- <unit bldFile="phone_plat/telephony_information_api/group"/>
- </component>
- <component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/telephony_device_mode_api/telephony_device_mode_api.metaxml"/>
- <unit bldFile="phone_plat/telephony_device_mode_api/group"/>
- </component>
- <component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/telephony_remote_party_information_api/telephony_remote_party_information_api.metaxml"/>
- <unit bldFile="phone_plat/telephony_remote_party_information_api/group"/>
- </component>
- <component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/telephony_video_mailbox_settings_api/telephony_video_mailbox_settings_api.metaxml"/>
- <unit bldFile="phone_plat/telephony_video_mailbox_settings_api/group"/>
- </component>
- <component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
- <meta rel="Api" href="phone_plat/telephony_microphone_mute_status_api/telephony_microphone_mute_status_api.metaxml"/>
- <unit bldFile="phone_plat/telephony_microphone_mute_status_api/group"/>
- </component>
- <component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
- <unit bldFile="phone_plat/telephony_logging_extension_api/group"/>
- </component>
- <component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
- <unit bldFile="phone_plat/telephony_matching_extension_api/group"/>
- </component>
- <component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
- <unit bldFile="phone_plat/phone_application_commands_api/group"/>
- </component>
- <component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
- <unit bldFile="phone_plat/phone_application_voip_commands_api/group"/>
- </component>
- <component id="phone_telephony_menu_extension_api" name="Telephony Menu Extension API" class="api" filter="s60">
- <unit bldFile="phone_plat/telephony_menu_extension_api/group"/>
- </component>
- <component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
- <unit bldFile="phone_plat/telephony_mediator_api/group"/>
- </component>
- <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
- <unit bldFile="phone_plat/video_telephony_mediator_api/group"/>
- </component>
- <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60" introduced="^4">
- <unit bldFile="phone_plat/video_telephony_control_mediator_api/group"/>
- </component>
- </collection>
- <collection id="phoneplugins" name="Phone Plugins" level="plugin">
- <component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
- <unit bldFile="phoneplugins/csplugin/group"/>
- </component>
- <component id="dialerwidgetplugin" filter="s60" name="Dialer Widget Plugin" class="plugin" introduced="^4">
- <unit bldFile="phoneplugins/dialerwidgetplugin" qt:proFile="dialerwidgetplugin.pro"/>
- </component>
- <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
- <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
- </component>
- <component id="phoneindicatorplugin" filter="s60" name="Phone Indicator Plugin" class="plugin" introduced="^4">
- <unit bldFile="phoneplugins/phoneindicatorplugin" qt:proFile="phoneindicatorplugin.pro"/>
- </component>
- </collection>
- <collection id="phonesettings" name="Phone Settings" level="plugin">
- <component id="cpphonesettingsplugins" filter="s60" name="CP Phone Settings Plugins" class="plugin" introduced="^4">
- <unit bldFile="phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
- </component>
- </collection>
- </package>
-</SystemDefinition>
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="phone" name="Phone Apps" levels="engine plugin ui app">
+ <collection id="phoneapp" name="Phone Application" level="app">
+ <component id="blacklist" filter="s60" name="Phone Blacklist Clearing" class="plugin">
+ <unit bldFile="phoneapp/blacklist/group"/>
+ </component>
+ <component id="phoneringingtoneplayer" filter="s60" name="Phone Ringingtone Player" introduced="^4">
+ <unit bldFile="phoneapp/phoneringingtoneplayer/group"/>
+ </component>
+ <component id="phoneuicontrol" filter="s60" name="Phone UI Control">
+ <unit bldFile="phoneapp/phoneuicontrol/group"/>
+ </component>
+ <component id="phoneuistates" filter="s60" name="Phone UI States">
+ <unit bldFile="phoneapp/phoneuistates/group"/>
+ </component>
+ <component id="phoneuiutils" filter="s60" name="Phone UI Utils">
+ <unit bldFile="phoneapp/phoneuiutils/group"/>
+ </component>
+ <component id="silenceactionplugin" filter="s60" name="Silence Action Plugin" class="plugin">
+ <unit bldFile="phoneapp/silenceactionplugin/group"/>
+ </component>
+ <component id="phonemediatorcenter" filter="s60" name="Phone Mediator Center">
+ <unit bldFile="phoneapp/phonemediatorcenter/group"/>
+ </component>
+ <component id="phoneuiview2" filter="s60" name="Phone UI View">
+ <unit bldFile="phoneapp/phoneuiview2" qt:proFile="phoneuiview2.pro"/>
+ </component>
+ <component id="phoneuiqtviewadapter" filter="s60" name="Phone UI Qt View Adapter" introduced="^4" class="plugin">
+ <unit bldFile="phoneapp/phoneuiqtviewadapter" qt:proFile="phoneuiqtviewadapter.pro"/>
+ </component>
+ <component id="phonestringloader" filter="s60" name="Phone String Loader" introduced="^4">
+ <unit bldFile="phoneapp/phonestringloader" qt:proFile="phonestringloader.pro"/>
+ </component>
+ <component id="phoneui2" filter="s60" name="Phone UI">
+ <unit bldFile="phoneapp/phoneui2" qt:proFile="phoneui2.pro"/>
+ </component>
+ <component id="phoneuivoipextension" filter="s60" name="Phone UI VOIP Extension" introduced="^4" >
+ <unit bldFile="phoneapp/phoneuivoipextension/group"/>
+ </component>
+ </collection>
+ <collection id="phoneengine" name="Phone Engine" level="engine">
+ <component id="phonecntfinder2" filter="s60" name="Phone Contact Finder">
+ <unit bldFile="phoneengine/phonecntfinder2" qt:proFile="phonecntfinder2.pro"/>
+ </component>
+ <component id="audiohandling" filter="s60" name="Phone Audio Handling">
+ <unit bldFile="phoneengine/audiohandling/group"/>
+ </component>
+ <component id="callhandling" filter="s60" name="Call Handling">
+ <unit bldFile="phoneengine/callhandling/group"/>
+ </component>
+ <component id="contacthandling2" filter="s60" name="Phone Contact Handling">
+ <unit bldFile="phoneengine/contacthandling2/group"/>
+ </component>
+ <component id="loghandling" filter="s60" name="Phone Log Handling">
+ <unit bldFile="phoneengine/loghandling/group"/>
+ </component>
+ <component id="engineinfo" filter="s60" name="Phone Engine Info">
+ <unit bldFile="phoneengine/engineinfo/group"/>
+ </component>
+ <component id="phonemodel" filter="s60" name="Phone Model">
+ <unit bldFile="phoneengine/phonemodel" qt:proFile="phonemodel.pro"/>
+ </component>
+ <component id="servicehandling" filter="s60" name="Phone Service Handling">
+ <unit bldFile="phoneengine/servicehandling/group"/>
+ </component>
+ <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
+ <unit bldFile="phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
+ </component>
+ <component id="networkhandlingstarter" filter="s60" name="Network Handling Starter" introduced="^4">
+ <unit bldFile="phoneengine/networkhandlingstarter" qt:proFile="networkhandlingstarter.pro"/>
+ </component>
+ </collection>
+ <collection id="phoneuis" name="Phone UIs" level="ui">
+ <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
+ <unit bldFile="phoneuis/bubblemanager2" qt:proFile="bubblemanager2.pro"/>
+ </component>
+ <component id="telephonydevicemode" filter="s60" name="Telephony Device Mode">
+ <unit bldFile="phoneuis/telephonydevicemode/group"/>
+ </component>
+ <component id="ussdeditor" filter="s60" name="USSD Editor" introduced="^4">
+ <unit bldFile="phoneuis/ussdeditor" qt:proFile="ussdeditor.pro"/>
+ </component>
+ </collection>
+ <collection id="phone_plat" name="Phone Apps Platform Interfaces" level="app">
+ <component id="3d_ringing_tone_enabler_api" name="3D Ringing Tone Enabler API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/3d_ringing_tone_enabler_api/3d_ringing_tone_enabler_api.metaxml"/>
+ <unit bldFile="phone_plat/3d_ringing_tone_enabler_api/group"/>
+ </component>
+ <component id="telephony_comms_information_api" name="Telephony Comms Information API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/telephony_comms_information_api/telephony_comms_information_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_comms_information_api/group"/>
+ </component>
+ <component id="telephony_information_api" name="Telephony Information API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/telephony_information_api/telephony_information_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_information_api/group"/>
+ </component>
+ <component id="telephony_device_mode_api" name="Telephony Device Mode API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/telephony_device_mode_api/telephony_device_mode_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_device_mode_api/group"/>
+ </component>
+ <component id="telephony_menu_extension_api" name="Telephony Menu Extension API" class="api" filter="s60" introduced="^4">
+ <meta rel="Api" href="phone_plat/telephony_menu_extension_api/telephony_menu_extension_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_menu_extension_api/group"/>
+ </component>
+ <component id="telephony_remote_party_information_api" name="Telephony Remote Party Information API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/telephony_remote_party_information_api/telephony_remote_party_information_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_remote_party_information_api/group"/>
+ </component>
+ <component id="telephony_video_mailbox_settings_api" name="Telephony Video Mailbox Settings API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/telephony_video_mailbox_settings_api/telephony_video_mailbox_settings_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_video_mailbox_settings_api/group"/>
+ </component>
+ <component id="telephony_microphone_mute_status_api" name="Telephony Microphone Mute Status API" class="api" filter="s60">
+ <meta rel="Api" href="phone_plat/telephony_microphone_mute_status_api/telephony_microphone_mute_status_api.metaxml"/>
+ <unit bldFile="phone_plat/telephony_microphone_mute_status_api/group"/>
+ </component>
+ <component id="telephony_logging_extension_api" name="Telephony Logging Extension API" class="api" filter="s60">
+ <unit bldFile="phone_plat/telephony_logging_extension_api/group"/>
+ </component>
+ <component id="telephony_matching_extension_api" name="Telephony Matching Extension API" class="api" filter="s60">
+ <unit bldFile="phone_plat/telephony_matching_extension_api/group"/>
+ </component>
+ <component id="phone_application_commands_api" name="Phone Application Commands API" class="api" filter="s60">
+ <unit bldFile="phone_plat/phone_application_commands_api/group"/>
+ </component>
+ <component id="phone_application_voip_commands_api" name="Phone Application VOIP Commands API" class="api" filter="s60">
+ <unit bldFile="phone_plat/phone_application_voip_commands_api/group"/>
+ </component>
+ <component id="phone_telephony_mediator_api" name="Telephony Mediator API" class="api" filter="s60">
+ <unit bldFile="phone_plat/telephony_mediator_api/group"/>
+ </component>
+ <component id="video_telephony_mediator_api" name="Video Telephony Mediator API" class="api" filter="s60">
+ <unit bldFile="phone_plat/video_telephony_mediator_api/group"/>
+ </component>
+ <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60" introduced="^4">
+ <unit bldFile="phone_plat/video_telephony_control_mediator_api/group"/>
+ </component>
+ </collection>
+ <collection id="phoneplugins" name="Phone Plugins" level="plugin">
+ <component id="csplugin" filter="s60" name="Circuit Switched Plugin" class="plugin" introduced="^4">
+ <unit bldFile="phoneplugins/csplugin/group"/>
+ </component>
+ <component id="phoneindicatorplugin" filter="s60" name="Phone Indicator Plugin" class="plugin" introduced="^4">
+ <unit bldFile="phoneplugins/phoneindicatorplugin" qt:proFile="phoneindicatorplugin.pro"/>
+ </component>
+ <component id="dialerwidgetplugin" filter="s60" name="Dialer Widget Plugin" class="plugin" introduced="^4">
+ <unit bldFile="phoneplugins/dialerwidgetplugin" qt:proFile="dialerwidgetplugin.pro"/>
+ </component>
+ <component id="infowidgetplugin" filter="s60" name="Info Widget Plugin" class="plugin" introduced="^4">
+ <unit bldFile="phoneplugins/infowidgetplugin" qt:proFile="infowidgetplugin.pro"/>
+ </component>
+ </collection>
+ <collection id="phonesettings" name="Phone Settings" level="plugin">
+ <component id="cpphonesettingsplugins" filter="s60" name="Control Panel Phone Settings Plugins" class="plugin" introduced="^4">
+ <unit bldFile="phonesettings/cpphonesettingsplugins" qt:proFile="cpphonesettingsplugins.pro"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian4/app/radio/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -28,7 +28,10 @@
<component id="radioapplication" filter="s60" name="Radio Application" introduced="^4">
<unit bldFile="radioapp/radioapplication" qt:proFile="radioapplication.pro"/>
</component>
- <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4">
+ <component id="radiowidgetsplugin" filter="s60" name="Radio Widgets Plugin" introduced="^4" class="plugin">
+ <unit bldFile="radioapp/radiowidgetsplugin" qt:proFile="radiowidgetsplugin.pro"/>
+ </component>
+ <component id="radio_rom" filter="s60" name="Radio ROM" introduced="^4" class="config">
<unit bldFile="rom"/>
</component>
</collection>
--- a/symbian4/app/rndtools/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -42,28 +42,11 @@
<unit bldFile="screengrabber" qt:proFile="screengrabber.pro"/>
</component>
</collection>
- <collection id="stifui" name="STIF UI" level="generic">
- <component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
- <unit bldFile="stifui/avkon/group"/>
- </component>
- <component id="stifuiqt" filter="s60,test" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
- <unit bldFile="stifui/qt" qt:proFile="stifqtui.pro" /> <!-- should use stifuiqt as the dir name -->
- </component>
- </collection>
<collection id="memspyui" name="Memspy UI" level="generic">
<!-- collection is really a component. Should move down a directory -->
<component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
<unit bldFile="memspyui" qt:proFile="memspyui.pro" />
</component>
</collection>
- <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
- <component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development" target="device">
- <!-- should split up into individual components -->
- <unit bldFile="htiui/group"/>
- </component>
- <component id="htiadminqt" filter="s60" name="HTI Admin Qt" purpose="development" target="device">
- <unit bldFile="htiui/htiadminqt" qt:proFile="HtiAdmin.pro"/>
- </component>
- </collection>
</package>
</SystemDefinition>
--- a/symbian4/app/techview/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/techview/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="techview" name="Techview" levels="services ui utils apps1 apps2 apps3">
- <collection id="buildverification" name="Build Verification" level="services">
- <component id="autosmoketest" name="Auto Smoke Test" filter="gt" purpose="development" introduced="9.1">
- <unit bldFile="buildverification/autosmoketest/Group" mrp="buildverification/autosmoketest/Group/testtools_autosmoketest.mrp"/>
- </component>
- <component id="smoketest" name="Smoke Test" filter="gt" purpose="development">
- <unit bldFile="buildverification/smoketest/Group" mrp="buildverification/smoketest/Group/testtools_smoketest.mrp"/>
- </component>
- </collection>
<collection id="techviewplat" name="Techview Platform" level="services">
<component id="techviewuiklaf" name="UIKLAF" filter="techview" purpose="development">
<unit bldFile="techviewplat/techviewuiklaf/GROUP" mrp="techviewplat/techviewuiklaf/GROUP/techview_uiklaf.mrp" priority="10"/>
--- a/symbian4/app/videoplayer/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -74,11 +74,11 @@
</component>
</collection>
<collection id="videoplayback" name="Video Playback Plugins" level="plugin">
- <component id="hbvideoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
- <unit bldFile="videoplayback/hbvideoplaybackview" qt:proFile="hbvideoplaybackview.pro" qt:qmakeArgs="-r"/>
+ <component id="videoplaybackview" filter="s60" name="HB Video Playback View" class="plugin" introduced="^4">
+ <unit bldFile="videoplayback/videoplaybackview" qt:proFile="videoplaybackview.pro" qt:qmakeArgs="-r"/>
</component>
- <component id="hbvideoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
- <unit bldFile="videoplayback/hbvideoplaybackviewplugin" qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
+ <component id="videoplaybackviewplugin" filter="s60" name="HB Video Playback View Plugin" introduced="^4" class="plugin">
+ <unit bldFile="videoplayback/videoplaybackviewplugin" qt:proFile="videoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
</component>
<component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
<meta rel="testbuild">
--- a/symbian4/app/videotelephony/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/app/videotelephony/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.1" xmlns:qt="http://www.nokia.com/qt">
<package id="videotelephony" name="Video Telephony Apps" levels="engine plugin prot ui">
<collection id="videotelephony_plat" name="VT Apps Platform Interfaces" level="ui">
- <component id="video_telephony_control_mediator_api" name="Video Telephony Control Mediator API" class="api" filter="s60">
- <meta rel="Api" href="videotelephony_plat/video_telephony_control_mediator_api/video_telephony_control_mediator_api.metaxml"/>
- <unit bldFile="videotelephony_plat/video_telephony_control_mediator_api/group"/>
- </component>
<component id="video_telephony_media_configuration_api" name="Video Telephony Media Configuration API" class="api" filter="s60">
<meta rel="Api" href="videotelephony_plat/video_telephony_media_configuration_api/video_telephony_media_configuration_api.metaxml"/>
<unit bldFile="videotelephony_plat/video_telephony_media_configuration_api/group"/>
@@ -20,8 +16,17 @@
</component>
</collection>
<collection id="vtuis" name="Video Telephony UIs" level="ui">
- <component id="videotelui" filter="s60" name="Video Telephony UI">
- <unit bldFile="vtuis/videotelui/group"/>
+ <component id="lcvtplugin" filter="s60" name="Video Telephony Plugin" class="plugin">
+ <unit bldFile="vtuis/lcvtplugin/group"/>
+ </component>
+ <component id="lcvtapp" filter="s60" name="Video Telephony Application" introduced="^4">
+ <unit bldFile="vtuis/lcvtapp" qt:proFile="lcvtapp.pro"/>
+ </component>
+ <component id="lcvtindicatorplugin" filter="s60" name="Video Telephony Indicator Plugin" class="plugin" introduced="^4">
+ <unit bldFile="vtuis/lcvtindicatorplugin" qt:proFile="lcvtindicatorplugin.pro"/>
+ </component>
+ <component id="lcvtindicatorcontroller" filter="s60" name="Video Telephony Indicator Controller" introduced="^4">
+ <unit bldFile="vtuis/lcvtindicatorcontroller" qt:proFile="lcvtindicatorcontroller.pro"/>
</component>
</collection>
<collection id="vtprotocolplugins" name="VT Protocol Plugins" level="plugin">
@@ -35,7 +40,7 @@
<collection id="vtprotocolsstub" name="VT Protocols Stub" level="prot">
<!-- this collection is really a component, move down a directory -->
<component id="videotelproto" filter="s60" name="Video Telephony Protocol">
- <unit bldFile="vtprotocolsstub/group" filter="sf_build"/>
+ <unit bldFile="vtprotocolsstub/group"/>
</component>
</collection>
</package>
--- a/symbian4/mw/accesssec/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -11,21 +11,21 @@
<unit bldFile="accesssec_plat/eap_type_api/group"/>
</component>
<component id="eap_qt_configuration_api" name="EAP Qt Configuration API" class="api" filter="s60" introduced="^4">
- <unit bldFile="accesssec_plat" qt:proFile="accesssec_plat.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="accesssec_plat" qt:proFile="accesssec_plat.pro"/>
</component>
</collection>
<collection id="securitysettings" name="WLAN Security Settings" level="specific">
<component id="accesssec_qtconfigutils" filter="s60" name="Access Security Config Utils" introduced="^4">
- <unit bldFile="securitysettings/qtconfigutils" qt:proFile="qtconfigutils.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="securitysettings/qtconfigutils" qt:proFile="qtconfigutils.pro"/>
</component>
<component id="cpwlansecurityuiplugins" filter="s60" name="Control Panel WLAN Security UI Plugins" class="plugin" introduced="^4">
- <unit bldFile="securitysettings/cpwlansecurityuiplugins" qt:proFile="cpwlansecurityuiplugins.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="securitysettings/cpwlansecurityuiplugins" qt:proFile="cpwlansecurityuiplugins.pro"/>
</component>
<component id="cpeapuiplugins" filter="s60" name="Control Panel EAP UI Pugins" class="plugin" introduced="^4">
- <unit bldFile="securitysettings/cpeapuiplugins" qt:proFile="cpeapuiplugins.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="securitysettings/cpeapuiplugins" qt:proFile="cpeapuiplugins.pro"/>
</component>
<component id="eapqtdialogs" filter="s60" name="EAP Qt Dialogs" introduced="^4">
- <unit bldFile="securitysettings/eapqtdialogs" qt:proFile="eapqtdialogs.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="securitysettings/eapqtdialogs" qt:proFile="eapqtdialogs.pro"/>
</component>
</collection>
<collection id="eapol" name="EAPOL" level="framework">
--- a/symbian4/mw/appinstall/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -46,7 +46,10 @@
</collection>
<collection id="ncdengine" name="Nokia Content Discover" level="framework">
<component id="ncdengine_build" filter="s60" name="NCD Engine" introduced="^1">
- <unit bldFile="ncdengine/engine" qt:proFile="engine.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="ncdengine/group"/>
+ </component>
+ <component id="ncdengine_qt_build" filter="s60" name="NCD Qt Engine">
+ <unit bldFile="ncdengine/engine" qt:proFile="engine.pro"/>
</component>
</collection>
<collection id="appinstaller" name="Application Installer" level="generic">
@@ -54,7 +57,7 @@
<unit bldFile="appinstaller/appinstui/group"/>
</component>
<component id="appinstui_qt" filter="s60" name="Application Installer Qt UI" introduced="^2">
- <unit bldFile="appinstaller/appinstui" qt:proFile="appinstui.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="appinstaller/appinstui" qt:proFile="appinstui.pro"/>
</component>
</collection>
<collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
@@ -66,9 +69,12 @@
<collection id="iaupdate" name="Independent Apps Update" level="api">
<!-- Should reorganise into actual components -->
<component id="iad" name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
- <unit bldFile="iaupdate" qt:proFile="iaupdate.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="iaupdate" qt:proFile="iaupdate.pro"/>
</component>
<component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
+ <meta rel="config">
+ <defined condition="FF_IAUPDATE"/>
+ </meta>
<unit bldFile="iaupdate/group"/>
</component>
</collection>
--- a/symbian4/mw/appsupport/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -183,7 +183,7 @@
<unit bldFile="coreapplicationuis/advancedtspcontroller/group"/>
</component>
<component id="powersaveutilities" filter="s60" name="Power Save Utilities">
- <unit bldFile="coreapplicationuis/powersaveutilities/group"/>
+ <unit bldFile="coreapplicationuis/powersaveutilities" qt:proFile="powersaveutilities.pro"/>
</component>
<component id="gsserverenginestub" filter="s60" name="GS Server Engine Stub" deprecated="^4">
<unit bldFile="coreapplicationuis/gsserverenginestub/group"/>
--- a/symbian4/mw/browser/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,7 +2,7 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="browser" name="Browser" levels="plugin utils support main">
<collection id="bookmarksengine" name="Bookmarks Engine" level="support">
- <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
+ <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4" filter="s60">
<unit bldFile="bookmarksengine" qt:proFile="bookmarksengine.pro"/>
</component>
</collection>
--- a/symbian4/mw/btservices/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -137,9 +137,6 @@
<component id="btindicator" filter="s60" name="Bluetooth Indicator" introduced="^4">
<unit bldFile="bluetoothengine/btindicator" qt:proFile="btindicator.pro"/>
</component>
- <component id="bluetoothengine_conf" filter="s60" name="Bluetooth Engine Config" class="config" introduced="^4">
- <unit bldFile="bluetoothengine/conf"/>
- </component>
</collection>
<collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
<component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
--- a/symbian4/mw/camerasrv/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -36,11 +36,5 @@
<unit bldFile="configmanagers/imagingconfigmanager/group"/>
</component>
</collection>
- <collection id="camerasrv_info" name="Camera Services Info" level="api">
- <component id="camerasrv_build" filter="s60" name="Camera Services Build">
- <!-- should split into individual bld.infs -->
- <unit bldFile="group"/>
- </component>
- </collection>
</package>
</SystemDefinition>
--- a/symbian4/mw/classicui/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -7,11 +7,6 @@
<unit bldFile="classicui_plat/signal_pane_api/group" filter="!test"/>
<unit bldFile="classicui_plat/signal_pane_api/tsrc/group" filter="test,api_test"/>
</component>
- <component id="japanese_reading_api" name="Japanese Reading API" class="api" filter="s60">
- <meta rel="Api" href="classicui_plat/japanese_reading_api/japanese_reading_api.metaxml"/>
- <unit bldFile="classicui_plat/japanese_reading_api/group" filter="!test"/>
- <unit bldFile="classicui_plat/japanese_reading_api/tsrc/group" filter="test,api_test"/>
- </component>
<component id="global_popup_priority_controller_api" name="Global Popup Priority Controller API" class="api" filter="s60">
<meta rel="Api" href="classicui_plat/global_popup_priority_controller_api/global_popup_priority_controller_api.metaxml"/>
<unit bldFile="classicui_plat/global_popup_priority_controller_api/group" filter="!test"/>
@@ -67,11 +62,6 @@
<unit bldFile="classicui_plat/avkon_ui_server_api/group" filter="!test"/>
<unit bldFile="classicui_plat/avkon_ui_server_api/tsrc/group" filter="test,api_test"/>
</component>
- <component id="number_grouping_api" name="Number Grouping API" class="api" filter="s60">
- <meta rel="Api" href="classicui_plat/number_grouping_api/number_grouping_api.metaxml"/>
- <unit bldFile="classicui_plat/number_grouping_api/group" filter="!test"/>
- <unit bldFile="classicui_plat/number_grouping_api/tsrc/group" filter="test,api_test"/>
- </component>
<component id="extended_status_pane_api" name="Extended Status Pane API" class="api" filter="s60">
<meta rel="Api" href="classicui_plat/extended_status_pane_api/extended_status_pane_api.metaxml"/>
<unit bldFile="classicui_plat/extended_status_pane_api/group" filter="!test"/>
@@ -347,10 +337,6 @@
<meta rel="Api" href="classicui_plat/avkon_testability_api/avkon_testability_api.metaxml"/>
<unit bldFile="classicui_plat/avkon_testability_api/group"/>
</component>
- <component id="ganes_api" name="ganes_api" class="api" filter="s60">
- <meta rel="Api" href="classicui_plat/ganes_api/ganes_api.metaxml"/>
- <unit bldFile="classicui_plat/ganes_api/group"/>
- </component>
<component id="ode_api" name="Ode API" class="api" filter="s60">
<unit bldFile="classicui_plat/ode_api/group"/>
</component>
@@ -373,11 +359,6 @@
<component id="discreet_popup_api" name="Discreet Popup API" class="api" filter="s60">
<unit bldFile="classicui_plat/discreet_popup_api/group"/>
</component>
- <component id="touch_gesture_framework_api" name="Touch Gesture Framework API" class="api" filter="s60">
- <meta rel="Api" href="classicui_plat/touch_gesture_framework_api/touch_gesture_framework_api.metaxml"/>
- <unit bldFile="classicui_plat/touch_gesture_framework_api/group"/> <!-- should this be commented out? -->
- <!--<unit bldFile="classicui_plat/touch_gesture_framework_api/tsrc/group" filter="test,api_test"/> -->
- </component>
<component id="extended_options_menu_api" name="Extended Options Menu API" class="api" filter="s60">
<meta rel="Api" href="classicui_plat/extended_options_menu_api/extended_options_menu_api.metaxml"/>
<unit bldFile="classicui_plat/extended_options_menu_api/group" filter="!test"/>
@@ -391,304 +372,302 @@
<meta rel="Api" href="classicui_plat/findutil_api/findutil_api.metaxml"/>
<unit bldFile="classicui_plat/findutil_api/group"/>
</component>
- </collection>
- <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
<component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/input_frame_api/input_frame_api.metaxml"/>
- <unit bldFile="classicui_pub/input_frame_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/input_frame_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/input_frame_api/input_frame_api.metaxml"/>
+ <unit bldFile="classicui_plat/input_frame_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/input_frame_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="window_server_event_observer_api" name="Window Server Event Observer API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/window_server_event_observer_api/window_server_event_observer_api.metaxml"/>
- <unit bldFile="classicui_pub/window_server_event_observer_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/window_server_event_observer_api/window_server_event_observer_api.metaxml"/>
+ <unit bldFile="classicui_plat/window_server_event_observer_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/window_server_event_observer_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="application_framework_api" name="Application Framework API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/application_framework_api/application_framework_api.metaxml"/>
- <unit bldFile="classicui_pub/application_framework_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/application_framework_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/application_framework_api/application_framework_api.metaxml"/>
+ <unit bldFile="classicui_plat/application_framework_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/application_framework_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="scroller_api" name="Scroller API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/scroller_api/scroller_api.metaxml"/>
- <unit bldFile="classicui_pub/scroller_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/scroller_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/scroller_api/scroller_api.metaxml"/>
+ <unit bldFile="classicui_plat/scroller_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/scroller_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="ui_framework_utilities_api" name="UI Framework Utilities API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/ui_framework_utilities_api/ui_framework_utilities_api.metaxml"/>
- <unit bldFile="classicui_pub/ui_framework_utilities_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/ui_framework_utilities_api/ui_framework_utilities_api.metaxml"/>
+ <unit bldFile="classicui_plat/ui_framework_utilities_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/ui_framework_utilities_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="ui_framework_definitions_api" name="UI Framework Definitions API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/ui_framework_definitions_api/ui_framework_definitions_api.metaxml"/>
- <unit bldFile="classicui_pub/ui_framework_definitions_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/ui_framework_definitions_api/ui_framework_definitions_api.metaxml"/>
+ <unit bldFile="classicui_plat/ui_framework_definitions_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/ui_framework_definitions_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="buttons_api" name="Buttons API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/buttons_api/buttons_api.metaxml"/>
- <unit bldFile="classicui_pub/buttons_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/buttons_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/buttons_api/buttons_api.metaxml"/>
+ <unit bldFile="classicui_plat/buttons_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/buttons_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="queries_api" name="Queries API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/queries_api/queries_api.metaxml"/>
- <unit bldFile="classicui_pub/queries_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/queries_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/queries_api/queries_api.metaxml"/>
+ <unit bldFile="classicui_plat/queries_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/queries_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="aiw_generic_parameter_api" name="AIW Generic Parameter API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/aiw_generic_parameter_api/aiw_generic_parameter_api.metaxml"/>
- <unit bldFile="classicui_pub/aiw_generic_parameter_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/aiw_generic_parameter_api/aiw_generic_parameter_api.metaxml"/>
+ <unit bldFile="classicui_plat/aiw_generic_parameter_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/aiw_generic_parameter_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="editors_api" name="Editors API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/editors_api/editors_api.metaxml"/>
- <unit bldFile="classicui_pub/editors_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/editors_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/editors_api/editors_api.metaxml"/>
+ <unit bldFile="classicui_plat/editors_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/editors_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
- <unit bldFile="classicui_pub/common_file_dialogs_api/group"/>
+ <meta rel="Api" href="classicui_plat/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
+ <unit bldFile="classicui_plat/common_file_dialogs_api/group"/>
</component>
<component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/dialog_shutter_api/dialog_shutter_api.metaxml"/>
- <unit bldFile="classicui_pub/dialog_shutter_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/dialog_shutter_api/dialog_shutter_api.metaxml"/>
+ <unit bldFile="classicui_plat/dialog_shutter_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/dialog_shutter_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="fonts_api" name="Fonts API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/fonts_api/fonts_api.metaxml"/>
- <unit bldFile="classicui_pub/fonts_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/fonts_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/fonts_api/fonts_api.metaxml"/>
+ <unit bldFile="classicui_plat/fonts_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/fonts_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="screen_clearer_api" name="Screen Clearer API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/screen_clearer_api/screen_clearer_api.metaxml"/>
- <unit bldFile="classicui_pub/screen_clearer_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/screen_clearer_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/screen_clearer_api/screen_clearer_api.metaxml"/>
+ <unit bldFile="classicui_plat/screen_clearer_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/screen_clearer_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="notifiers_api" name="Notifiers API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/notifiers_api/notifiers_api.metaxml"/>
- <unit bldFile="classicui_pub/notifiers_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/notifiers_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/notifiers_api/notifiers_api.metaxml"/>
+ <unit bldFile="classicui_plat/notifiers_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/notifiers_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="notes_api" name="Notes API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/notes_api/notes_api.metaxml"/>
- <unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/notes_api/notes_api.metaxml"/>
+ <unit bldFile="classicui_plat/notes_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/notes_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>
- <unit bldFile="classicui_pub/status_pane_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/status_pane_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/status_pane_api/status_pane_api.metaxml"/>
+ <unit bldFile="classicui_plat/status_pane_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/status_pane_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="base_controls_api" name="Base Controls API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/base_controls_api/base_controls_api.metaxml"/>
- <unit bldFile="classicui_pub/base_controls_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/base_controls_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/base_controls_api/base_controls_api.metaxml"/>
+ <unit bldFile="classicui_plat/base_controls_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/base_controls_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="grids_api" name="Grids API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/grids_api/grids_api.metaxml"/>
- <unit bldFile="classicui_pub/grids_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/grids_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/grids_api/grids_api.metaxml"/>
+ <unit bldFile="classicui_plat/grids_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/grids_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="context_pane_api" name="Context Pane API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/context_pane_api/context_pane_api.metaxml"/>
- <unit bldFile="classicui_pub/context_pane_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/context_pane_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/context_pane_api/context_pane_api.metaxml"/>
+ <unit bldFile="classicui_plat/context_pane_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/context_pane_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="lists_api" name="Lists API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/lists_api/lists_api.metaxml"/>
- <unit bldFile="classicui_pub/lists_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/lists_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/lists_api/lists_api.metaxml"/>
+ <unit bldFile="classicui_plat/lists_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/lists_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="popups_api" name="Popups API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/popups_api/popups_api.metaxml"/>
- <unit bldFile="classicui_pub/popups_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/popups_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/popups_api/popups_api.metaxml"/>
+ <unit bldFile="classicui_plat/popups_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/popups_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="misc_controls_api" name="Misc Controls API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/misc_controls_api/misc_controls_api.metaxml"/>
- <unit bldFile="classicui_pub/misc_controls_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/misc_controls_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/misc_controls_api/misc_controls_api.metaxml"/>
+ <unit bldFile="classicui_plat/misc_controls_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/misc_controls_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="keylock_api" name="Keylock API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/keylock_api/keylock_api.metaxml"/>
- <unit bldFile="classicui_pub/keylock_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/keylock_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/keylock_api/keylock_api.metaxml"/>
+ <unit bldFile="classicui_plat/keylock_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/keylock_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="options_menu_api" name="Options Menu API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/options_menu_api/options_menu_api.metaxml"/>
- <unit bldFile="classicui_pub/options_menu_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/options_menu_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/options_menu_api/options_menu_api.metaxml"/>
+ <unit bldFile="classicui_plat/options_menu_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/options_menu_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="hierarchical_lists_api" name="Hierarchical Lists API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/hierarchical_lists_api/hierarchical_lists_api.metaxml"/>
- <unit bldFile="classicui_pub/hierarchical_lists_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/hierarchical_lists_api/hierarchical_lists_api.metaxml"/>
+ <unit bldFile="classicui_plat/hierarchical_lists_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/hierarchical_lists_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="navigation_pane_api" name="Navigation Pane API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/navigation_pane_api/navigation_pane_api.metaxml"/>
- <unit bldFile="classicui_pub/navigation_pane_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/navigation_pane_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/navigation_pane_api/navigation_pane_api.metaxml"/>
+ <unit bldFile="classicui_plat/navigation_pane_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/navigation_pane_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="tabs_api" name="Tabs API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/tabs_api/tabs_api.metaxml"/>
- <unit bldFile="classicui_pub/tabs_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/tabs_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/tabs_api/tabs_api.metaxml"/>
+ <unit bldFile="classicui_plat/tabs_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/tabs_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="title_pane_touch_observer_api" name="Title Pane Touch Observer API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/title_pane_touch_observer_api/title_pane_touch_observer_api.metaxml"/>
- <unit bldFile="classicui_pub/title_pane_touch_observer_api/group"/>
+ <meta rel="Api" href="classicui_plat/title_pane_touch_observer_api/title_pane_touch_observer_api.metaxml"/>
+ <unit bldFile="classicui_plat/title_pane_touch_observer_api/group"/>
</component>
<component id="choice_list_api" name="Choice List API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/choice_list_api/choice_list_api.metaxml"/>
- <unit bldFile="classicui_pub/choice_list_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/choice_list_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/choice_list_api/choice_list_api.metaxml"/>
+ <unit bldFile="classicui_plat/choice_list_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/choice_list_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="info_popup_note_api" name="Info Popup Note API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/info_popup_note_api/info_popup_note_api.metaxml"/>
- <unit bldFile="classicui_pub/info_popup_note_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/info_popup_note_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/info_popup_note_api/info_popup_note_api.metaxml"/>
+ <unit bldFile="classicui_plat/info_popup_note_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/info_popup_note_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="setting_pages_api" name="Setting Pages API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/setting_pages_api/setting_pages_api.metaxml"/>
- <unit bldFile="classicui_pub/setting_pages_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/setting_pages_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/setting_pages_api/setting_pages_api.metaxml"/>
+ <unit bldFile="classicui_plat/setting_pages_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/setting_pages_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="screen_mode_api" name="Screen Mode API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/screen_mode_api/screen_mode_api.metaxml"/>
- <unit bldFile="classicui_pub/screen_mode_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/screen_mode_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/screen_mode_api/screen_mode_api.metaxml"/>
+ <unit bldFile="classicui_plat/screen_mode_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/screen_mode_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="indicators_api" name="Indicators API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/indicators_api/indicators_api.metaxml"/>
- <unit bldFile="classicui_pub/indicators_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/indicators_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/indicators_api/indicators_api.metaxml"/>
+ <unit bldFile="classicui_plat/indicators_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/indicators_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="error_ui_api" name="Error UI API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/error_ui_api/error_ui_api.metaxml"/>
- <unit bldFile="classicui_pub/error_ui_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/error_ui_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/error_ui_api/error_ui_api.metaxml"/>
+ <unit bldFile="classicui_plat/error_ui_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/error_ui_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="animation_api" name="Animation API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/animation_api/animation_api.metaxml"/>
- <unit bldFile="classicui_pub/animation_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/animation_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/animation_api/animation_api.metaxml"/>
+ <unit bldFile="classicui_plat/animation_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/animation_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="searchfield_api" name="Searchfield API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/searchfield_api/searchfield_api.metaxml"/>
- <unit bldFile="classicui_pub/searchfield_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/searchfield_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/searchfield_api/searchfield_api.metaxml"/>
+ <unit bldFile="classicui_plat/searchfield_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/searchfield_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="labels_api" name="Labels API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/labels_api/labels_api.metaxml"/>
- <unit bldFile="classicui_pub/labels_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/labels_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/labels_api/labels_api.metaxml"/>
+ <unit bldFile="classicui_plat/labels_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/labels_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="hotkeys_api" name="Hotkeys API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/hotkeys_api/hotkeys_api.metaxml"/>
- <unit bldFile="classicui_pub/hotkeys_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/hotkeys_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/hotkeys_api/hotkeys_api.metaxml"/>
+ <unit bldFile="classicui_plat/hotkeys_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/hotkeys_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="initialization_api" name="Initialization API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/initialization_api/initialization_api.metaxml"/>
- <unit bldFile="classicui_pub/initialization_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/initialization_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/initialization_api/initialization_api.metaxml"/>
+ <unit bldFile="classicui_plat/initialization_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/initialization_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="volume_control_api" name="Volume Control API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/volume_control_api/volume_control_api.metaxml"/>
- <unit bldFile="classicui_pub/volume_control_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/volume_control_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/volume_control_api/volume_control_api.metaxml"/>
+ <unit bldFile="classicui_plat/volume_control_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/volume_control_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="title_pane_api" name="Title Pane API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/title_pane_api/title_pane_api.metaxml"/>
- <unit bldFile="classicui_pub/title_pane_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/title_pane_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/title_pane_api/title_pane_api.metaxml"/>
+ <unit bldFile="classicui_plat/title_pane_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/title_pane_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="sounds_api" name="Sounds API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/sounds_api/sounds_api.metaxml"/>
- <unit bldFile="classicui_pub/sounds_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/sounds_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/sounds_api/sounds_api.metaxml"/>
+ <unit bldFile="classicui_plat/sounds_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/sounds_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="aiw_service_handler_api" name="AIW Service Handler API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/aiw_service_handler_api/aiw_service_handler_api.metaxml"/>
- <unit bldFile="classicui_pub/aiw_service_handler_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/aiw_service_handler_api/aiw_service_handler_api.metaxml"/>
+ <unit bldFile="classicui_plat/aiw_service_handler_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/aiw_service_handler_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="aiw_criteria_api" name="AIW Criteria API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/aiw_criteria_api/aiw_criteria_api.metaxml"/>
- <unit bldFile="classicui_pub/aiw_criteria_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/aiw_criteria_api/aiw_criteria_api.metaxml"/>
+ <unit bldFile="classicui_plat/aiw_criteria_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/aiw_criteria_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="touch_ui_utilities_api" name="Touch UI Utilities API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/touch_ui_utilities_api/touch_ui_utilities_api.metaxml"/>
- <unit bldFile="classicui_pub/touch_ui_utilities_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/touch_ui_utilities_api/touch_ui_utilities_api.metaxml"/>
+ <unit bldFile="classicui_plat/touch_ui_utilities_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/touch_ui_utilities_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="generic_button_api" name="Generic Button API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/generic_button_api/generic_button_api.metaxml"/>
- <unit bldFile="classicui_pub/generic_button_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/generic_button_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/generic_button_api/generic_button_api.metaxml"/>
+ <unit bldFile="classicui_plat/generic_button_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/generic_button_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="form_api" name="Form API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/form_api/form_api.metaxml"/>
- <unit bldFile="classicui_pub/form_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/form_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/form_api/form_api.metaxml"/>
+ <unit bldFile="classicui_plat/form_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/form_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="uikon_core_controls" name="Uikon Core Controls" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/uikon_core_controls/uikon_core_controls.metaxml"/>
- <unit bldFile="classicui_pub/uikon_core_controls/group" filter="!test"/>
- <unit bldFile="classicui_pub/uikon_core_controls/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/uikon_core_controls/uikon_core_controls.metaxml"/>
+ <unit bldFile="classicui_plat/uikon_core_controls/group" filter="!test"/>
+ <unit bldFile="classicui_plat/uikon_core_controls/tsrc/group" filter="test,api_test"/>
</component>
<component id="calendar_api" name="Calendar API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/calendar_api/calendar_api.metaxml"/>
- <unit bldFile="classicui_pub/calendar_api/group"/>
+ <meta rel="Api" href="classicui_plat/calendar_api/calendar_api.metaxml"/>
+ <unit bldFile="classicui_plat/calendar_api/group"/>
</component>
<component id="toolbar_api" name="Toolbar API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/toolbar_api/toolbar_api.metaxml"/>
- <unit bldFile="classicui_pub/toolbar_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/toolbar_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/toolbar_api/toolbar_api.metaxml"/>
+ <unit bldFile="classicui_plat/toolbar_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/toolbar_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="server_application_api" name="Server Application API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/server_application_api/server_application_api.metaxml"/>
- <unit bldFile="classicui_pub/server_application_api/group"/>
+ <meta rel="Api" href="classicui_plat/server_application_api/server_application_api.metaxml"/>
+ <unit bldFile="classicui_plat/server_application_api/group"/>
</component>
<component id="slider_api" name="Slider API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/slider_api/slider_api.metaxml"/>
- <unit bldFile="classicui_pub/slider_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/slider_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/slider_api/slider_api.metaxml"/>
+ <unit bldFile="classicui_plat/slider_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/slider_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="private_ui_framework_api" name="Private UI Framework API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/private_ui_framework_api/private_ui_framework_api.metaxml"/>
- <unit bldFile="classicui_pub/private_ui_framework_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/private_ui_framework_api/private_ui_framework_api.metaxml"/>
+ <unit bldFile="classicui_plat/private_ui_framework_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/private_ui_framework_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="dialogs_api" name="Dialogs API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/dialogs_api/dialogs_api.metaxml"/>
- <unit bldFile="classicui_pub/dialogs_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/dialogs_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/dialogs_api/dialogs_api.metaxml"/>
+ <unit bldFile="classicui_plat/dialogs_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/dialogs_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="document_handler_api" name="Document handler API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/document_handler_api/document_handler_api.metaxml"/>
- <unit bldFile="classicui_pub/document_handler_api/group"/>
+ <meta rel="Api" href="classicui_plat/document_handler_api/document_handler_api.metaxml"/>
+ <unit bldFile="classicui_plat/document_handler_api/group"/>
</component>
<component id="images_api" name="Images API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/images_api/images_api.metaxml"/>
- <unit bldFile="classicui_pub/images_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/images_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/images_api/images_api.metaxml"/>
+ <unit bldFile="classicui_plat/images_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/images_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="stylus_popup_menu_api" name="Stylus Pop-up Menu API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/stylus_popup_menu_api/stylus_popup_menu_api.metaxml"/>
- <unit bldFile="classicui_pub/stylus_popup_menu_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/stylus_popup_menu_api/stylus_popup_menu_api.metaxml"/>
+ <unit bldFile="classicui_plat/stylus_popup_menu_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/stylus_popup_menu_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="information_preview_popup_api" name="Information Preview Popup API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/information_preview_popup_api/information_preview_popup_api.metaxml"/>
- <unit bldFile="classicui_pub/information_preview_popup_api/group" filter="!test"/>
- <unit bldFile="classicui_pub/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
+ <meta rel="Api" href="classicui_plat/information_preview_popup_api/information_preview_popup_api.metaxml"/>
+ <unit bldFile="classicui_plat/information_preview_popup_api/group" filter="!test"/>
+ <unit bldFile="classicui_plat/information_preview_popup_api/tsrc/group" filter="test,api_test"/>
</component>
<component id="intermediate_state_api" name="Intermediate State API" class="api" filter="s60">
- <meta rel="Api" href="classicui_pub/intermediate_state_api/intermediate_state_api.metaxml"/>
- <unit bldFile="classicui_pub/intermediate_state_api/group"/>
+ <meta rel="Api" href="classicui_plat/intermediate_state_api/intermediate_state_api.metaxml"/>
+ <unit bldFile="classicui_plat/intermediate_state_api/group"/>
</component>
<component id="help_launcher_api" name="Help Launcher API" class="api" filter="s60">
- <unit bldFile="classicui_pub/help_launcher_api/group"/>
+ <unit bldFile="classicui_plat/help_launcher_api/group"/>
</component>
</collection>
<collection id="ode" name="Open Dynamics Engine" level="support">
@@ -716,9 +695,6 @@
<component id="aknglobalui" filter="s60" name="Avkon Global UI">
<unit bldFile="uifw/aknglobalui/group"/>
</component>
- <component id="ganes" filter="s60" name="Ganes">
- <unit bldFile="uifw/ganes/group"/>
- </component>
</collection>
<collection id="commonuis" name="Common UIs" level="specific">
<component id="commonui" filter="s60" name="Common UI">
@@ -733,18 +709,6 @@
<unit bldFile="applicationinterworkingfw/servicehandler/group"/>
</component>
</collection>
- <collection id="commonadapter" name="Common Adapter" level="support">
- <!-- the collection is really a component. Move down a directory.-->
- <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
- <unit bldFile="commonadapter/group"/>
- </component>
- </collection>
- <collection id="akntouchgesturefw" name="Avkon Touch Gesture Framework" level="generic">
- <!-- the collection is really a component. Move down a directory.-->
- <component id="akntouchgesturefw_build" filter="s60" name="Avkon Touch Gesture Framework Build" introduced="^3">
- <unit bldFile="akntouchgesturefw/group"/>
- </component>
- </collection>
<collection id="uiutils" name="UI Utils" level="specific">
<component id="localizer" filter="s60" name="Directory Localizer">
<unit bldFile="uiutils/localizer/group"/>
@@ -752,12 +716,6 @@
<component id="findutil" filter="s60" name="Find Utility">
<unit bldFile="uiutils/findutil/group"/>
</component>
- <component id="gamerecognizer" filter="s60" name="Game Recognizer" class="plugin">
- <unit bldFile="uiutils/gamerecognizer/group"/>
- </component>
- <component id="aknjapanesereading" filter="s60" name="Avkon Japanese Reading">
- <unit bldFile="uiutils/aknjapanesereading/group"/>
- </component>
<component id="hlplch" name="Help Launcher" filter="s60,bldfirst">
<unit bldFile="uiutils/hlplch/group"/>
</component>
@@ -766,6 +724,9 @@
<component id="uikon" name="Uikon" introduced="6.0" purpose="mandatory">
<unit bldFile="commonuisupport/uikon/group" mrp="commonuisupport/uikon/group/app-framework_uikon.mrp"/>
</component>
+ <component id="uikon_ncp" name="Uikon (NCP)" introduced="S^4" purpose="mandatory">
+ <unit bldFile="commonuisupport/uikon/group_ncp"/>
+ </component>
<component id="errorresolverdata" name="Error Resolver Data" purpose="mandatory">
<unit bldFile="commonuisupport/errorresolverdata/group" mrp="commonuisupport/errorresolverdata/group/app-framework_errorresgt.mrp"/>
</component>
--- a/symbian4/mw/gstreamer/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/gstreamer/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -4,40 +4,38 @@
<meta rel="config">
<defined condition="FF_GSTREAMER"/>
</meta>
- <!-- Uncomment all units when configuration is in place. All currently #included from gstreamer_build -->
<!-- structure matches planned directory layout -->
<collection id="gstreamerfw" name="GStreamer Framework" level="core">
- <component id="gstreamer_core" name="GStreamer Core" introduced="^3">
- <!--<unit bldFile="gstreamer_core/group"/>-->
+ <component id="gstreamer_core" name="GStreamer Core" introduced="^3" filter="s60">
+ <unit bldFile="gstreamer_core/group"/>
</component>
</collection>
<collection id="gst_plugins" name="GStreamer Plugins" level="plugin">
- <component id="gst_plugins_base" name="GStreamer Base Plugins" introduced="^3">
- <!--<unit bldFile="gst_plugins_base/group"/>-->
+ <component id="gst_plugins_base" name="GStreamer Base Plugins" introduced="^3" filter="s60">
+ <unit bldFile="gst_plugins_base/group"/>
</component>
- <component id="gst_plugins_good" name="GStreamer Good Plugins" introduced="^3">
- <!--<unit bldFile="gst_plugins_good/group"/>-->
+ <component id="gst_plugins_good" name="GStreamer Good Plugins" introduced="^3" filter="s60">
+ <unit bldFile="gst_plugins_good/group"/>
</component>
<component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
- <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
- <unit bldFile="gst_plugins_symbian/tsrc/gstreamertestmodule/group" filter="test"/> <!-- add ,pref_test,TA_GSTREAMER filters later -->
+ <unit bldFile="gst_plugins_symbian/group" filter="!test"/>
+ <unit bldFile="gst_plugins_symbian/tsrc/gstreamertestmodule/group" filter="test,pref_test,TA_GSTREAMER"/>
</component>
</collection>
<collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
- <!-- collection is really a component. Move down an directory -->
+ <!-- collection is really a component. Move down an directory -->
<component id="gstregistrygenerator_build" filter="s60" name="GStreamer Registry Generator Build" introduced="^3">
- <!-- <unit bldFile="gstregistrygenerator/group"/>-->
+ <unit bldFile="gstregistrygenerator/group"/>
</component>
</collection>
<collection id="gst_test_apps" name="GStreamer Test Applications" level="api">
- <component id="gst_player" filter="s60" name="GStreamer Player" introduced="^3" purpose="development">
- <!-- <unit bldFile="gst_test_apps/gst_player/group"/>-->
+ <component id="gst_player" filter="s60,test" name="GStreamer Player" introduced="^3" purpose="development">
+ <unit bldFile="gstreamer_test_apps/gstplayer/group"/>
</component>
</collection>
<collection id="gstreamer_info" name="GStreamer Info" level="api">
- <component id="gstreamer_build" filter="s60" name="GStreamer Build" introduced="^3">
- <!-- make this a ROM component or split up instead? -->
- <unit bldFile="group"/>
+ <component id="gstreamer_rom" filter="s60" name="GStreamer ROM" introduced="^3" class="config">
+ <unit bldFile="rom"/>
</component>
</collection>
</package>
--- a/symbian4/mw/hapticsservices/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/hapticsservices/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -25,7 +25,10 @@
<!-- collection is really a component. Move down a directory -->
<component id="tacticonserver_build" filter="s60" name="Tacticon Server Build" introduced="^3">
<unit bldFile="tacticonserver/group"/>
- <!-- clients and servers are suauly the same component. Consider moving pluign to a separate component if needed -->
+ <!-- clients and servers are usualy the same component. Consider moving plugins to separate components if needed -->
+ </component>
+ <component id="tacticonhapticsplugin" name="Tacticon Haptics Plugin" introduced="^3" class="plugin" filter="s60,dfs_build">
+ <unit bldFile="tacticonserver/server/tacticonpluginfw/tacticonhapticsplugin/group"/>
</component>
</collection>
<collection id="tactilefeedback" name="Tactile Feedback" level="fw">
@@ -35,6 +38,9 @@
<component id="tactilefeedbackresolver" filter="s60" name="Tactile Feedback Resolver" introduced="^1">
<unit bldFile="tactilefeedback/tactilefeedbackresolver/group"/>
</component>
+ <component id="tactilefeedbackresolver_plugins" name="Tactile Feedback Resolver Plugins" introduced="^1" class="plugin" filter="s60,dfs_build">
+ <unit bldFile="tactilefeedback/tactilefeedbackresolver/plugins/group"/>
+ </component>
<component id="tactileclickplugin" filter="s60" name="Tactile Click Plugin" class="plugin" introduced="^1">
<unit bldFile="tactilefeedback/tactileclickplugin/group"/>
</component>
@@ -44,9 +50,8 @@
<component id="tactileactionplugin" filter="s60" name="Tactile Action Plugin" class="plugin" introduced="^1">
<unit bldFile="tactilefeedback/tactileactionplugin/group"/>
</component>
- <component id="tactilefeedback_build" filter="s60" name="Tactile Feedback Build" introduced="^1">
- <!-- consider moving IBY to one fo the above components -->
- <unit bldFile="tactilefeedback/group"/>
+ <component id="tactilefeedback_rom" filter="s60" name="Tactile Feedback ROM" introduced="^1">
+ <unit bldFile="tactilefeedback/rom"/>
</component>
</collection>
</package>
--- a/symbian4/mw/hb/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,7 +2,7 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="hb" name="Orbit" levels="engine test api">
<collection id="hb_info" name="Orbit Info" level="api">
- <component id="hb_build" name="Orbit Build" introduced="^4">
+ <component id="hb_build" name="Orbit Build" introduced="^4" filter="s60">
<!-- should break this down into actual components -->
<unit bldFile="." qt:proFile="hb.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
</component>
--- a/symbian4/mw/helix/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/helix/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,10 +2,15 @@
<SystemDefinition schema="3.0.0">
<package id="helix" name="Helix" levels="plugin framework server generic specific">
<collection id="helix_ren" name="Helix Engine" level="framework">
- <!-- what does "ren" stand for? -->
- <component id="helix_stub" filter="s60" name="Helix Stub" class="api" introduced="^2">
+ <component id="helix_ren_build" filter="s60" name="Helix Engine Build" introduced="^2">
+ <unit bldFile="helix_ren/group"/>
+ </component>
+ <component id="helix_stub" filter="sf_build" name="Helix Stub" class="api" introduced="^2">
<unit bldFile="helix_ren/helix_stub/group"/>
</component>
+ <component id="helixrfsplugin" filter="s60" name="Helix RFS Plugin" class="plugin" introduced="^2">
+ <unit bldFile="helix_ren/helixrfsplugin/group"/>
+ </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian4/mw/ipappprotocols/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -20,11 +20,11 @@
</component>
</collection>
<collection id="realtimenetprots" name="Real Time Net Protocols" level="server">
- <component id="symrtp" name="RTP" introduced="9.0" purpose="optional">
+ <component id="symrtp" name="RTP" introduced="9.0" filter="s60" purpose="optional">
<!-- Real Time Data Protocol -->
<unit bldFile="realtimenetprots/rtp/group" mrp="realtimenetprots/rtp/group/mm-protocols_rtp.mrp"/>
</component>
- <component id="sipfw" name="SIP Framework" introduced="9.2" purpose="optional">
+ <component id="sipfw" name="SIP Framework" introduced="9.2" filter="s60" purpose="optional">
<unit version="2" bldFile="realtimenetprots/sipfw/Group" mrp="realtimenetprots/sipfw/Group/mm-protocols_SIP2_Com.mrp"/>
</component>
</collection>
@@ -46,7 +46,7 @@
</component>
</collection>
<collection id="sipproviderplugins" name="SIP Provider Plugins" level="conn">
- <component id="sipprovider" name="SIP Provider" introduced="^2" purpose="optional" class="plugin">
+ <component id="sipprovider" name="SIP Provider" introduced="^2" filter="s60" purpose="optional" class="plugin">
<unit bldFile="sipproviderplugins/sipprovider/group" mrp="sipproviderplugins/sipprovider/group/mm-protocols_SipProvider.mrp"/>
</component>
</collection>
--- a/symbian4/mw/ipconnmgmt/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -118,29 +118,26 @@
<component id="cmmgr" filter="s60" name="CM Manager">
<unit bldFile="cmmanager/cmmgr/group"/>
</component>
- <component id="connection_settings_shim" name="Connection Settings Shim" introduced="^4">
- <unit bldFile="cmmanager/connection_settings_shim" qt:proFile="connection_settings_shim.pro" qt:qmakeArgs="-r"/>
+ <component id="connection_settings_shim" name="Connection Settings Shim" introduced="^4" filter="s60">
+ <unit bldFile="cmmanager/connection_settings_shim" qt:proFile="connection_settings_shim.pro"/>
</component>
- <component id="cmapplsettingsui" name="Connection Settings UI" introduced="^4">
- <unit bldFile="cmmanager/cmapplsettingsui" qt:proFile="cmapplsettingsui.pro" qt:qmakeArgs="-r"/>
+ <component id="cmapplsettingsui" name="Connection Settings UI" introduced="^4" filter="s60">
+ <unit bldFile="cmmanager/cmapplsettingsui" qt:proFile="cmapplsettingsui.pro"/>
</component>
- <component id="cpipsettingsplugin" name="Connection Settings IP Plugin" class="plugin" introduced="^4">
- <unit bldFile="cmmanager/cpipsettingsplugin" qt:proFile="cpipsettingsplugin.pro" qt:qmakeArgs="-r"/>
+ <component id="cpipsettingsplugin" name="Connection Settings IP Plugin" class="plugin" introduced="^4" filter="s60">
+ <unit bldFile="cmmanager/cpipsettingsplugin" qt:proFile="cpipsettingsplugin.pro"/>
</component>
- <component id="cpdestinationplugin" name="CP Destination Plugin" class="plugin" introduced="^4">
- <unit bldFile="cmmanager/cpdestinationplugin" qt:proFile="cpdestinationplugin.pro" qt:qmakeArgs="-r"/>
+ <component id="cpdestinationplugin" name="CP Destination Plugin" class="plugin" introduced="^4" filter="s60">
+ <unit bldFile="cmmanager/cpdestinationplugin" qt:proFile="cpdestinationplugin.pro"/>
</component>
- <component id="cppacketdataapplugin" name="CP Packet Data AP Pplugin" class="plugin" introduced="^4">
- <unit bldFile="cmmanager/cppacketdataapplugin" qt:proFile="cppacketdataapplugin.pro" qt:qmakeArgs="-r"/>
+ <component id="cppacketdataapplugin" name="CP Packet Data AP Pplugin" class="plugin" introduced="^4" filter="s60">
+ <unit bldFile="cmmanager/cppacketdataapplugin" qt:proFile="cppacketdataapplugin.pro"/>
</component>
- <component id="cpwlanapplugin" name="CP WLAN AP Plugin" class="plugin" introduced="^4">
- <unit bldFile="cmmanager/cpwlanapplugin" qt:proFile="cpwlanapplugin.pro" qt:qmakeArgs="-r"/>
+ <component id="cpwlanapplugin" name="CP WLAN AP Plugin" class="plugin" introduced="^4" filter="s60">
+ <unit bldFile="cmmanager/cpwlanapplugin" qt:proFile="cpwlanapplugin.pro"/>
</component>
</collection>
<collection id="connectionmonitoring" name="Connection Monitoring" level="server">
- <component id="connectionmonitorui" filter="s60" name="Connection Monitor UI">
- <unit bldFile="connectionmonitoring/connectionmonitorui/group"/>
- </component>
<component id="connmon" filter="s60" name="Connection Monitor">
<!-- either split into two components, or #include from a common bld.inf -->
<unit bldFile="connectionmonitoring/connmon/connectionmonitor/group"/>
@@ -149,22 +146,22 @@
<component id="connmonext" filter="s60" name="Connection Monitor Extension API">
<unit bldFile="connectionmonitoring/connmonext/group"/>
</component>
- <component id="cellularindicatorplugin" name="Cellular Indicator Plugin" class="plugin" introduced="^4">
- <unit bldFile="connectionmonitoring/cellularindicatorplugin" qt:proFile="cellularindicatorplugin.pro" qt:qmakeArgs="-r"/>
+ <component id="cellularindicatorplugin" name="Cellular Indicator Plugin" class="plugin" introduced="^4" filter="s60">
+ <unit bldFile="connectionmonitoring/cellularindicatorplugin" qt:proFile="cellularindicatorplugin.pro"/>
</component>
- <component id="indicatorobserver" name="Indicator Observer" introduced="^4">
- <unit bldFile="connectionmonitoring/indicatorobserver" qt:proFile="indicatorobserver.pro" qt:qmakeArgs="-r"/>
+ <component id="indicatorobserver" name="Indicator Observer" introduced="^4" filter="s60">
+ <unit bldFile="connectionmonitoring/indicatorobserver" qt:proFile="indicatorobserver.pro"/>
</component>
- <component id="connectionmonitoringnview" name="Connection View" introduced="^4">
- <unit bldFile="connectionmonitoring/connectionview" qt:proFile="connectionview.pro" qt:qmakeArgs="-r"/>
+ <component id="connectionmonitoringnview" name="Connection View" introduced="^4" filter="s60">
+ <unit bldFile="connectionmonitoring/connectionview" qt:proFile="connectionview.pro"/>
</component>
</collection>
<collection id="connectionutilities" name="Connection Utilities" level="utils">
<component id="connectiondialogs" filter="s60" name="Connection Dialogs">
<unit bldFile="connectionutilities/connectiondialogs/group"/>
</component>
- <component id="confirmqueries" name="Confirm Queries" introduced="^4">
- <unit bldFile="connectionutilities/confirmqueries" qt:proFile="confirmqueries.pro" qt:qmakeArgs="-r"/>
+ <component id="confirmqueries" name="Confirm Queries" introduced="^4" filter="s60">
+ <unit bldFile="connectionutilities/confirmqueries" qt:proFile="confirmqueries.pro"/>
</component>
</collection>
<collection id="keepalive" name="Keep Alive" level="server">
@@ -188,15 +185,13 @@
<component id="dbcreatorexe" filter="s60" name="DB Creator" introduced="9.3">
<unit bldFile="dbcreator/dbcreatorexe/group"/>
</component>
- <component id="dbcreator_build" filter="s60" name="DB Creator Build" introduced="9.3">
- <!-- move exports to another component, this is needed for the #ifndef for commsdatcreatorrfsplugin until configuration is in place-->
- <unit bldFile="dbcreator/group"/>
+ <component id="dbcreator_conf" filter="s60" name="DB Creator Config" class="config" introduced="9.3">
+ <unit bldFile="dbcreator/conf"/>
</component>
</collection>
<collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
- <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
- <!-- need to move exports to another component, or make this a config component and revmove the #includes -->
- <unit bldFile="group"/>
+ <component id="ipcm_data" filter="s60" name="IP Connectivity Management Data" class="config">
+ <unit bldFile="data"/>
</component>
</collection>
</package>
--- a/symbian4/mw/legacypresence/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -54,5 +54,17 @@
<unit bldFile="pressrv_plat/simple_instant_msg_api/group"/>
</component>
</collection>
+ <collection id="xdmengine" name="XDM Engine" level="engine">
+ <!-- collection is really a component. Need to move down a directory (eg xdm/xdmengine)-->
+ <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
+ <unit bldFile="xdmengine/group"/>
+ </component>
+ </collection>
+ <collection id="simpleengine" name="SIMPLE Engine" level="engine">
+ <!-- collection is really a component. Need to move down a directory-->
+ <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
+ <!-- <unit bldFile="simpleengine/group"/> not built -->
+ </component>
+ </collection>
</package>
</SystemDefinition>
--- a/symbian4/mw/locationsrv/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -84,9 +84,8 @@
<component id="locationsuplpsy" filter="s60" name="Location SUPL PSY" class="plugin" introduced="^3">
<unit bldFile="genericpositioningplugins/locationsuplpsy/group"/>
</component>
- <component id="genericpositioningplugins_build" filter="s60" name="Generic Positioning Plugins Build">
- <!-- need to break this up into the other components -->
- <unit bldFile="genericpositioningplugins/group"/>
+ <component id="genericpositioningplugins_rom" filter="s60" name="Generic Positioning Plugins ROM" class="config">
+ <unit bldFile="genericpositioningplugins/rom"/>
</component>
</collection>
<collection id="landmarks" name="Landmarks" level="server">
@@ -144,9 +143,8 @@
<component id="ltcontextsourceplugin" filter="s60" name="LT Context Source Plugin" class="plugin" introduced="^3">
<unit bldFile="locationtriggering/ltcontextsourceplugin/group"/>
</component>
- <component id="locationtriggering_build" filter="s60" name="Location Triggering Build">
- <!-- should remove #include from this and maybe put exports in the above components -->
- <unit bldFile="locationtriggering/group"/>
+ <component id="locationtriggering_rom" filter="s60" name="Location Triggering ROM" class="config">
+ <unit bldFile="locationtriggering/rom"/>
</component>
</collection>
</package>
--- a/symbian4/mw/mds/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -55,17 +55,8 @@
</component>
</collection>
<collection id="metadataengine" name="Metadata Engine" level="eng">
- <component id="metadataengine_common" filter="s60" name="Metadata Engine Common" introduced="^2">
- <unit bldFile="metadataengine/common/group"/>
- </component>
- <component id="metadataengine_server" filter="s60" name="Metadata Engine Server" introduced="^2">
- <unit bldFile="metadataengine/server/group"/>
- </component>
- <component id="metadataengine_client" filter="s60" name="Metadata Engine Client" introduced="^2">
- <unit bldFile="metadataengine/client/group"/>
- </component>
<component id="metadataengine_build" filter="s60" name="Metadata Engine Build" introduced="^2">
- <!--make this collection a single component, or split this bld.inf into the other units -->
+ <!--collection is really a component. Move down a directory -->
<unit bldFile="metadataengine/group"/>
</component>
</collection>
@@ -95,9 +86,6 @@
<unit bldFile="locationmanager/ReverseGeoCoderPlugin/group"/>
</component>
<component id="geotagger" filter="s60" name="Geo Tagger" introduced="^4">
- <meta rel="config">
- <defined condition="_LOC_REVERSEGEOCODE"/>
- </meta>
<unit bldFile="locationmanager/geotagger/group"/>
</component>
<component id="locationtrail" filter="s60" name="Location Trail" introduced="^2">
@@ -109,17 +97,13 @@
<component id="locationmanager_client" filter="s60" name="Location Manager Client" introduced="^2">
<unit bldFile="locationmanager/client/group"/>
</component>
- <component id="locationmanager_build" filter="s60" name="Location Manager Build" introduced="^2">
- <!--make this collection a single component, or split this bld.inf into the other units -->
- <unit bldFile="locationmanager/group"/>
+ <component id="locationmanager_data" filter="s60" name="Location Manager Data" introduced="^2">
+ <unit bldFile="locationmanager/data"/>
</component>
</collection>
<collection id="contextengine" name="Context Engine" level="eng">
- <component id="contextengine_plugins" filter="s60" name="Context Engine Plugins" class="plugin" introduced="^2">
- <unit bldFile="contextengine/plugins/group"/>
- </component>
<component id="contextengine_build" filter="s60" name="Context Engine Build" introduced="^2">
- <!--make this collection a single component, or make this unit self-contained -->
+ <!-- collection is really a component. Move down a directory -->
<unit bldFile="contextengine/group"/>
</component>
</collection>
@@ -148,9 +132,9 @@
<component id="harvester_client" filter="s60" name="Harvester Client" introduced="^2">
<unit bldFile="harvester/client/group"/>
</component>
- <component id="harvester_build" filter="s60" name="Harvester Build" introduced="^2">
- <!-- split these exports into the other components -->
- <unit bldFile="harvester/group"/>
+ <component id="harvester_data" filter="s60" name="Harvester Data" class="config" introduced="^2">
+ <!-- consider moving these exports into the other components -->
+ <unit bldFile="harvester/data"/>
</component>
</collection>
<collection id="watchdog" name="Watchdog" level="server">
@@ -169,9 +153,9 @@
</component>
</collection>
<collection id="mds_info" name="Metadata Services Info" level="int">
- <component id="mds_build" filter="s60" name="Metadata Services Build" introduced="^2">
- <!-- consider distributiing this into the rest of the components in the package -->
- <unit bldFile="group"/>
+ <component id="mds_rom" filter="s60" name="Metadata Services ROM" class="config" introduced="^2">
+ <!-- consider moving these exports into the other collections -->
+ <unit bldFile="rom"/>
</component>
</collection>
</package>
--- a/symbian4/mw/platformthemes/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/platformthemes/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,7 +2,7 @@
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
<package id="platformthemes" name="Platform Themes" levels="framework generic ui">
<collection id="platformthemes_info" name="Platform Themes Info">
- <component id="platformthemes_build" name="Platform Themes Build">
+ <component id="platformthemes_build" name="Platform Themes Build" filter="s60">
<!-- no real structure in this package. Should break into collections / components -->
<unit bldFile="." qt:proFile="platformthemes.pro"/>
</component>
--- a/symbian4/mw/qt/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -4,43 +4,43 @@
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">
+ <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="s60,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"/>
+ <component id="qt_build" name="Qt Build" introduced="^2" filter="s60">
+ <unit bldFile="." qt:proFile="projects.pro"/>
</component>
</collection>
<collection id="qtdemos" name="Qt Demos" level="app">
- <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="test,qtdemos,build_as_app">
+ <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="s60,test,qtdemos,build_as_app">
<meta rel="testbuild">
<group name="qtdemos"/>
</meta>
- <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="demos" qt:proFile="demos.pro"/>
</component>
</collection>
<collection id="qtexamples" name="Qt Examples" level="app">
<meta rel="qtexamples">
<group name="qtdemos"/>
</meta>
- <component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="test,qtexamples,build_as_app">
- <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+ <component id="qtexamples_build" name="Qt Examples Build" introduced="^2" filter="s60,test,qtexamples,build_as_app">
+ <unit bldFile="examples" qt:proFile="examples.pro"/>
</component>
</collection>
<collection id="qt_tests" name="Qt Tests" level="app">
- <component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="qttestsauto,test,build_as_app">
+ <component id="qttestsauto" name="Qt Automated Tests" introduced="^2" filter="s60,qttestsauto,test,build_as_app">
<meta rel="qttestsauto">
<group name="qtdemos"/>
</meta>
- <unit bldFile="tests/auto" qt:proFile="qtpauto.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="tests/auto" qt:proFile="qtpauto.pro"/>
</component>
- <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test,build_as_app">
+ <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="s60,qttestsbenchmarks,test,build_as_app">
<meta rel="testbuild">
<group name="qttestsbenchmarks"/>
</meta>
- <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro"/>
</component>
</collection>
</package>
--- a/symbian4/mw/qtextensions/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -4,74 +4,53 @@
This will be removed when sbsv2 builds are working -->
<package id="qtextensions" name="Qt Extensions" levels="tool mw app">
<collection id="qtecomplugins" name="Qt ECom Plugins" level="app">
- <component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
- <unit bldFile="qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
+ <component id="qtecomplugins_build" filter="s60,qtecomplugins" name="Qt ECom Plugin" purpose="development" introduced="^4" class="plugin">
+ <unit bldFile="qtecomplugins" qt:proFile="qtecomplugins.pro"/>
</component>
- <component id="qtextensions_examples" filter="qtextensionsexamples,build_as_app" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+ <component id="qtextensions_examples" filter="s60,qtextensionsexamples,build_as_app" name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
<meta rel="testbuild">
<group name="qtextensionsexamples"/>
</meta>
- <unit bldFile="qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="qtecomplugins/examples" qt:proFile="examples.pro"/>
</component>
</collection>
<collection id="qthighway" name="Qt Highway" level="app">
- <component id="qthighway_build" filter="qthighway" name="Qt Highway" purpose="development" introduced="^4">
- <unit bldFile="qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
+ <component id="qthighway_build" filter="s60,qthighway" name="Qt Highway" purpose="development" introduced="^4">
+ <unit bldFile="qthighway" qt:proFile="qthighway.pro"/>
</component>
- <component id="qthighway_examples" filter="qtextensionsexamples,build_as_app" name="Qt Highway Examples" purpose="development" introduced="^4">
+ <component id="qthighway_examples" filter="s60,test,qtextensionsexamples,build_as_app" name="Qt Highway Examples" purpose="development" introduced="^4">
<meta rel="testbuild">
<group name="qtextensionsexamples"/>
</meta>
- <unit bldFile="qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="qthighway/examples" qt:proFile="examples.pro"/>
</component>
- <component id="qthighwaytests" filter="test,qtextensionstests,build_as_app" name="Qt Highway Tests" purpose="development" introduced="^4">
+ <component id="qthighwaytests" filter="s60,test,qtextensionstests,build_as_app" name="Qt Highway Tests" purpose="development" introduced="^4">
<meta rel="testbuild">
<group name="qtextensionstests"/>
</meta>
- <unit bldFile="qthighway/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="qthighway/tsrc" qt:proFile="tests.pro"/>
</component>
</collection>
<collection id="qtmobileextensions" name="Qt Mobile Extensions" level="app">
- <component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
- <unit bldFile="qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
+ <component id="qtmobileextensions_build" filter="s60,qtextension" name="Qt Mobile Extensions" purpose="development" introduced="^4">
+ <unit bldFile="qtmobileextensions" qt:proFile="qtmobileextensions.pro"/>
</component>
- <component id="qtmobileextensions_examples" filter="qtextensionsexamples,build_as_app" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
- <meta rel="testbuild">
- <group name="qtextensionsexamples"/>
- </meta>
- <unit bldFile="qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
- </component>
- </collection>
- <collection id="qtmobility" name="Qt Mobility" level="mw">
- <component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
- <unit bldFile="qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
- </component>
- <component id="qtmobility_examples" filter="qtextensionsexamples,build_as_app" name="Qt Mobility Examples" purpose="development" introduced="^4">
+ <component id="qtmobileextensions_examples" filter="s60,qtextensionsexamples,build_as_app" name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
<meta rel="testbuild">
<group name="qtextensionsexamples"/>
</meta>
- <unit bldFile="qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
- </component>
- <component id="qtmobilitytests" filter="test,qtextensionstests,build_as_app" name="Qt Extensions Tests" purpose="development" introduced="^4">
- <meta rel="testbuild">
- <group name="qtextensionstests"/>
- </meta>
- <unit bldFile="qtmobility/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="qtmobileextensions/examples" qt:proFile="examples.pro"/>
</component>
</collection>
<collection id="qhbstyle" level="mw" name="Qt Orbit Style">
- <component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4">
- <unit bldFile="qhbstyle" qt:qmakeArgs="-r" qt:proFile="qhbstyle.pro"/>
+ <component id="qhbstyle_build" name="Qt Orbit Style Build" introduced="^4" filter="s60">
+ <unit bldFile="qhbstyle" qt:proFile="qhbstyle.pro"/>
</component>
</collection>
<collection id="qtextensions_info" name="Qt Extensions Info" level="app">
- <component id="qtextensions_conf" name="Qt Extensions Confgure" class="config" introduced="^4" filter="qt_tools">
+ <component id="qtextensions_conf" name="Qt Extensions Confgure" class="config" introduced="^4" filter="s60,qt_tools">
<unit bldFile="group"/>
</component>
- <component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
- <!-- break this up into the above collections-->
- <unit bldFile="." qt:proFile="qtextensions.pro" qt:qmakeArgs="-r"/>
- </component>
</collection>
</package>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/mw/qtmobility/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="qtmobility" name="Qt Mobility" levels="tool mw app">
+ <collection id="qtmobility_info" name="Qt Mobility Info" level="mw">
+ <component id="qtmobilityconf" name="Qt Mobility Config" filter="s60,tools" introduced="^4">
+ <unit bldFile="group"/>
+ </component>
+ <component id="qtmobility_build" name="Qt Mobility Build" introduced="^4" filter="s60">
+ <unit bldFile="." qt:proFile="qtmobility.pro"/>
+ </component>
+ </collection>
+ <collection id="qtmobility_examples" name="Qt Mobility Examples" level="app">
+ <component id="qtmobility_examples_build" name="Qt Mobility Examples Build" filter="s60,test,qtmobilityexamples,build_as_app" introduced="^4">
+ <unit bldFile="examples" qt:proFile="examples.pro"/>
+ </component>
+ </collection>
+ <collection id="tests" name="Qt Mobility Tests">
+ <component id="qtmobility_tests_build" name="Qt Mobility Tests Build" filter="test,qtmobilitytests,build_as_app,s60" introduced="^4">
+ <unit bldFile="tests" qt:proFile="tests.pro"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian4/mw/remoteconn/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
- <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
- <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
- </component>
- </collection>
<collection id="remoteconn_plat" name="Remote Connectivity Platform Interfaces" level="specific">
<component id="dialup_connection_status_api" name="Dialup Connection Status API" class="api" filter="s60">
<meta rel="Api" href="remoteconn_plat/dialup_connection_status_api/dialup_connection_status_api.metaxml"/>
@@ -43,10 +38,10 @@
</component>
</collection>
<collection id="mtptransports" name="MTP Transports" level="plugin">
- <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin" filter="s60">
+ <component id="mtpusbtransport" name="MTP USB Transport" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="mtptransports/mtpusbtransport/group" mrp="mtptransports/mtpusbtransport/group/mtp_usbsic.mrp"/>
</component>
- <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin" filter="s60">
+ <component id="mtpptpiptransport" name="MTP PTP-IP Transport" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="mtptransports/mtpptpiptransport/group" mrp="mtptransports/mtpptpiptransport/group/mtp_ptpip.mrp"/>
</component>
<component id="mtpcontroller" name="MTP Controller" introduced="^3" purpose="optional" class="plugin">
@@ -57,34 +52,34 @@
</component>
</collection>
<collection id="mtpfws" name="MTP Frameworks" level="framework">
- <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional" filter="s60">
+ <component id="mtpfw" name="MTP Framework" introduced="^2" purpose="optional">
<unit bldFile="mtpfws/mtpfw/group" mrp="mtpfws/mtpfw/group/mtp_framework.mrp"/>
</component>
- <component id="devdpextn" name="MTP Device Provider Extension" introduced="^4" purpose="optional" filter="s60">
+ <component id="devdpextn" name="MTP Device Provider Extension" introduced="^4" purpose="optional">
<!-- can't have a component inside another component. Need to move to mtpfws/devdpextn/group -->
<unit bldFile="mtpfws/mtpfw/dataproviders/devdp/devdpextn/group"/>
</component>
</collection>
<collection id="mtpdataproviders" name="MTP Data Providers" level="generic">
- <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin" filter="s60">
+ <component id="mtpfileandfolderdp" name="MTP File and Folder Provider" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="mtpdataproviders/mtpfileandfolderdp/group" mrp="mtpdataproviders/mtpfileandfolderdp/group/mtp_filedp.mrp"/>
</component>
- <component id="mtpimagedp" name="MTP Image Data Provider" introduced="^3" purpose="optional" class="plugin" filter="s60">
+ <component id="mtpimagedp" name="MTP Image Data Provider" filter="gt" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="mtpdataproviders/mtpimagedp/group" mrp="mtpdataproviders/mtpimagedp/group/mtp_imagedp.mrp"/>
</component>
- <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" introduced="^3" purpose="optional" class="plugin" filter="s60">
+ <component id="mtppictbridgedp" name="MTP PictBridge Data Provider" introduced="^3" purpose="optional" class="plugin" filter="gt">
<unit bldFile="mtpdataproviders/mtppictbridgedp/group" mrp="mtpdataproviders/mtppictbridgedp/group/mtp_pictbridgedp.mrp"/>
</component>
<component id="pictbridgeengine" name="MTP PictBridge Engine" introduced="^4" purpose="optional" filter="s60">
<!-- can't have a component inside another component. Need to move to mtpdataproviders/pictbridgeengine/group -->
<unit bldFile="mtpdataproviders/mtppictbridgedp/pictbridgeengine/group"/>
</component>
- <component id="mtpplaybackcontroldp" name="MTP Playback Control Data Provider" introduced="^4" purpose="optional" class="plugin" filter="s60">
+ <component id="mtpplaybackcontroldp" name="MTP Playback Control Data Provider" introduced="^4" filter="s60" purpose="optional" class="plugin">
<unit bldFile="mtpdataproviders/mtpplaybackcontroldp/group" mrp="mtpdataproviders/mtpplaybackcontroldp/group/mtp_playbackcontroldp.mrp"/>
</component>
</collection>
<collection id="backupandrestore" name="Backup and Restore" level="specific">
- <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional" filter="s60">
+ <component id="backupengine" name="Backup Engine" introduced="9.0" purpose="optional">
<unit bldFile="backupandrestore/backupengine/group" mrp="backupandrestore/backupengine/group/connectivity_backupengine.mrp"/>
</component>
<component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
--- a/symbian4/mw/remotemgmt/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -32,10 +32,6 @@
<meta rel="Api" href="remotemgmt_plat/sync_alert_handler_api/sync_alert_handler_api.metaxml"/>
<unit bldFile="remotemgmt_plat/sync_alert_handler_api/group"/>
</component>
- <component id="syncml_notifier_api" name="SyncML Notifier API" class="api" filter="s60">
- <meta rel="Api" href="remotemgmt_plat/syncml_notifier_api/syncml_notifier_api.metaxml"/>
- <unit bldFile="remotemgmt_plat/syncml_notifier_api/group"/>
- </component>
<component id="syncml_client_api" name="SyncML Client API" class="api" filter="s60">
<meta rel="Api" href="remotemgmt_plat/syncml_client_api/syncml_client_api.metaxml"/>
<unit bldFile="remotemgmt_plat/syncml_client_api/group"/>
@@ -116,10 +112,6 @@
<meta rel="Api" href="remotemgmt_plat/update_package_storage_plugin_api/update_package_storage_plugin_api.metaxml"/>
<unit bldFile="remotemgmt_plat/update_package_storage_plugin_api/group"/>
</component>
- <component id="syncml_notifier_roaming_api" name="SyncML Notifier Roaming API" class="api" filter="s60">
- <meta rel="Api" href="remotemgmt_plat/syncml_notifier_roaming_api/syncml_notifier_roaming_api.metaxml"/>
- <unit bldFile="remotemgmt_plat/syncml_notifier_roaming_api/group"/>
- </component>
<component id="dcmo_adapter_api" name="DCMO Adapter API" class="api" filter="s60">
<unit bldFile="remotemgmt_plat/dcmo_adapter_api/group"/>
</component>
@@ -215,7 +207,7 @@
</collection>
<collection id="devicemgmtnotifications" name="Device Management Notifications" level="server">
<component id="devicemgmtnotifications_rom" filter="s60" name="DM Notifications ROM" introduced="^4">
- <unit bldFile="devicemgmtnotifications/rom"/>
+ <unit bldFile="devicemgmtnotifications/group"/>
</component>
<component id="dmdevdialogclient" filter="s60" name="DM Device Dialog Client" introduced="^4">
<unit bldFile="devicemgmtnotifications/dmdevdialogclient/bld"/>
--- a/symbian4/mw/searchsrv/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -54,7 +54,7 @@
</collection>
<collection id="qcpix" name="Qt CPIX" level="engine">
<component id="qcpix_build" name="Qt CPIX Build" introduced="^4">
- <unit bldFile="qcpix" qt:proFile="qcpix.pro"/>
+ <unit bldFile="qcpix" qt:proFile="cpix.pro"/>
</component>
</collection>
<collection id="searchsrv_info" name="Search Services Info">
--- a/symbian4/mw/srvdiscovery/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,27 +2,27 @@
<SystemDefinition schema="3.0.0">
<package id="srvdiscovery" name="Service Discovery and Usage" levels="plugin framework server generic specific">
<collection id="upnpstack_plat" name="UPnP Stack Platform Interfaces" level="specific">
- <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_device_api" name="UPnP Device API" purpose="optional" introduced="^3" class="api" filter="s60">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_device_api/upnp_device_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_device_api/group"/>
</component>
- <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_common_api" name="UPnP Common API" purpose="optional" introduced="^3" class="api" filter="s60">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_common_api/upnp_common_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_common_api/group"/>
</component>
- <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_utils_api" name="UPnP Utils API" purpose="optional" introduced="^3" class="api" filter="s60">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_utils_api/upnp_utils_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_utils_api/group"/>
</component>
- <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_control_point_api" name="UPnP Control Point API" purpose="optional" introduced="^3" class="api" filter="s60">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_control_point_api/upnp_control_point_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_control_point_api/group"/>
</component>
- <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_httpserver_api" name="UPnP HTTP Server API" purpose="optional" introduced="^3" class="api" filter="s60">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_httpserver_api/upnp_httpserver_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_httpserver_api/group"/>
</component>
- <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api">
+ <component id="upnp_http_transfer_api" name="UPnP HTTP Transfer API" purpose="optional" introduced="^3" class="api" filter="s60">
<meta rel="Api" href="upnp/upnpstack_plat/upnp_http_transfer_api/upnp_http_transfer_api.metaxml"/>
<unit bldFile="upnp/upnpstack_plat/upnp_http_transfer_api/group"/>
</component>
@@ -37,6 +37,14 @@
<unit bldFile="upnp/upnpstack/group"/>
</component>
</collection>
+ <collection id="srvdiscovery_services" name="Service Discovery Services" level="server">
+ <component id="terminalmodeservice_plat" name="Terminal Mode Service Platform Interfaces" introduced="^4" class="api" filter="s60">
+ <unit bldFile="services/terminalmodeservice_plat/group"/>
+ </component>
+ <component id="terminalmodeservice" name="Terminal Mode Service" introduced="^4" filter="s60">
+ <unit bldFile="services/terminalmodeservice/group"/>
+ </component>
+ </collection>
<collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
<component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop" filter="s60">
<unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
--- a/symbian4/mw/svgt/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/svgt/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -16,9 +16,6 @@
<!-- component is at collection level. Needs to be moved down a directory -->
<unit bldFile="svgtopt/group"/>
</component>
- <component id="svgtplugin" filter="s60" name="SVG Plugin" class="plugin" introduced="9.2">
- <unit bldFile="svgtopt/svgtplugin/group"/>
- </component>
</collection>
</package>
</SystemDefinition>
--- a/symbian4/mw/uiresources/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/uiresources/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -162,14 +162,12 @@
</collection>
<collection id="fontsupport" name="Font Support" level="generic">
<component id="fontprovider" filter="s60" name="Font Provider">
+ <meta rel="config">
+ <not-defined condition="FF_PRODUCT_FONTS"/>
+ </meta>
<unit bldFile="fontsupport/fontprovider/group"/>
</component>
- <!-- R&D materials, should be Nokia only: exports S60 fonts, removes freetype
- <component id="s60_fonts" filter="s60" name="S60 Fonts">
- <unit bldFile="fontsupport/fontutils/group"/>
- </component>
--->
- <component id="fontutils" filter="sf_build" name="Font Utils">
+ <component id="fontutils" name="Font Utils" filter="s60">
<unit bldFile="fontsupport/fontutils/FontUtils/group"/>
</component>
</collection>
--- a/symbian4/mw/usbservices/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -45,7 +45,8 @@
</collection>
<collection id="usbengines" name="USB Engines" level="generic">
<component id="usbotgwatcher" filter="s60" name="USB OTG Watcher">
- <unit bldFile="usbengines/usbotgwatcher/group"/>
+ <unit bldFile="usbengines/usbotgwatcher/group" filter="!test"/>
+ <unit bldFile="usbengines/usbotgwatcher/tsrc/UsbOtgWatcherTest/group" filter="test,api_test"/>
</component>
<component id="usbwatcher" filter="s60" name="USB Watcher">
<unit bldFile="usbengines/usbwatcher/group"/>
@@ -76,7 +77,7 @@
</collection>
<collection id="usbuis" name="USB UIs" level="specific">
<component id="usbuinotif" filter="s60" name="USB UI Notifiers">
- <unit bldFile="usbuis/usbuinotif" qt:proFile="usbuinotif.pro" qt:qmakeArgs="-r" filter="!test"/>
+ <unit bldFile="usbuis/usbuinotif" qt:proFile="usbuinotif.pro" filter="!test"/>
<unit bldFile="usbuis/usbuinotif/tsrc/USBUiNotifApiTest/group" filter="test,api_test" />
</component>
<component id="imageprintuiprovider" filter="s60" name="ImagePrint UI Provider" class="plugin">
@@ -86,10 +87,15 @@
<unit bldFile="usbuis/imageprintui/group"/>
</component>
<component id="usbsettingsapp" name="USB Settings Application" introduced="^4" filter="s60">
- <unit bldFile="usbuis/usbsettingsapp" qt:proFile="usbsettingsapp.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="usbuis/usbsettingsapp" qt:proFile="usbsettingsapp.pro"/>
</component>
<component id="usbindicatorplugin" name="USB Indicator Plugin" introduced="^4" filter="s60" class="plugin">
- <unit bldFile="usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro"/>
+ </component>
+ </collection>
+ <collection id="usb_testtools" name="USB Test Tools" level="server">
+ <component id="usb_stubsrv" name="USB Stub Server" introduced="^4" filter="s60">
+ <unit bldFile="tsrc/testtools/stubsrv/group"/>
</component>
</collection>
</package>
--- a/symbian4/mw/videoutils/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -2,23 +2,10 @@
<SystemDefinition schema="3.0.0">
<package id="videoutils" name="Video Utils" levels="eng util if">
<collection id="videoutils_plat" name="Video Utils Platform Interfaces" level="if">
- <component id="videoscheduler_api" name="Video Scheduler API" class="api" filter="s60">
- <meta rel="Api" href="videoutils_plat/videoscheduler_api/videoscheduler_api.metaxml"/>
- <unit bldFile="videoutils_plat/videoscheduler_api/group"/>
- </component>
<component id="videoplayer_constants_api" name="Videoplayer Constants API" class="api" filter="s60">
<meta rel="Api" href="videoutils_plat/videoplayer_constants_api/videoplayer_constants_api.metaxml"/>
<unit bldFile="videoutils_plat/videoplayer_constants_api/group"/>
</component>
</collection>
- <collection id="videoscheduler" name="Video Scheduler" level="util">
- <!-- don't build these -->
- <component id="schedulerclient" filter="s60" name="Video Scheduler Client">
- <unit bldFile="videoscheduler/schedulerclient/group" filter="test"/>
- </component>
- <component id="schedulerserver" filter="s60" name="Video Scheduler Server">
- <unit bldFile="videoscheduler/schedulerserver/group" filter="test"/>
- </component>
- </collection>
</package>
</SystemDefinition>
--- a/symbian4/mw/wirelessacc/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -27,31 +27,31 @@
</collection>
<collection id="wlanutilities" name="WLAN Utilities" level="generic">
<component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
- <unit bldFile="wlanutilities/wlanqtutilities" qt:proFile="wlanqtutilities.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wlanqtutilities" qt:proFile="wlanqtutilities.pro"/>
</component>
<component id="eapwizard " filter="s60" name="EAP Wizard" introduced="^4">
- <unit bldFile="wlanutilities/eapwizard" qt:proFile="eapwizard.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/eapwizard" qt:proFile="eapwizard.pro"/>
</component>
<component id="wpswizard " filter="s60" name="WPS Wizard" introduced="^4">
- <unit bldFile="wlanutilities/wpswizard" qt:proFile="wpswizard.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wpswizard" qt:proFile="wpswizard.pro"/>
</component>
<component id="wlanwizard " filter="s60" name="WLAN Wizard" introduced="^4">
- <unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>
</component>
<component id="wlansniffer" filter="s60" name="WLAN Sniffer">
- <unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlansniffer.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlansniffer.pro"/>
</component>
<component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
- <unit bldFile="wlanutilities/wlanentryplugin" qt:proFile="wlanentryplugin.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wlanentryplugin" qt:proFile="wlanentryplugin.pro"/>
</component>
<component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
- <unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>
</component>
<component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin" introduced="^4">
- <unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>
</component>
<component id="wlanlogin" filter="s60" name="WLAN Login" introduced="^4">
- <unit bldFile="wlanutilities/wlanlogin" qt:proFile="wlanlogin.pro" qt:qmakeArgs="-r"/>
+ <unit bldFile="wlanutilities/wlanlogin" qt:proFile="wlanlogin.pro"/>
</component>
</collection>
</package>
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -107,6 +107,7 @@
<package id="stubs" tech-domain="hb" level="high" span="2" href="../../../../adaptation/stubs/package_definition.xml"/>
<package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition.xml"/>
<package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition.xml"/>
+ <package id="codecs.aricent" tech-domain="mm" level="low" href="../../../../adaptation/codecs.aricent/package_definition.xml" />
</layer>
<layer id="os" name="OS" levels="hw services">
<package id="kernelhwsrv" level="hw" tech-domain="hb" href="../../../../os/kernelhwsrv/package_definition.xml"/>
@@ -124,12 +125,15 @@
<package id="bt" level="services" tech-domain="de" href="../../../../os/bt/package_definition.xml"/>
<package id="usb" level="services" tech-domain="de" href="../../../../os/usb/package_definition.xml"/>
<package id="mm" level="services" tech-domain="mm" href="../../../../os/mm/package_definition.xml"/>
+ <package id="mmimaging" level="services" tech-domain="mm" href="../../../../os/mmimaging/package_definition.xml"/>
+ <package id="openmaxil" level="services" tech-domain="mm" href="../../../../os/openmaxil/package_definition.xml"/>
<package id="imagingext" level="services" tech-domain="mm" href="../../../../os/imagingext/package_definition.xml"/>
<package id="graphics" level="services" tech-domain="ui" href="../../../../os/graphics/package_definition.xml"/>
<package id="textandloc" level="services" tech-domain="ui" href="../../../../os/textandloc/package_definition.xml"/>
<package id="xmlsrv" level="services" tech-domain="rt" href="../../../../os/xmlsrv/package_definition.xml"/>
<package id="deviceplatformrelease" level="services" tech-domain="to" href="../../../../os/deviceplatformrelease/package_definition.xml"/>
<package id="osrndtools" level="services" tech-domain="to" href="../../../../os/osrndtools/package_definition.xml"/>
+ <package id="ostesttools" level="services" tech-domain="to" href="../../../../os/ostesttools/package_definition.xml"/>
</layer>
<layer id="mw" name="Middleware" levels="generic specific">
<package id="appsupport" level="generic" tech-domain="rt" href="../../../../mw/appsupport/package_definition.xml"/>
@@ -166,6 +170,7 @@
<package id="hgwidgets" level="specific" tech-domain="mm" href="../../../../mw/hgwidgets/package_definition.xml"/>
<package id="inputmethods" level="generic" tech-domain="ui" href="../../../../mw/inputmethods/package_definition.xml"/>
<package id="qt" level="generic" tech-domain="ui" href="../../../../mw/qt/package_definition.xml"/>
+ <package id="qtmobility" level="generic" tech-domain="ui" href="../../../../mw/qtmobility/package_definition.xml"/>
<package id="qtextensions" level="generic" tech-domain="ui" href="../../../../mw/qtextensions/package_definition.xml"/>
<package id="hb" level="generic" tech-domain="ui" href="../../../../mw/hb/package_definition.xml"/>
<package id="classicui" level="generic" tech-domain="ui" href="../../../../mw/classicui/package_definition.xml"/>
--- a/symbian4/os/devicesrv/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -275,7 +275,7 @@
<component id="tspclientmapper" filter="s60" name="TSP Client Mapper">
<unit bldFile="accessoryservices/tspclientmapper/group"/>
</component>
- <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional" filter="s60">
+ <component id="remotecontrolfw" name="Remote Control Framework" introduced="9.1" purpose="optional">
<unit bldFile="accessoryservices/remotecontrolfw/group" mrp="accessoryservices/remotecontrolfw/group/bluetooth_remotecontrol.mrp"/>
</component>
<component id="gid_pc_tool" filter="s60" name="Generic ID PC Tool" target="desktop" class="tool">
@@ -298,13 +298,13 @@
<component id="platformenv" filter="s60" name="Platform Environment">
<unit bldFile="commonservices/platformenv/group"/>
</component>
- <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5" filter="s60">
+ <component id="sysutil" name="System Utilities" purpose="mandatory" introduced="ER5">
<meta rel="config">
<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
</meta>
<unit bldFile="commonservices/sysutil/group" mrp="commonservices/sysutil/group/sysutil.mrp"/>
</component>
- <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5" filter="s60">
+ <component id="activitymanager" name="Activity Manager" purpose="mandatory" introduced="ER5">
<meta rel="config">
<defined condition="SYMBIAN_BAFL_SYSUTIL"/>
</meta>
@@ -381,17 +381,16 @@
<component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
<unit bldFile="resourcemgmt/vibractrl/group"/>
</component>
- <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional" filter="s60">
+ <component id="hwresourcesmgr" name="Hardware Resources Manager" introduced="^2" purpose="optional">
<unit bldFile="resourcemgmt/hwresourcesmgr/group" mrp="resourcemgmt/hwresourcesmgr/group/telephony_hwrm.mrp"/>
</component>
- <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config" filter="s60">
+ <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
<unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
</component>
<component id="resourcemgmt_data" filter="s60" name="Resource Management Data" class="config">
- <!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
- <unit bldFile="resourcemgmt/group"/>
+ <unit bldFile="resourcemgmt/data"/>
</component>
- <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory" filter="s60">
+ <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
<unit bldFile="resourcemgmt/powerandmemorynotificationservice/group" mrp="resourcemgmt/powerandmemorynotificationservice/group/syslibs_pwrcli.mrp"/>
</component>
</collection>
@@ -420,16 +419,16 @@
<component id="sysuiprovider" filter="s60" name="System UI Provider" introduced="^3">
<unit bldFile="sysstatemgmt/sysuiprovider/group"/>
</component>
- <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory" filter="s60">
+ <component id="systemstarter" name="System Starter" introduced="9.1" deprecated="^3" purpose="mandatory">
<unit bldFile="sysstatemgmt/systemstarter/group" mrp="sysstatemgmt/systemstarter/group/app-framework_sysstart.mrp"/>
</component>
- <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory" filter="s60">
+ <component id="systemstatemgr" name="System State Manager" introduced="^3" purpose="mandatory">
<meta rel="config">
<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
</meta>
<unit bldFile="sysstatemgmt/systemstatemgr/group" mrp="sysstatemgmt/systemstatemgr/group/app-framework_ssma.mrp"/>
</component>
- <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin" filter="s60">
+ <component id="systemstateplugins" name="System State Plugins" introduced="^3" purpose="optional" class="plugin">
<meta rel="config">
<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
</meta>
@@ -438,7 +437,7 @@
<meta rel="config">
<defined condition="SYMBIAN_SYSTEM_STATE_MANAGEMENT"/>
</meta>
- <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin" filter="s60">
+ <component id="systemstatereferenceplugins" name="System State Reference Plugins" introduced="^3" purpose="optional" class="plugin">
<unit bldFile="sysstatemgmt/systemstatereferenceplugins/group" mrp="sysstatemgmt/systemstatereferenceplugins/group/app-framework_ssrefplugins.mrp"/>
</component>
</collection>
@@ -448,7 +447,7 @@
</component>
</collection>
<collection id="systemhealthmanagement" name="System Health Management" level="server">
- <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional" filter="s60">
+ <component id="systemhealthmgr" name="System Health Manager" introduced="^3" purpose="optional">
<unit bldFile="systemhealthmanagement/systemhealthmgr/group" mrp="systemhealthmanagement/systemhealthmgr/group/app-framework_shma.mrp"/>
</component>
</collection>
--- a/symbian4/os/graphics/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -49,6 +49,9 @@
<component id="surfaceupdate" name="Surface Update" introduced="^3" purpose="optional">
<unit bldFile="graphicscomposition/surfaceupdate/group" mrp="graphicscomposition/surfaceupdate/group/graphics_surfaceupdate.mrp"/>
</component>
+ <component id="openwfc_ri_displaychannel" name="OpenWFC RI Display Channel" introduced="^4" purpose="optional">
+ <unit bldFile="graphicscomposition/openwfc_ri_displaychannel/group" mrp="graphicscomposition/openwfc_ri_displaychannel/group/openwfc_ri_displaychannel.mrp"/>
+ </component>
</collection>
<collection id="graphicstest" name="Graphics Test" level="app-if">
<component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test,api_test">
--- a/symbian4/os/kernelhwsrv/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -26,6 +26,12 @@
<component id="f32test" name="File Server Tests" purpose="development">
<unit bldFile="kerneltest/f32test/group" mrp="kerneltest/f32test/group/base_f32test.mrp"/>
</component>
+ <component id="rofstests" name="Read Only File System Tests" purpose="development">
+ <unit bldFile="kerneltest/f32test/rofs" mrp="kerneltest/f32test/rofs/rofs_tests.mrp"/>
+ </component>
+ <component id="loadertest" name="Loader Tests" purpose="development">
+ <unit bldFile="kerneltest/f32test/loader" mrp="kerneltest/f32test/loader/base_loader.mrp"/>
+ </component>
</collection>
<collection id="ldds" name="Logical Device Drivers" level="adaptation">
<component id="ethernetldd" name="Ethernet Drivers" purpose="optional">
@@ -44,15 +50,12 @@
<!-- these are LDDs for storage media-->
<unit bldFile="kernel/eka/drivers/locmedia" mrp="kernel/eka/drivers/locmedia/base_e32_drivers_locmedia.mrp"/>
</component>
- <component id="runmodedebugger" name="Run Mode Debugger" purpose="mandatory">
+ <component id="stopmodedebugdriver" name="Stop Mode Debug Driver" purpose="mandatory">
<unit bldFile="kernel/eka/drivers/debug/group" mrp="kernel/eka/drivers/debug/group/base_e32_drivers_debug.mrp"/>
</component>
<component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
<unit bldFile="kernel/eka/drivers/trace" mrp="kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
</component>
- <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
- <unit bldFile="kernel/eka/drivers/camerasc" mrp="kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
- </component>
<component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
<!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
<unit bldFile="kernel/eka/drivers/display" mrp="kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
@@ -89,6 +92,9 @@
<component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
<unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
</component>
+ <component id="automounter" name="Automounter" filter="gt" purpose="mandatory">
+ <unit bldFile="userlibandfileserver/fileserver/automounter" mrp="userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp"/>
+ </component>
<component id="estart" name="Base Starter" filter="gt" purpose="optional">
<unit bldFile="userlibandfileserver/fileserver/estart" mrp="userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
</component>
--- a/symbian4/os/mm/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -357,7 +357,7 @@
<unit bldFile="devsoundextensions/effectspresets/group"/>
</component>
<component id="effectspresets_utils" filter="s60" name="Effects Presets Utils">
- <!-- need to #include the lot from a single bld.inf
+ <!-- need to #include the lot from a single bld.inf
Also move to a standard component location, not under effectspresets -->
<unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
<unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
@@ -399,15 +399,6 @@
</component>
</collection>
<collection id="imagingandcamerafws" name="Imaging and Camera Frameworks" level="app-if">
- <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
- <unit bldFile="imagingandcamerafws/imagingfws/group" mrp="imagingandcamerafws/imagingfws/group/multimedia_icl.mrp"/>
- </component>
- <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
- <unit mrp="imagingandcamerafws/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imagingandcamerafws/imagingunittest/group"/>
- </component>
- <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
- <unit mrp="imagingandcamerafws/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imagingandcamerafws/imaginginttest/group"/>
- </component>
<component id="camerafw" name="Camera Framework" introduced="7.0s" purpose="optional">
<unit bldFile="imagingandcamerafws/camerafw/group" mrp="imagingandcamerafws/camerafw/group/multimedia_ecam_framework.mrp"/>
</component>
@@ -424,9 +415,6 @@
</component>
</collection>
<collection id="mmplugins" name="Multimedia Plugins" level="middleware">
- <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
- <unit bldFile="mmplugins/imagingplugins/group" mrp="mmplugins/imagingplugins/group/multimedia_icl_plugin.mrp"/>
- </component>
<component id="cameraplugins" name="Camera Plugins" introduced="7.0s" purpose="optional" class="plugin">
<unit bldFile="mmplugins/cameraplugins/group" mrp="mmplugins/cameraplugins/group/multimedia_ecam_plugins.mrp"/>
</component>
@@ -483,29 +471,6 @@
<unit mrp="mmtestenv/mmtesttools/Group/multimedia_testtools_source.mrp" bldFile="mmtestenv/mmtesttools/Group"/>
</component>
</collection>
- <collection id="omxil" name="OpenMAX IL" level="hw-if">
- <component id="omxilapi" name="OpenMAX IL API" introduced="^3" purpose="optional">
- <unit version="1" bldFile="omxil/omxilapi/group" mrp="omxil/omxilapi/group/multimedia_omx_il_api.mrp"/>
- </component>
- <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="optional">
- <unit version="1" bldFile="omxil/omxilcore/group" mrp="omxil/omxilcore/group/multimedia_omx_il_core.mrp"/>
- </component>
- <component id="omxilcomponentcommon" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
- <unit version="1" bldFile="omxil/omxilcomponentcommon/group" mrp="omxil/omxilcomponentcommon/group/multimedia_omx_il_comp.mrp"/>
- </component>
- <component id="omxilrefcomps" name="OpenMAX IL Reference Components" introduced="^3" purpose="optional">
- <unit version="1" bldFile="omxil/omxilrefcomps/ref_components/group" mrp="omxil/omxilrefcomps/ref_components/group/multimedia_omx_il_comp_ref.mrp"/>
- </component>
- <component id="omxilunittest" name="OpenMAX IL Unit Tests" introduced="^3" purpose="development" filter="test">
- <unit mrp="omxil/omxilunittest/group/multimedia_unittest_omx_il.mrp" bldFile="omxil/omxilunittest/group"/>
- </component>
- <component id="omxilcoreconftest" name="OpenMAX IL Core Conformance Suite" introduced="^3" purpose="development" filter="test">
- <unit mrp="omxil/omxilcoreconftest/group/multimedia_omx_il_core_loader_conf_suite.mrp" bldFile="omxil/omxilcoreconftest/group"/>
- </component>
- <component id="mmilapi" name="Multimedia Integration Layer API" introduced="^3" purpose="development">
- <unit bldFile="omxil/mmilapi/group" mrp="omxil/mmilapi/group/multimedia_il_api.mrp"/>
- </component>
- </collection>
<collection id="devsound" name="Sound Device" level="devices">
<component id="devsoundapi" name="DevSound API" introduced="7.0s" purpose="mandatory">
<unit bldFile="devsound/devsoundapi/group" mrp="devsound/devsoundapi/group/multimedia_mdf_devsound_api.mrp"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/os/mmimaging/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="mmimaging" name="Multimedia Imaging" levels="adaptation hw-if device-fw devices middleware app-if">
+ <collection id="imaging" name="Imaging Frameworks and Plugins" level="app-if">
+ <component id="imagingfws" name="Imaging Frameworks" introduced="7.0s" purpose="mandatory">
+ <unit bldFile="imaging/imagingfws/group" mrp="imaging/imagingfws/group/multimedia_icl.mrp"/>
+ </component>
+ <component id="imagingplugins" name="Imaging Plugins" introduced="7.0s" purpose="optional" class="plugin">
+ <unit bldFile="imaging/imagingplugins/group" mrp="imaging/imagingplugins/group/multimedia_icl_plugin.mrp"/>
+ </component>
+ <component id="imagingunittest" name="Imaging Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imaging/imagingunittest/group/multimedia_unittest_icl_source.mrp" bldFile="imaging/imagingunittest/group"/>
+ </component>
+ <component id="imaginginttest" name="Imaging Integration Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imaging/imaginginttest/group/multimedia_inttest_icl_source.mrp" bldFile="imaging/imaginginttest/group"/>
+ </component>
+ <component id="imagingdocs" name="Imaging Documentation" purpose="development" class="doc">
+ <unit mrp="imaging/imagingdocs/imaging_documentation.mrp" />
+ </component>
+ </collection>
+ <collection id="imagingtestenv" name="Imaging Test Environment" level="device-fw">
+ <component id="imagingtestfw" name="Imaging Test Framework" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imagingtestenv/imagingtestfw/group/imaging_testframework_source.mrp" bldFile="imagingtestenv/imagingtestfw/group"/>
+ </component>
+ <component id="imagingtestfwunittest" name="Imaging Test Framework Unit Tests" introduced="7.0s" purpose="development" filter="test">
+ <unit mrp="imagingtestenv/imagingtestfwunittest/group/imaging_unittest_testframework_source.mrp" bldFile="imagingtestenv/imagingtestfwunittest/group"/>
+ </component>
+ <component id="imagingtestagent" name="Imaging Test Agent" introduced="8.0" purpose="development" filter="test">
+ <unit mrp="imagingtestenv/imagingtestagent/group/imagingtestagent_source.mrp" bldFile="imagingtestenv/imagingtestagent/group"/>
+ </component>
+ <component id="imagingtesttools" name="Imaging Test Tools" purpose="development" filter="test">
+ <unit mrp="imagingtestenv/imagingtesttools/Group/imaging_testtools_source.mrp" bldFile="imagingtestenv/imagingtesttools/Group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/os/openmaxil/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.1">
+ <package id="openmaxil" name="openmaxil" levels="adaptation hw-if device-fw devices middleware app-if">
+
+
+ <collection id="openmaxil_plat" name="OpenMAX IL Platform Exports" level="hw-if">
+ <component id="openmaxil_khronos_api" name="OpenMAX IL API" introduced="^3" purpose="mandatory" class="api">
+ <unit version="1" bldFile="openmaxil_plat/khronos_api/group"/>
+ </component>
+ <component id="openmaxil_symbian_api" name="OpenMAX IL Symbian API" introduced="^3" purpose="mandatory" class="api">
+ <unit version="1" bldFile="openmaxil_plat/symbian_api/group"/>
+ </component>
+ <component id="openmaxil_test_api" name="OpenMAX IL test headers" introduced="^3" purpose="development" class="api">
+ <unit version="1" bldFile="openmaxil_plat/test_api/group"/>
+ </component>
+ </collection>
+
+ <collection id="omxil_generic" name="OpenMAX IL Implementation" level="device-fw">
+ <component id="omxilcomplib" name="OpenMAX IL Component Framework" introduced="^3" purpose="optional">
+ <unit version="1" bldFile="omxil_generic/omxilcomplib/group"/>
+ </component>
+ <component id="omxilcore" name="OpenMAX IL Core" introduced="^3" purpose="mandatory">
+ <unit version="1" bldFile="omxil_generic/omxilcore/group"/>
+ </component>
+ <component id="omxilloader" name="OpenMAX IL Loader" introduced="^3" purpose="mandatory">
+ <unit version="1" bldFile="omxil_generic/omxilloader/group"/>
+ </component>
+ </collection>
+
+ <collection id="openmaxil_tsrc" name="OpenMAX IL Test code" level="hw-if">
+ <component id="xmltestharness" name="OpenMAX IL XML Test Harness" introduced="^3" purpose="development">
+ <unit version="1" bldFile="tsrc/xmltestharness/group"/>
+ </component>
+ </collection>
+
+ </package>
+</SystemDefinition>
--- a/symbian4/os/osrndtools/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -1,57 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="osrndtools" name="OS R&D tools" levels="fw trace analysis">
- <collection id="stif" name="STIF" level="fw">
- <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
- <unit bldFile="stif/stif_plat/group"/>
- </component>
- <component id="testinterface" filter="s60" name="Test Interface" purpose="development">
- <unit bldFile="stif/testinterface/group"/>
- </component>
- <component id="testserver" filter="s60" name="Test Server" purpose="development">
- <unit bldFile="stif/testserver/group"/>
- </component>
- <component id="testengine" filter="s60" name="Test Engine" purpose="development">
- <unit bldFile="stif/testengine/group"/>
- </component>
- <component id="testserverstarter" filter="s60" name="Test Server Starter" purpose="development">
- <unit bldFile="stif/testserverstarter/group"/>
- </component>
- <component id="stiftfwif" filter="s60" name="STIF Test Framework Interface" purpose="development">
- <unit bldFile="stif/stiftfwif/group"/>
- </component>
- <component id="consoleui" filter="s60" name="Console UI" purpose="development">
- <unit bldFile="stif/consoleui/group"/>
- </component>
- <component id="testcombiner" filter="s60" name="Test Combiner" purpose="development">
- <unit bldFile="stif/testcombiner/group"/>
- </component>
- <component id="demomodule" filter="s60" name="Demo Module" purpose="development">
- <unit bldFile="stif/demomodule/group"/>
- </component>
- <component id="atslogger" filter="s60" name="ATS Logger" purpose="development">
- <unit bldFile="stif/atslogger/group"/>
- </component>
- <component id="atsinterface" filter="s60" name="ATS Interface" purpose="development">
- <unit bldFile="stif/atsinterface/group"/>
- </component>
- <component id="testscripter" filter="s60" name="Test Scripter" purpose="development">
- <unit bldFile="stif/testscripter/group"/>
- </component>
- <component id="suevent" filter="s60" name="SU Event" purpose="development">
- <unit bldFile="stif/suevent/group"/>
- </component>
- <component id="stifkerneltestclassbase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
- <meta rel="config">
- <defined condition="__S60_"/>
- </meta>
- <unit bldFile="stif/stifkerneltestclassbase/group"/>
- </component>
- <component id="stif_data" filter="s60" name="STIF Data" purpose="development" class="config">
- <!-- This is a component. Should move down a directory. or move into other STIF components-->
- <unit bldFile="stif/group"/>
- </component>
- </collection>
<collection id="memspy" name="MemSpy" level="trace">
<component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
<meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
@@ -77,46 +26,6 @@
<unit bldFile="memspy/group"/>
</component>
</collection>
- <collection id="hti" name="Harmonized Test Interface" level="trace">
- <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
- <meta rel="Api" href="hti/hti_plat/hti_api/hti_api.metaxml"/>
- <unit bldFile="hti/hti_plat/group"/>
- </component>
- <component id="hticfg" filter="s60" name="HTI Config" purpose="development">
- <unit bldFile="hti/hticfg/group"/>
- </component>
- <component id="htiautostart" filter="s60" name="HTI Autostart" purpose="development">
- <unit bldFile="hti/htiautostart/group"/>
- </component>
- <component id="htiframework" filter="s60" name="HTI Framework" purpose="development">
- <unit bldFile="hti/htiframework/group"/>
- </component>
- <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
- <!-- need to #include these from a single unit or separate into component at the right directory level -->
- <unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
- <unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
- <unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
- <unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
- </component>
- <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
- <!-- need to #include these from a single unit or separate into component at the right directory level -->
- <unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
- <unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
- <unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
- <unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
- <unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
- </component>
- <component id="htifilehlp" filter="s60" name="HTI File Help" purpose="development">
- <unit bldFile="hti/htifilehlp/group"/>
- </component>
- <component id="htiwatchdog" filter="s60" name="HTI Watchdog" purpose="development">
- <unit bldFile="hti/htiwatchdog/group"/>
- </component>
- <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
- <!-- move exports into self-contained component.-->
- <unit bldFile="hti/group"/>
- </component>
- </collection>
<collection id="piprofiler" name="Performance Investigator Profiler" level="analysis">
<component id="piprofiler_build" name="Performance Investigator Profiler Build" introduced="^4">
<unit bldFile="piprofiler/group"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/os/ostesttools/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="ostesttools" name="OS Test tools" levels="fw trace analysis">
+ <collection id="stif" name="STIF" level="fw">
+ <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
+ <unit bldFile="stif/stif_plat/group"/>
+ </component>
+ <component id="TestInterface" filter="s60" name="Test Interface" purpose="development">
+ <unit bldFile="stif/TestInterface/group"/>
+ </component>
+ <component id="TestServer" filter="s60" name="Test Server" purpose="development">
+ <unit bldFile="stif/TestServer/group"/>
+ </component>
+ <component id="TestEngine" filter="s60" name="Test Engine" purpose="development">
+ <unit bldFile="stif/TestEngine/group"/>
+ </component>
+ <component id="TestServerStarter" filter="s60" name="Test Server Starter" purpose="development">
+ <unit bldFile="stif/TestServerStarter/group"/>
+ </component>
+ <component id="StifTFwIf" filter="s60" name="STIF Test Framework Interface" purpose="development">
+ <unit bldFile="stif/StifTFwIf/group"/>
+ </component>
+ <component id="ConsoleUI" filter="s60" name="Console UI" purpose="development">
+ <unit bldFile="stif/ConsoleUI/group"/>
+ </component>
+ <component id="TestCombiner" filter="s60" name="Test Combiner" purpose="development">
+ <unit bldFile="stif/TestCombiner/group"/>
+ </component>
+ <component id="DemoModule" filter="s60" name="Demo Module" purpose="development">
+ <unit bldFile="stif/DemoModule/group"/>
+ </component>
+ <component id="ATSLogger" filter="s60" name="ATS Logger" purpose="development">
+ <unit bldFile="stif/ATSLogger/group"/>
+ </component>
+ <component id="ATSInterface" filter="s60" name="ATS Interface" purpose="development">
+ <unit bldFile="stif/ATSInterface/group"/>
+ </component>
+ <component id="TestScripter" filter="s60" name="Test Scripter" purpose="development">
+ <unit bldFile="stif/TestScripter/group"/>
+ </component>
+ <component id="SUEvent" filter="s60" name="SU Event" purpose="development">
+ <unit bldFile="stif/SUEvent/group"/>
+ </component>
+ <component id="StifKernelTestClassBase" filter="s60" name="STIF Kernel Test Class Base" purpose="development">
+ <meta rel="config">
+ <defined condition="__S60_"/>
+ </meta>
+ <unit bldFile="stif/StifKernelTestClassBase/group"/>
+ </component>
+ <component id="stif_data" filter="s60" name="STIF Data" purpose="development" class="config">
+ <!-- This is a component. Should move down a directory. or move into other STIF components-->
+ <unit bldFile="stif/group"/>
+ </component>
+ </collection>
+ <collection id="hti" name="Harmonized Test Interface" level="trace">
+ <component id="hti_plat" filter="s60" name="HTI Platform Interfaces" class="api" purpose="development">
+ <meta rel="Api" href="hti/hti_plat/hti_api/hti_api.metaxml"/>
+ <unit bldFile="hti/hti_plat/group"/>
+ </component>
+ <component id="HtiCfg" filter="s60" name="HTI Config" purpose="development">
+ <unit bldFile="hti/HtiCfg/group"/>
+ </component>
+ <component id="HtiAutoStart" filter="s60" name="HTI Autostart" purpose="development">
+ <unit bldFile="hti/HtiAutoStart/group"/>
+ </component>
+ <component id="HtiFramework" filter="s60" name="HTI Framework" purpose="development">
+ <unit bldFile="hti/HtiFramework/group"/>
+ </component>
+ <component id="hticommplugins" filter="s60" name="HTI Communication Plugins" purpose="development" class="plugin">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="hti/HtiCommPlugins/HtiBtCommPlugin/group"/>
+ <unit bldFile="hti/HtiCommPlugins/HtiIPCommPlugin/group"/>
+ <unit bldFile="hti/HtiCommPlugins/HtiSerialCommPlugin/group"/>
+ <unit bldFile="hti/HtiCommPlugins/HtiUsbSerialCommPlugin/group"/>
+ </component>
+ <component id="htiserviceplugins" filter="s60" name="HTI Service Plugins" purpose="development" class="plugin">
+ <!-- need to #include these from a single unit or separate into component at the right directory level -->
+ <unit bldFile="hti/HtiServicePlugins/HtiAppServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiEchoServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiFtpServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiIpProxyServicePlugin/group"/>
+ <unit bldFile="hti/HtiServicePlugins/HtiStifTfServicePlugin/group"/>
+ </component>
+ <component id="HtiFileHlp" filter="s60" name="HTI File Help" purpose="development">
+ <unit bldFile="hti/HtiFileHlp/group"/>
+ </component>
+ <component id="HtiWatchdog" filter="s60" name="HTI Watchdog" purpose="development">
+ <unit bldFile="hti/HtiWatchdog/group"/>
+ </component>
+ <component id="hti_build" filter="s60" name="HTI Build" purpose="development">
+ <!-- move exports into self-contained component.-->
+ <unit bldFile="hti/group"/>
+ </component>
+ </collection>
+ <collection id="symbianunittestfw" name="Symbian Unit Test Framework" level="analysis">
+ <component id="symbianunittestfw_build" name="Symbian Unit Test Framework Build" introduced="^4">
+ <unit bldFile="symbianunittestfw/group"/>
+ </component>
+ </collection>
+ <collection id="testexecmdw" name="testexecmdw" level="analysis">
+ <component id="tef" name="Test Execute Framework" introduced="^4">
+ <unit bldFile="testexecmdw/tef/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- a/symbian4/os/security/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/security/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -73,6 +73,9 @@
<component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
<unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
</component>
+ <component id="rootcertificates" name="Root Certificates" introduced="7.0s" purpose="optional" filter="sf_build">
+ <unit bldFile="cryptoservices/rootcertificates/group" mrp="cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+ </component>
<component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
<unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
</component>
--- a/symbian4/os/wlan/package_definition.xml Thu Jul 22 12:30:22 2010 +0100
+++ b/symbian4/os/wlan/package_definition.xml Mon Sep 06 18:02:53 2010 +0100
@@ -42,9 +42,9 @@
<meta rel="Api" href="wlan_plat/wlan_osa_api/wlan_osa_api.metaxml"/>
<unit bldFile="wlan_plat/wlan_osa_api/group"/>
</component>
- <component id="wlan_spia_api" name="WLAN SPIA API" class="api" filter="s60">
- <meta rel="Api" href="wlan_plat/wlan_spia_api/wlan_spia_api.metaxml"/>
- <unit bldFile="wlan_plat/wlan_spia_api/group"/>
+ <component id="wlan_busaccess_api" name="WLAN Bus Access API" class="api" filter="s60">
+ <meta rel="Api" href="wlan_plat/wlan_busaccess_api/wlan_busaccess_api.metaxml"/>
+ <unit bldFile="wlan_plat/wlan_busaccess_api/group"/>
</component>
<component id="wlan_hpa_api" name="WLAN HPA API" class="api" filter="s60">
<meta rel="Api" href="wlan_plat/wlan_hpa_api/wlan_hpa_api.metaxml"/>