RE: CN: Generate the upgrade sis files

Hi,

This change is checked in to 210Cays, 221Cays and HEAD.

Thanks
Ashish

From ehyche at real.com  Fri Mar 21 14:15:36 2008
From: ehyche at real.com (Eric Hyche)
Date: Fri Mar 21 13:22:59 2008
Subject: [Ribosome-dev] RE: [Clientapps-dev] CR:Generate the upgrade sis
    ;    files

Looks good.

=============================================
Eric Hyche (ehychereal.com)
Technical Lead
RealNetworks, Inc. 

_____________________________________________
From:   Gupta Ashish.As (Nokia-D-MSW/Dallas) 
Sent: ;  Friday, March 21, 2008 6:08 PM
To:     ribosome-devhelixcommunity.org; clientapps-devhelixcommunity.org
Subject:      ;  [Clientapps-dev] CR: Generate the upgrade sis files

Generate upgrade sis file

Nokia submits this code under the terms of a commercial contribution agreement with RealNetworks, and I am authorized to contribute this code under said agreement."

Modified by:  ashish.as.guptanokia.com

Reviewed by:

Date: 19-Mar-2008

Project: SymbianMmf_wm

TSW-Id: TBD

Synopsis:

Currently, upgrade package files are created but upgrade sis files are not generated.
This CR fixes the same.

Files Modified:

build/umakecf/symbian.cf
clientapps/symbianMmf/audiocontroller/controllersis
clientapps/symbianMmf/videocontroller/MmfSis
clientapps/symbianMmf/wmvextcontroller/WmvExtMmfSis

Image Size and Heap Use impact: none

Module Release testing (STIF): Yes.

Test case(s) Added: none

Memory leak check performed: Yes, no new leaks introduced.

Platforms and Profiles Build Verified:
    armv5 / helix-client-s60-50-mmf-mdf-arm
    winscw / helix-client-s60-50-mmf-mdf-arm

Platforms and Profiles Functionality verified:
    armv5 / helix-client-s60-32-mmf-mdf-arm
    winscw / helix-client-s60-32-mmf-mdf-arm

Branch:
    HEAD, hxclient_2_1_0_cayennes and hxclient_2_2_1_cayennes

? build_umakecf_diff.txt
Index: symbian.cf
===================================================================
RCS file: /cvsroot/ribosome/build/umakecf/symbian.cf,v
retrieving revision 1.61
diff -u -w -r1.61 symbian.cf
--- symbian.cf  9 Aug 2007 01:56:41 -0000 ;      1.61
+++ symbian.cf  19 Mar 2008 19:20:39 -0000
-495,6 +495,7
         self.build = None
         self.options = None
         self.type = None
+        self.GenUSis = 0
         if project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):
           ;  self.appDest = "!:\sys\bin"
         else:
-601,6 +602,11
         self.Generate()
 
        
+    def EnableUSis(self, GenUSis = 1):
+        ''' Enable the generation of Upgrade sis file '''
+        self.GenUSis = GenUSis
+
+       
 
     def CreateMakefile(self, sisname = None):
         ''' write makefile that builds sis '''
-609,6 +615,7
 
         if not sisname:
           ;  sisname = "%s.sis" % self.name
+         ;   Usisname = "%sU.sis" % self.name
 
         # output makefile instructions to build the .sis
         project.writeln(";all: %s" % sisname)
-618,6 +625,8
 
         project.writeln(";%s:" % sisname)
         project.writeln(";tmakesis -v %s %s" % (pkgname, sisname))
+        if( self.GenUSis != 0 ):
+         ;   project.writeln(";tmakesis -v %sU.pkg %s" % (self.name, Usisname))
         project.writeln(";n")
 
         project.writeln(";depend:")

Index: audiocontroller/controllersis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/audiocontroller/controllersis,v
retrieving revision 1.1.2.3
diff -u -w -r1.1.2.3 controllersis
--- audiocontroller/controllersis       9 Aug 2007 02:05:40 -0000 ;      1.1.2.3
+++ audiocontroller/controllersis       19 Mar 2008 19:21:16 -0000
-198,6 +198,7
     for file in payld_rsc_files_copy:
         pkg.AddFile(file, '!:\system\libs\plugins\%s' % os.path.basename(file))
 
+pkg.EnableUSis()
 pkg.Generate()
 pkg.CreateMakefile()
 
Index: videocontroller/MmfSis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/videocontroller/MmfSis,v
retrieving revision 1.2.2.7
diff -u -w -r1.2.2.7 MmfSis
--- videocontroller/MmfSis      24 Jan 2008 17:18:58 -0000 ;     1.2.2.7
+++ videocontroller/MmfSis      19 Mar 2008 19:21:16 -0000
-203,6 +203,7
     for file in payld_rsc_files_copy:
         pkg.AddFile(file, '!:\system\libs\plugins\%s' % os.path.basename(file))
 
+pkg.EnableUSis()
 pkg.Generate()
 pkg.CreateMakefile()
 
Index: wmvextcontroller/WmvExtMmfSis
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/wmvextcontroller/WmvExtMmfSis,v
retrieving revision 1.1.2.4
diff -u -w -r1.1.2.4 WmvExtMmfSis
--- wmvextcontroller/WmvExtMmfSis       9 Aug 2007 02:05:40 -0000 ;      1.1.2.4
+++ wmvextcontroller/WmvExtMmfSis       19 Mar 2008 19:21:16 -0000
-225,7 +225,7
     for file in payld_rsc_files_copy:
         pkg.AddFile(file, '!:\system\libs\plugins\%s' % os.path.basename(file))
 
-
+pkg.EnableUSis()
 pkg.Generate()
 pkg.CreateMakefile()