[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-clientapps-dev
Subject: RE: [Clientapps-dev] Fix IGUL-7EFDMT: Helix stub sis files don't
From: "Eric Hyche" <ehyche () real ! com>
Date: 2008-08-29 12:36:54
Message-ID: 01b501c909d3$ebf32620$c3d97260$ () com
[Download RAW message or body]
Looks good.
=======================================
Eric Hyche (ehyche@real.com)
Senior Technical Lead
RealNetworks, Inc.
>-----Original Message-----
>From: clientapps-dev-bounces@helixcommunity.org [mailto:clientapps-dev-bounces@helixcommunity.org] On
>Behalf Of xiaolin.lliu@nokia.com
>Sent: Monday, August 25, 2008 2:02 PM
>To: clientapps-dev@helixcommunity.org
>Subject: [Clientapps-dev] Fix IGUL-7EFDMT: Helix stub sis files don't have correct content
>
>
>
>
>Modified by: xiaolin.lliu@nokia.com
>
>Reviewed by:
>
>Date: 08/22/2008
>
>Project: SymbianMmf_wm
>
>ErrorId: IGUL-7EFDMT
>
>Synopsis: Modify Helix make to stub sis files with the correct content
>
>Overview:
>1. Stub sis file are generated by the Helix Ribosome. Modify symbian.cf, install.pcf, etc to create
>the sis file with the correct contents.
>
>Also, exporting cfg files are changed from cfg_files_copy instead of MDcfg_files_copy in MmfSis.
>2. Stop putting INTMM_CFG_EXPORT in group/bld.inf when generate this file, this flag is no long in
>use.
>
>Files modified:
>/cvsroot/ribosome/build/umakecf/symbian.cf
>/cvsroot/clientapps/symbianMmf/audiocontroller/controllersis
>/cvsroot/clientapps/symbianMmf/audiocontroller/installMMF.pcf
>/cvsroot/clientapps/symbianMmf/videocontroller/MmfSis
>/cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtMmfSis
>/cvsroot/ribosome/build/umake/umake_symbianmmp.py
>
>Files added:
>None
>
>
>Image Size and Heap Use impact: minor.
>
>Module Release testing (STIF) : Yes, Passed (local test cases only)
>
>Test case(s) Added : No
>
>Memory leak check performed : Yes. No new memory leaks introduced.
>
>Platforms and Profiles Build Verified: helix-client-s60-32-mmf-mdf-dsp
>
>Platforms and Profiles Functionality verified: armv5, winscw
>
>Branch: cays 221 and cays 210
>
>
>Index: symbian.cf
>===================================================================
>RCS file: /cvsroot/ribosome/build/umakecf/symbian.cf,v
>retrieving revision 1.63
>diff -u -r1.63 symbian.cf
>--- symbian.cf 26 Mar 2008 16:24:52 -0000 1.63
>+++ symbian.cf 21 Aug 2008 15:12:05 -0000
>@@ -485,6 +485,7 @@
> class SymbianPkg:
> def __init__(self, name, appFolderName, langs = ["EN"]):
> self.name = name
>+ self.pkgname = name
> self.langs = langs
> self.files = []
> self.depends = []
>@@ -542,10 +543,10 @@
>
> self.files.append((source, dest, args))
>
>- def Generate(self):
>+ def Generate(self, stubsis = 0):
> ''' write out the package file '''
>
>- pkgname = "%s.pkg" % self.name
>+ pkgname = "%s.pkg" % self.pkgname
> f = open(pkgname, "w")
>
> # format langs
>@@ -575,7 +576,7 @@
>
> if project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):
> f.write("\n;Localised Vendor name\n")
>- f.write("%{\"Vendor-EN\"}\n")
>+ f.write("%{\"Nokia\"}\n")
>
> f.write("\n;Unique Vendor name\n")
> f.write(":\"Nokia\"\n")
>@@ -591,15 +592,31 @@
> args = ", %s" % string.join(args, ",")
> else:
> args = ""
>- f.write("\"%s\" - \"%s\"%s\n" % (source, dest, args))
>+
>+ if (stubsis == 1):
>+ dest = "z%s" % (dest[1:])
>+ f.write("\"\" - \"%s\"%s\n" % (dest, args))
>+ else:
>+ f.write("\"%s\" - \"%s\"%s\n" % (source, dest, args))
>
> f.close()
>
> def GenerateUpgradePackage(self):
> ''' write out the Package Upgrade file '''
>- self.name = "%s%s" % (self.name, "U")
>+ self.pkgname = "%s%s" % (self.name, "U")
>+ type = self.type
> self.type = "%s" % ("PU")
> self.Generate()
>+ self.type = type
>+
>+ def GenerateStubSISPackage(self):
>+ ''' write out the Package STUB SIS file '''
>+ self.pkgname = "%s%s" % (self.name, "_stub")
>+ stubsis = 1
>+ type = self.type
>+ self.type = "%s" % ("SA")
>+ self.Generate(stubsis)
>+ self.type = type
>
>
> def EnableUSis(self, GenUSis = 1):
>
>Index: controllersis
>===================================================================
>RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/controllersis,v
>retrieving revision 1.1.2.3.2.2
>diff -u -r1.1.2.3.2.2 controllersis
>--- controllersis 31 Mar 2008 14:30:40 -0000 1.1.2.3.2.2
>+++ controllersis 21 Aug 2008 18:54:17 -0000
>@@ -169,8 +169,6 @@
> for file in rsc_files_copy:
> pkg.AddFile(file, '!:\\Resource\\Plugins\\%s <file://\\Resource\\Plugins\\%s> ' %
>"HxMmfAudioCtrl.RSC" )
>
>- for file in lib_files_copy:
>- pkg.AddFile(file, '!:\\Sys\\bin\\%s <file://\\Sys\\bin\\%s> ' % os.path.basename(file))
>
> else:
>
>@@ -182,8 +180,6 @@
> for file in rsc_files_copy:
> pkg.AddFile(file, '!:\\system\\libs\\plugins\\%s <file://\\system\\libs\\plugins\\%s> ' %
>os.path.basename(file))
>
>- for file in lib_files_copy:
>- pkg.AddFile(file, '!:\\system\\libs\\plugins\\dlls\\%s
><file://\\system\\libs\\plugins\\dlls\\%s> ' % os.path.basename(file))
>
> if project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):
> for file in payld_dll_files_copy:
>@@ -204,6 +200,9 @@
> ## Generate Pkg file for Upgrades
> pkg.GenerateUpgradePackage()
>
>+## Generate Pkg file for Upgrades
>+pkg.GenerateStubSISPackage()
>+
> ##
> ## Copy file not needed for MMP builds ##
>
>Index: installMMF.pcf
>===================================================================
>RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/installMMF.pcf,v
>retrieving revision 1.1.2.3
>diff -u -r1.1.2.3 installMMF.pcf
>--- installMMF.pcf 26 Jul 2007 00:17:41 -0000 1.1.2.3
>+++ installMMF.pcf 21 Aug 2008 16:16:56 -0000
>@@ -105,12 +105,11 @@
> #
> configDir = "%s\\%s\\config\\" % (project.src_root_path, symbianConfigMod)
>
>-cfg_file_names = [ 'R1_Mobile_4_0_Operator.cfg',
>- 'R1_Mobile_4_0_Platform.cfg',
>- 'R1_Mobile_4_0_Factory.cfg' ]
>+cfg_file_names = []
>
> cfg_files_copy = AddPrefixForEach(configDir, cfg_file_names)
>
>+
> dll_name = 'audio_dll_names.txt'
> dll_names_file = "%s%s" % (configDir , dll_name )
>
>
>Index: MmfSis
>===================================================================
>RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/MmfSis,v
>retrieving revision 1.2.2.7.2.2
>diff -u -r1.2.2.7.2.2 MmfSis
>--- MmfSis 31 Mar 2008 14:30:41 -0000 1.2.2.7.2.2
>+++ MmfSis 21 Aug 2008 15:13:34 -0000
>@@ -155,12 +155,13 @@
>
> for file in cfg_files_copy:
> pkg.AddFile(file, '!:\\resource\\%s <file://\\resource\\%s> ' % os.path.basename(file)) -for file
>in MDcfg_files_copy:
>- pkg.AddFile(file, '!:\\resource\\%s <file://\\resource\\%s> ' % os.path.basename(file))
>
> if project.IsDefined('HELIX_CONFIG_SYMBIAN_GENERATE_MMP'):
> project.symbianMmpUtils.AddMmpCfgExport(os.path.abspath(file))
>
>+for file in MDcfg_files_copy:
>+ pkg.AddFile(file, '!:\\resource\\%s <file://\\resource\\%s> ' %
>+os.path.basename(file))
>+
> pkg.AddFile(dll_names_file, '!:\\resource\\%s <file://\\resource\\%s> ' %
>os.path.basename(dll_names_file))
>
> if project.IsDefined('HELIX_CONFIG_SYMBIAN_GENERATE_MMP'):
>@@ -209,6 +210,10 @@
> ## Generate Pkg file for Upgrades
> pkg.GenerateUpgradePackage()
>
>+
>+## Generate Pkg file for Upgrades
>+pkg.GenerateStubSISPackage()
>+
> ##
> ## Copy file not needed for MMP builds ##
>
>
>Index: WmvExtMmfSis
>===================================================================
>RCS file: /cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtMmfSis,v
>retrieving revision 1.1.2.4.2.2
>diff -u -r1.1.2.4.2.2 WmvExtMmfSis
>--- WmvExtMmfSis 31 Mar 2008 14:30:42 -0000 1.1.2.4.2.2
>+++ WmvExtMmfSis 14 Aug 2008 21:19:56 -0000
>@@ -232,6 +232,9 @@
> ## Generate Pkg file for Upgrades
> pkg.GenerateUpgradePackage()
>
>+## Generate Pkg file for Upgrades
>+pkg.GenerateStubSISPackage()
>+
> ##
> ## Copy file not needed for MMP builds ##
>
>
>
>Index: umake_symbianmmp.py
>===================================================================
>RCS file: /cvsroot/ribosome/build/umake/umake_symbianmmp.py,v
>retrieving revision 1.7
>diff -u -r1.7 umake_symbianmmp.py
>--- umake_symbianmmp.py 17 Jun 2008 19:17:08 -0000 1.7
>+++ umake_symbianmmp.py 21 Aug 2008 18:59:23 -0000
>@@ -730,11 +730,6 @@
> winscwUrelExportList.append( '%s %s' % ( winscwDistSrc, os.path.join(winscwUrelPath,
>dest_filename) ) )
> winscwUdebExportList.append( '%s %s' % ( winscwDistSrc, os.path.join(winscwUdebPath,
>dest_filename) ) )
>
>- ##
>- ## Write the armv5 and winscw export data to the bld.inf file
>- ##
>- bld_inf_file.append('#ifndef INTMM_CFG_EXPORT')
>-
> for x in armv5UrelCfgs:
> if ( sbsv2 == 1 ):
> x = ReplaceBackslashWithForward(x)
>
_______________________________________________
Clientapps-dev mailing list
Clientapps-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/clientapps-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic