Catchup Merge
authorChetan Kapoor <chetank@symbian.org>
Tue, 04 May 2010 01:27:08 +0100
changeset 519 c4b2c8d6309a
parent 518 b5cfac16f48a (diff)
parent 512 10aafb02a17d (current diff)
child 520 9bdced85ed22
Catchup Merge
symbian3/single/sources_fcl.csv
symbian3/single/sysdefs/system_model.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/prebuilt_excludelist.txt	Tue May 04 01:27:08 2010 +0100
@@ -0,0 +1,218 @@
+epoc32\data\z\system\data\testexecute.ini
+epoc32\engineeringtools\plugins\tef.vp
+epoc32\engineeringtools\tefutilities\eventlogserver\data\eventlogcontroler.ini
+epoc32\engineeringtools\tefutilities\eventlogserver\scripts\example.script
+epoc32\engineeringtools\tefutilities\eventlogserver\xml\eventlogserver.xml
+epoc32\engineeringtools\tefutilities\eventlogserver\xml\eventlogserver\example.xml
+epoc32\engineeringtools\tefutilities\platsec\data\capabilitypolicing.ini
+epoc32\engineeringtools\tefutilities\platsec\scripts\capabilitypolicing.script
+epoc32\engineeringtools\tefutilities\platsec\scripts\cleanup.script
+epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver.xml
+epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver\capabilitypolicing.xml
+epoc32\engineeringtools\tefutilities\platsec\xml\platsecserver\cleanup.xml
+epoc32\engineeringtools\tefutilities\tefutilityserver\data\formatdrivetest.ini
+epoc32\engineeringtools\tefutilities\tefutilityserver\scripts\buildinfologtest.script
+epoc32\engineeringtools\tefutilities\tefutilityserver\scripts\formatdrivetest.script
+epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver.xml
+epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver\buildinfologtest.xml
+epoc32\engineeringtools\tefutilities\tefutilityserver\xml\tefutilityserver\formatdrivetest.xml
+epoc32\include\iniparser.h
+epoc32\include\test\activecallback.h
+epoc32\include\test\blockitems.h
+epoc32\include\test\commandprocessor.h
+epoc32\include\test\cteflogger.h
+epoc32\include\test\ctefunitserver.h
+epoc32\include\test\dataaccess.h
+epoc32\include\test\datadictionary.h
+epoc32\include\test\datawrapper.h
+epoc32\include\test\datawrapper.inl
+epoc32\include\test\fileservplugin.h
+epoc32\include\test\rfilelogger.h
+epoc32\include\test\rfileloggermacro.h
+epoc32\include\test\sysstartplugin.h
+epoc32\include\test\tefexportconst.h
+epoc32\include\test\tefresult.h
+epoc32\include\test\tefscriptutils.h
+epoc32\include\test\tefshareddata.h
+epoc32\include\test\tefshareddata.inl
+epoc32\include\test\teftimer.h
+epoc32\include\test\tefunit.h
+epoc32\include\test\tefunit.inl
+epoc32\include\test\TEFUtils.h
+epoc32\include\test\testblockcontroller.h
+epoc32\include\test\testblockcontroller.inl
+epoc32\include\test\testexecuteclient.h
+epoc32\include\test\testexecutelog.h
+epoc32\include\test\testexecutelogbase.h
+epoc32\include\test\testexecutelogger.h
+epoc32\include\test\testexecutepipslog.h
+epoc32\include\test\testexecuteserverbase.h
+epoc32\include\test\testexecuteserverutils.h
+epoc32\include\test\testexecuteserverutils.inl
+epoc32\include\test\testexecutestepbase.h
+epoc32\include\test\testserver2.h
+epoc32\include\test\testshareddata.h
+epoc32\include\test\testshareddata.inl
+epoc32\include\test\wrapperutilsplugin.h
+epoc32\release\armv5\lib\IniParser.dso
+epoc32\release\armv5\lib\IniParser.lib
+epoc32\release\armv5\lib\IniParser{000a0000}.dso
+epoc32\release\armv5\lib\IniParser{000a0000}.lib
+epoc32\release\armv5\lib\rfileloggerclient.dso
+epoc32\release\armv5\lib\rfileloggerclient.lib
+epoc32\release\armv5\lib\rfileloggerclient{000a0000}.dso
+epoc32\release\armv5\lib\rfileloggerclient{000a0000}.lib
+epoc32\release\armv5\lib\testexecutelogclient.dso
+epoc32\release\armv5\lib\testexecutelogclient.lib
+epoc32\release\armv5\lib\testexecutelogclient{000a0000}.dso
+epoc32\release\armv5\lib\testexecutelogclient{000a0000}.lib
+epoc32\release\armv5\lib\testexecutepipslogclient.dso
+epoc32\release\armv5\lib\testexecutepipslogclient.lib
+epoc32\release\armv5\lib\testexecutepipslogclient{000a0000}.dso
+epoc32\release\armv5\lib\testexecutepipslogclient{000a0000}.lib
+epoc32\release\armv5\lib\testexecuteutils.dso
+epoc32\release\armv5\lib\testexecuteutils.lib
+epoc32\release\armv5\lib\testexecuteutils{000a0000}.dso
+epoc32\release\armv5\lib\testexecuteutils{000a0000}.lib
+epoc32\release\armv5\lib\WrapperUtilsPlugin1.dso
+epoc32\release\armv5\lib\WrapperUtilsPlugin1.lib
+epoc32\release\armv5\lib\WrapperUtilsPlugin1{000a0000}.dso
+epoc32\release\armv5\lib\WrapperUtilsPlugin1{000a0000}.lib
+epoc32\release\armv5\udeb\gwstestexecute.exe
+epoc32\release\armv5\udeb\gwstestexecute.exe.map
+epoc32\release\armv5\udeb\IniParser.dll
+epoc32\release\armv5\udeb\IniParser.dll.map
+epoc32\release\armv5\udeb\rfileloggerclient.dll
+epoc32\release\armv5\udeb\rfileloggerclient.dll.map
+epoc32\release\armv5\udeb\rfileloggerserver.exe
+epoc32\release\armv5\udeb\rfileloggerserver.exe.map
+epoc32\release\armv5\udeb\tefcleanup.exe
+epoc32\release\armv5\udeb\tefcleanup.exe.map
+epoc32\release\armv5\udeb\tefplatsec.exe
+epoc32\release\armv5\udeb\tefplatsec.exe.map
+epoc32\release\armv5\udeb\tefunit.lib
+epoc32\release\armv5\udeb\tefutilityserver.exe
+epoc32\release\armv5\udeb\tefutilityserver.exe.map
+epoc32\release\armv5\udeb\tefutilityserverlite.exe
+epoc32\release\armv5\udeb\tefutilityserverlite.exe.map
+epoc32\release\armv5\udeb\testexecute.exe
+epoc32\release\armv5\udeb\testexecute.exe.map
+epoc32\release\armv5\udeb\testexecutelite.exe
+epoc32\release\armv5\udeb\testexecutelite.exe.map
+epoc32\release\armv5\udeb\testexecutelogclient.dll
+epoc32\release\armv5\udeb\testexecutelogclient.dll.map
+epoc32\release\armv5\udeb\testexecutelogengine.exe
+epoc32\release\armv5\udeb\testexecutelogengine.exe.map
+epoc32\release\armv5\udeb\testexecutepipslogclient.dll
+epoc32\release\armv5\udeb\testexecutepipslogclient.dll.map
+epoc32\release\armv5\udeb\testexecutepipslogengine.exe
+epoc32\release\armv5\udeb\testexecutepipslogengine.exe.map
+epoc32\release\armv5\udeb\testexecuteutils.dll
+epoc32\release\armv5\udeb\testexecuteutils.dll.map
+epoc32\release\armv5\udeb\WrapperUtilsPlugin1.dll
+epoc32\release\armv5\udeb\WrapperUtilsPlugin1.dll.map
+epoc32\release\armv5\urel\gwstestexecute.exe
+epoc32\release\armv5\urel\gwstestexecute.exe.map
+epoc32\release\armv5\urel\IniParser.dll
+epoc32\release\armv5\urel\IniParser.dll.map
+epoc32\release\armv5\urel\rfileloggerclient.dll
+epoc32\release\armv5\urel\rfileloggerclient.dll.map
+epoc32\release\armv5\urel\rfileloggerserver.exe
+epoc32\release\armv5\urel\rfileloggerserver.exe.map
+epoc32\release\armv5\urel\tefcleanup.exe
+epoc32\release\armv5\urel\tefcleanup.exe.map
+epoc32\release\armv5\urel\tefplatsec.exe
+epoc32\release\armv5\urel\tefplatsec.exe.map
+epoc32\release\armv5\urel\tefunit.lib
+epoc32\release\armv5\urel\tefutilityserver.exe
+epoc32\release\armv5\urel\tefutilityserver.exe.map
+epoc32\release\armv5\urel\tefutilityserverlite.exe
+epoc32\release\armv5\urel\tefutilityserverlite.exe.map
+epoc32\release\armv5\urel\testexecute.exe
+epoc32\release\armv5\urel\testexecute.exe.map
+epoc32\release\armv5\urel\testexecutelite.exe
+epoc32\release\armv5\urel\testexecutelite.exe.map
+epoc32\release\armv5\urel\testexecutelogclient.dll
+epoc32\release\armv5\urel\testexecutelogclient.dll.map
+epoc32\release\armv5\urel\testexecutelogengine.exe
+epoc32\release\armv5\urel\testexecutelogengine.exe.map
+epoc32\release\armv5\urel\testexecutepipslogclient.dll
+epoc32\release\armv5\urel\testexecutepipslogclient.dll.map
+epoc32\release\armv5\urel\testexecutepipslogengine.exe
+epoc32\release\armv5\urel\testexecutepipslogengine.exe.map
+epoc32\release\armv5\urel\testexecuteutils.dll
+epoc32\release\armv5\urel\testexecuteutils.dll.map
+epoc32\release\armv5\urel\WrapperUtilsPlugin1.dll
+epoc32\release\armv5\urel\WrapperUtilsPlugin1.dll.map
+epoc32\release\winscw\udeb\gwstestexecute.exe
+epoc32\release\winscw\udeb\IniParser.dll
+epoc32\release\winscw\udeb\IniParser.lib
+epoc32\release\winscw\udeb\rfileloggerclient.dll
+epoc32\release\winscw\udeb\rfileloggerclient.lib
+epoc32\release\winscw\udeb\rfileloggerserver.exe
+epoc32\release\winscw\udeb\tefcleanup.exe
+epoc32\release\winscw\udeb\tefplatsec.exe
+epoc32\release\winscw\udeb\tefunit.lib
+epoc32\release\winscw\udeb\tefutilityserver.exe
+epoc32\release\winscw\udeb\tefutilityserverlite.exe
+epoc32\release\winscw\udeb\testexecute.exe
+epoc32\release\winscw\udeb\testexecutelite.exe
+epoc32\release\winscw\udeb\testexecutelogclient.dll
+epoc32\release\winscw\udeb\testexecutelogclient.lib
+epoc32\release\winscw\udeb\testexecutelogengine.exe
+epoc32\release\winscw\udeb\testexecutepipslogclient.dll
+epoc32\release\winscw\udeb\testexecutepipslogclient.lib
+epoc32\release\winscw\udeb\testexecutepipslogengine.exe
+epoc32\release\winscw\udeb\testexecuteutils.dll
+epoc32\release\winscw\udeb\testexecuteutils.lib
+epoc32\release\winscw\udeb\WrapperUtilsPlugin1.dll
+epoc32\release\winscw\udeb\WrapperUtilsPlugin1.lib
+epoc32\release\winscw\urel\gwstestexecute.exe
+epoc32\release\winscw\urel\gwstestexecute.exe.map
+epoc32\release\winscw\urel\IniParser.dll
+epoc32\release\winscw\urel\IniParser.dll.map
+epoc32\release\winscw\urel\rfileloggerclient.dll
+epoc32\release\winscw\urel\rfileloggerclient.dll.map
+epoc32\release\winscw\urel\rfileloggerserver.exe
+epoc32\release\winscw\urel\rfileloggerserver.exe.map
+epoc32\release\winscw\urel\tefcleanup.exe
+epoc32\release\winscw\urel\tefcleanup.exe.map
+epoc32\release\winscw\urel\tefplatsec.exe
+epoc32\release\winscw\urel\tefplatsec.exe.map
+epoc32\release\winscw\urel\tefunit.lib
+epoc32\release\winscw\urel\tefutilityserver.exe
+epoc32\release\winscw\urel\tefutilityserver.exe.map
+epoc32\release\winscw\urel\tefutilityserverlite.exe
+epoc32\release\winscw\urel\tefutilityserverlite.exe.map
+epoc32\release\winscw\urel\testexecute.exe
+epoc32\release\winscw\urel\testexecute.exe.map
+epoc32\release\winscw\urel\testexecutelite.exe
+epoc32\release\winscw\urel\testexecutelite.exe.map
+epoc32\release\winscw\urel\testexecutelogclient.dll
+epoc32\release\winscw\urel\testexecutelogclient.dll.map
+epoc32\release\winscw\urel\testexecutelogengine.exe
+epoc32\release\winscw\urel\testexecutelogengine.exe.map
+epoc32\release\winscw\urel\testexecutepipslogclient.dll
+epoc32\release\winscw\urel\testexecutepipslogclient.dll.map
+epoc32\release\winscw\urel\testexecutepipslogengine.exe
+epoc32\release\winscw\urel\testexecutepipslogengine.exe.map
+epoc32\release\winscw\urel\testexecuteutils.dll
+epoc32\release\winscw\urel\testexecuteutils.dll.map
+epoc32\release\winscw\urel\WrapperUtilsPlugin1.dll
+epoc32\release\winscw\urel\WrapperUtilsPlugin1.dll.map
+epoc32\rom\include\base_testexecutelite.iby
+epoc32\rom\include\iniparser.iby
+epoc32\rom\include\rfilelogger.iby
+epoc32\rom\include\tefcleanup.iby
+epoc32\rom\include\tefplatsec.iby
+epoc32\rom\include\tefutilityserver.iby
+epoc32\rom\include\testexecute.iby
+epoc32\rom\include\testexecutelogger.iby
+epoc32\rom\include\testexecutepipslogger.iby
+epoc32\rom\include\testexecutepipsloggerclient.iby
+epoc32\rom\include\wrapperutilsplugin.iby
+epoc32\winscw\c\system\data\testexecute.ini
+epoc32\include\testconfigfileparser.h
+epoc32\include\testconfigfileparser.inl
+epoc32\release\winscw\udeb\testconfigfileparser.dll
+epoc32\release\winscw\udeb\testconfigfileparser.lib
\ No newline at end of file
--- a/symbian3/single/job_props.ant.xml	Fri Apr 30 17:41:38 2010 +0100
+++ b/symbian3/single/job_props.ant.xml	Tue May 04 01:27:08 2010 +0100
@@ -34,7 +34,7 @@
 
     <!-- get full source env and binaries from pdk -->
     <property name="sf.spec.baseline.location"       value="\\v800008\Builds01\Releases\${sf.previous.pdk.tag}" />
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.6" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\PDT\overlay_default.8" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_2_sf" />
--- a/symbian3/single/sources.csv	Fri Apr 30 17:41:38 2010 +0100
+++ b/symbian3/single/sources.csv	Tue May 04 01:27:08 2010 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
--- a/symbian3/single/sources_3.0.h.csv	Fri Apr 30 17:41:38 2010 +0100
+++ b/symbian3/single/sources_3.0.h.csv	Tue May 04 01:27:08 2010 +0100
@@ -1,5 +1,4 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,changeset,78fc0271e9a7,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,5c9ca1e17dbb,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,d179868647e4,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
--- a/symbian3/single/sources_fcl.csv	Fri Apr 30 17:41:38 2010 +0100
+++ b/symbian3/single/sources_fcl.csv	Tue May 04 01:27:08 2010 +0100
@@ -1,6 +1,5 @@
 source,dst,type,pattern,sysdef
 http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,