Update many pkgdefs. Mostly adding/removing filter="s60" and qt:proFile="-r" (no longer needed). the rest catch up to the state of the packages' codelines.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian4/adapt/openmaxil.nokia/package_definition.xml Mon Sep 06 18:02:15 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>
--- a/symbian4/adaptation/codecs.aricent/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/adaptation/codecs.aricent/package_definition.xml Mon Sep 06 18:02:15 2010 +0100
@@ -1,61 +1,61 @@
<?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">
+ <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">
+ <component id="aristatemachine" name="Aricent State Machine" filter="sf_build" introduced="^4">
<unit bldFile="utilities/aristatemachine/group" />
</component>
</collection>
- <collection id="aaclc_enc" level="plugin">
- <component id="ariaaclcencmmfcodec">
+ <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" level="plugin">
- <component id="ariamrnbdecmmfcodec">
+ <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" level="plugin">
- <component id="ariamrnbencmmfcodec">
+ <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" level="plugin">
- <component id="ariamrwbdecmmfcodec">
+ <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" level="plugin">
- <component id="arih264dechwdevice">
+ <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" level="plugin">
- <component id="arih264enchwdevice">
+ <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" level="plugin">
- <component id="ariheaacdecmmfcodec">
+ <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" level="plugin">
- <component id="arimp3decmmfcodec">
+ <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" level="plugin">
- <component id="arimpeg4aspdechwdevice">
+ <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" level="plugin">
- <component id="arimp4spenchwdevice">
+ <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>
--- a/symbian4/app/browserui/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml Mon Sep 06 18:02:15 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/jrt/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml Mon Sep 06 18:02:15 2010 +0100
@@ -35,6 +35,9 @@
<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">
--- a/symbian4/app/radio/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml Mon Sep 06 18:02:15 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/videotelephony/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/app/videotelephony/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml Mon Sep 06 18:02:15 2010 +0100
@@ -45,11 +45,11 @@
</component>
</collection>
<collection id="ncdengine" name="Nokia Content Discover" level="framework">
- <component id="ncdengine_build" filter="s60" name="NCD API" introduced="^1">
- <unit bldFile="ncdengine/group" />
+ <component id="ncdengine_build" filter="s60" name="NCD Engine" introduced="^1">
+ <unit bldFile="ncdengine/group"/>
</component>
- <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
- <unit bldFile="ncdengine/engine" qt:proFile="engine.pro" qt:qmakeArgs="-r"/>
+ <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">
@@ -57,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">
@@ -69,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/browser/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml Mon Sep 06 18:02:15 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/camerasrv/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/camerasrv/package_definition.xml Mon Sep 06 18:02:15 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/gstreamer/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/gstreamer/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/hapticsservices/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/helix/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/platformthemes/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml Mon Sep 06 18:02:15 2010 +0100
@@ -4,57 +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">
+ <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="qtmobileextensions/examples" qt:proFile="examples.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>
--- a/symbian4/mw/qtmobility/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/qtmobility/package_definition.xml Mon Sep 06 18:02:15 2010 +0100
@@ -1,12 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <!-- qt:qmakeArgs attribute is an unsupported extension used as temporary hack to get this to work with abld.
- This will be removed when sbsv2 builds are working -->
<package id="qtmobility" name="Qt Mobility" levels="tool mw app">
- <collection id="qtmobility_collection" name="Qt Mobility collection" level="app">
- <component id="qtmobility_build" name="Qt Mobility Build" introduced="^4">
- <!-- break this up into the above collections-->
- <unit bldFile="." qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
+ <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>
--- a/symbian4/mw/remoteconn/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/remoteconn/package_definition.xml Mon Sep 06 18:02:15 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,37 +52,37 @@
</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" filter="test">
+ <component id="backuptest" name="Backup Test" introduced="^2" purpose="development">
<unit bldFile="backupandrestore/backuptest/group" mrp="backupandrestore/backuptest/group/connectivity_backuptest.mrp"/>
</component>
</collection>
--- a/symbian4/mw/srvdiscovery/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml Mon Sep 06 18:02:15 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/uiresources/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/uiresources/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/videoutils/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml Mon Sep 06 18:02:15 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/devicesrv/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml Mon Sep 06 18:02:15 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/kernelhwsrv/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml Mon Sep 06 18:02:15 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,7 +50,7 @@
<!-- 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">
--- a/symbian4/os/openmaxil/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/os/openmaxil/package_definition.xml Mon Sep 06 18:02:15 2010 +0100
@@ -4,13 +4,13 @@
<collection id="openmaxil_plat" name="OpenMAX IL Platform Exports" level="hw-if">
- <component id="khronos_api" name="OpenMAX IL API" introduced="^3" purpose="mandatory" class="api">
+ <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="symbian_api" name="OpenMAX IL Symbian API" introduced="^3" purpose="mandatory" class="api">
+ <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="test_api" name="OpenMAX IL test headers" introduced="^3" purpose="development" class="api">
+ <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>
@@ -27,7 +27,7 @@
</component>
</collection>
- <collection id="tsrc" name="OpenMAX IL Test code" level="hw-if">
+ <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>
--- a/symbian4/os/security/package_definition.xml Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/os/security/package_definition.xml Mon Sep 06 18:02:15 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 Mon Sep 06 17:10:48 2010 +0100
+++ b/symbian4/os/wlan/package_definition.xml Mon Sep 06 18:02:15 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"/>