[Clientapps-cvs] symbianplayer symbian.pcf,1.43,1.44
jwei at helixcommunity.org jwei at helixcommunity.orgUpdate of /cvsroot/clientapps/symbianplayer
In directory cvs:/tmp/cvs-serv4663
Modified Files:
symbian.pcf
Log Message:
Updated symbian.pcf Ref: MDF video renderer
Index: symbian.pcf
===================================================================
RCS file: /cvsroot/clientapps/symbianplayer/symbian.pcf,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- symbian.pcf 22 Jul 2005 22:07:54 -0000 1.43
+++ symbian.pcf 6 Oct 2005 12:00:26 -0000 1.44
@@ -245,6 +245,17 @@
for file in mdl_files:
pkg.AddFile(file, "!:\\system\\recogs\\hxsymrecog.mdl")
+if project.IsDefined('HELIX_CONFIG_SYMBIAN_PLATFORM_SECURITY'):
+ for file in payld_dll_files:
+ pkg.AddFile(file, '!:\\sys\\bin\\%s' % os.path.basename(file))
+ for file in payld_rsc_files:
+ pkg.AddFile(file, '!:\\resource\\plugins\\%s' % os.path.basename(file))
+else:
+ for file in payld_dll_files:
+ pkg.AddFile(file, '!:\\system\\libs\\plugins\\%s' % os.path.basename(file))
+ for file in payld_rsc_files:
+ pkg.AddFile(file, '!:\\system\\libs\\plugins\\%s' % os.path.basename(file))
+
pkg.Generate()
@@ -541,18 +552,25 @@
emulRegistrationDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UDEB\\Z\\private\\10003a3f\\apps")
emulLibDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UDEB\\Z\\sys\\bin\\lib")
emulDataDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UDEB\\Z\\sys\\bin\\resource")
+ emulPluginDllDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UDEB\\Z\\sys\\bin")
+ emulPluginRscDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UDEB\\Z\\Resource\\plugins")
else:
emulAppDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UREL")
emulRecogDir = emulLibDir = emulAppDir
emulInstallDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UREL\\Z\\Resource\\apps")
emulRegistrationDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UREL\\Z\\private\\10003a3f\\apps")
+ emulPluginDllDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UREL\\Z\\sys\\bin")
+ emulPluginRscDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\release\\winscw\\UREL\\Z\\Resource\\plugins")
else:
if project.IsDefined('__CW32__'):
emulInstallDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\winscw\\c\\system\\apps\\RealPlayer")
emulRecogDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\winscw\\c\\system\\recogs")
+ emulPluginDllDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\winscw\\c\\system\\libs\\plugins")
else:
emulInstallDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\wins\\c\\system\\apps\\RealPlayer")
emulRecogDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\wins\\c\\system\\recogs")
+ emulPluginDllDir = os.path.join(GetSDKPath('SYMBIANSDK'), "Epoc32\\wins\\c\\system\\libs\\plugins")
+ emulPluginRscDir = emulPluginDllDir
emulLibDir = os.path.join(emulInstallDir, "lib")
emulDataDir = os.path.join(emulInstallDir, "data")
@@ -564,6 +582,7 @@
if not project.IsDefined('_SYMBIAN_90_'):
AddMakefileEnsureDirLine(emulInstallDir)
AddMakefileEnsureDirLine(emulRecogDir)
+ AddMakefileEnsureDirLine(emulPluginDllDir)
AddMakefileEnsureDirLine(emulDataDir)
AddMakefileEnsureDirLine(emulLibDir)
project.post_target_buff.append('\n')
@@ -592,6 +611,13 @@
for file in lib_files:
AddMakefileCopyRule(emulLibDir, file, copyLines, allFiles)
+
+ for file in payld_dll_files:
+ AddMakefileCopyRule(emulPluginDllDir, file, copyLines, allFiles)
+
+ for file in payld_rsc_files:
+ AddMakefileCopyRule(emulPluginRscDir, file, copyLines, allFiles)
+
project.post_target_buff.extend(copyLines)
#
@@ -632,6 +658,14 @@
for file in mdl_files:
file = os.path.basename(file)
project.post_target_buff.append('\t-rm -f "%s\\%s"\n' % (emulRecogDir, file))
+
+ for file in payld_dll_files:
+ file = os.path.basename(file)
+ project.post_target_buff.append('\t-rm -f "%s\\%s"\n' % (emulPluginDllDir, file))
+
+ for file in payld_rsc_files:
+ file = os.path.basename(file)
+ project.post_target_buff.append('\t-rm -f "%s\\%s"\n' % (emulPluginRscDir, file))
else:
#
@@ -651,7 +685,7 @@
#
sisName = "%s\\%s.sis" % (project.output_dir, installName)
-sisDepends = string.join(app_files + cfg_files + lib_files)
+sisDepends = string.join(app_files + cfg_files + lib_files + payld_dll_files + payld_rsc_files)
project.post_target_buff.append("%s: all %s.pkg %s\n" % (sisName, installName, sisDepends))
project.post_target_buff.append("\tmakesis -v %s.pkg %s" % (installName, sisName))
project.post_target_buff.append("\n")