[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] tools/metadataeng/engine symbian.pcf,1.7,1.7.14.1
From: amsaleem () helixcommunity ! org
Date: 2010-04-30 21:56:35
Message-ID: 201004302156.o3ULua2i001036 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/tools/metadataeng/engine
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv12796
Modified Files:
Tag: hxclient_4_2_0_brizo
symbian.pcf
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with \
Real Networks, and I am authorized to contribute this code under said agreement."
Modified by: saleem.adookkattil@nokia.com
Reviewed by:
Date: 04/20/2010
Project: symbian_client_apps
ErrorId: Not yet created
Synopsis: Made change to improve installation package generation and profile \
creation for symbian
Overview:
Existing Problem:
Symbian specific installation files are generated using script written specific to a \
package script project. ie audiocontroller (controllersis, installMMF.pcf), \
videocontroller (MmfSis, installMMF.pcf), and phonon (PhononSis and install.pcf) When \
we create a new profile excluding a specific bif module, we have to remove that bif \
module file from each installation package project script. The same issue exist with \
metadata and thumbnail dllnames txt file.We have to remove file name(s) from dll \
names txt file. Also, when we try to create a common installation package for all \
above packages (ie, symbianinstaller project), its very complex to handle.
Solution:
In order to address the above problem added a script file symbianinstaller.py to \
build system. It has methods to generate pkg files, copies files to target folders, \
and make entries in bld.inf file to export files. It also write destination folder \
names to buld.reg and uses this information to copy files to target location based on \
build configuration.
Also modified build system script to create selection(s) with bif module target names \
in build.reg by a project, add target binaries and their dependaent files under this \
section. symbianinstaller.py uses this information to generate pkg files, dll names \
list file and copy files to target folders.
After this change each installation package project needed only to specify the pkg \
file information, dll names list text file names and bif module target has to be \
included in the installation. If the module is part of the profile, all the files \
generated by this module get added to the installation. If its not there in the \
profile, those files are not added to installation.
Removed thumbnail and metdata specific dll names txt file and added script files \
hxthumbnaildllnames and hxmetadatadllnames to generates dll names txt files for \
thumbnail and metadata.
ConfigGen script file create entries to build.reg to install configuration file. \
There is no need to specify configuration names in installation package project. It \
gets added to intallation package when you add 'hxmedpltfm' target to the \
installation project.
In addition added feature flags HELIX_FEATURE_AUDIO_INACCURATESAMPLING, \
HELIX_FEATURE_SYMBIAN_AUDIOCTRL_PKG and HELIX_FEATURE_SYMBIAN_PHONON_PKG to \
helix-client-s60-common.pfi. Excluded HELIX_FEATURE_SYMBIAN_VIDEOCTRL_PKG and \
HELIX_FEATURE_SYMBIAN_PHONON_PKG in helix-client-symbian-4-common.pfi to not generate \
package files when using helix-client-symbian-4 profile ie, helix-client-symbian-4 \
profile creates audiocontroller and symbianinstaller common package for phonon, video \
controller and audio controller.
Also modfiled umake_symbianmmp.py and symbian.cf to use target output name as rsc \
file.
Files modified:
ribosome\build\bif-cvs\helix\client\build\BIF\hxclient_4_2_0_brizo.bif
ribosome\build\bif-cvs\helix\common\build\BIF\helix.bif
ribosome\build\umakepf\helix-client-s60-common.pfi
ribosome\build\umakepf\helix-client-symbian-4-common.pfi
ribosome\build\umakepf\helix-client-symbian-4-integration-common.pfi
ribosome\build\umake\umake.py
ribosome\build\umake\umake_symbianmmp.py
ribosome\build\umakecf\symbian-91-mmp.cf
ribosome\build\umakecf\symbian.cf
ribosome\build\umakecf\symbian-armv5.cf
ribosome\build\umakecf\symbian-emulator-winscw.cf
clientapps\appframeworks\phonon\Umakefil
clientapps\appframeworks\phonon\symbian.pcf
clientapps\appframeworks\phonon\hxphonondll
clientapps\appframeworks\phonon\PhononSis (all new code)
clientapps\symbianMmf\videocontroller\Umakefil
clientapps\symbianMmf\videocontroller\\MmfCtrlDll
clientapps\symbianMmf\videocontroller\MmfSis (all new code)
clientapps\symbianMmf\audiocontroller\Umakefil
clientapps\symbianMmf\audiocontroller\controllerdll
clientapps\symbianMmf\audiocontroller\controllersis (all new code)
clientapps\clientapps\symbianinstaller\SisGen (all new code)
datatype\mdf\video\format\flv\Umakefil
datatype\mdf\video\format\h263\Umakefil
datatype\mdf\video\format\h264\Umakefil
datatype\mdf\video\format\mp4\Umakefil
datatype\mdf\video\format\rm\Umakefil
datatype\mdf\video\format\wmv\Umakefil
datatype\tools\metadataeng\engine\symbian.pcf
Files added:
build\lib\symbianinstaller.py
datatype\tools\metadataeng\engine\platform\symbian\hxthumbnaildllnames
datatype\tools\metadataeng\engine\platform\symbian\hxmetadatadllnames
clientapps\symbiancommon\Umakefil
clientapps\symbiancommon\ConfigGen
Files removed:
cvsroot\clientapps\symbianMmf\videocontroller\installMMF.pcf
cvsroot\clientapps\symbianMmf\videocontroller\ng_installMMF.pcf
cvsroot\clientapps\symbianMmf\audiocontroller\installMMF.pcf
cvsroot\clientapps\symbianMmf\audiocontroller\ng_installMMF.pcf
cvsroot\datatype\tools\metadataeng\engine\platform\symbian\ng_hxthumbnail_dlls.txt
cvsroot\datatype\tools\metadataeng\engine\platform\symbian\ng_hxmetadata_dlls.txt
cvsroot\datatype\tools\metadataeng\engine\platform\symbian\hxthumbnail_dlls.txt
cvsroot\datatype\tools\metadataeng\engine\platform\symbian\hxmetadata_dlls.txt
Image Size and Heap Use impact: None.
Module Release testing (STIF) : Yes
Additional test done: Comparision of pkg file, copyDlls.bat, bld.inf files, mmp files \
and make files
Test case(s) Added : No
Memory leak check performed : Yes
Platforms and Profiles Build Verified: helix-client-symbian-4, helix-client-s60-52-ng
Platforms and Profiles Functionality verified: armv5, winscw
Branch: 4_2_0_brizo, HEAD
Index: symbian.pcf
===================================================================
RCS file: /cvsroot/datatype/tools/metadataeng/engine/symbian.pcf,v
retrieving revision 1.7
retrieving revision 1.7.14.1
diff -u -d -r1.7 -r1.7.14.1
--- symbian.pcf 4 Mar 2009 01:01:14 -0000 1.7
+++ symbian.pcf 30 Apr 2010 21:56:32 -0000 1.7.14.1
@@ -58,16 +58,13 @@
# edllstub.lib is automatically included by symbian build system.
# Therefore, it shouldn't be included for MMP build.
-if project.IsDefined('HELIX_CONFIG_SYMBIAN_GENERATE_MMP'):
- if project.IsDefined('HELIX_DEFINE_DLL_NAMESPACE'):
- project.symbianMmpUtils.AddMmpCfgExport(os.path.abspath("./platform/symbian/ng_hxmetadata_dlls.txt"))
- project.symbianMmpUtils.AddMmpCfgExport(os.path.abspath("./platform/symbian/ng_hxthumbnail_dlls.txt"))
- else:
- project.symbianMmpUtils.AddMmpCfgExport(os.path.abspath("./platform/symbian/hxmetadata_dlls.txt"))
- project.symbianMmpUtils.AddMmpCfgExport(os.path.abspath("./platform/symbian/hxthumbnail_dlls.txt"))
-else:
+if not project.IsDefined('HELIX_CONFIG_SYMBIAN_GENERATE_MMP'):
project.AddSystemLibraries('edllstub.lib')
project.AddSystemLibraries('caf.lib', 'charconv.lib', 'apgrfx.lib',
'apmime.lib', 'efsrv.lib')
+
+execfile('platform/symbian/hxmetadatadllnames')
+execfile('platform/symbian/hxthumbnaildllnames')
+
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic