Add localisation option to help build speed. Make 'single model' build the default, now that latest PDks are built that way.
--- a/PDK_Helium/config.xml Fri Feb 12 16:12:09 2010 +0000
+++ b/PDK_Helium/config.xml Fri Feb 12 16:16:20 2010 +0000
@@ -51,12 +51,24 @@
</hudson.model.BooleanParameterDefinition>
<hudson.model.BooleanParameterDefinition>
<name>SPLIT_BUILD</name>
- <description>Is the baseline run in two distinct steps (GT+S60). Tick this if -
+ <description>Is the baseline run in two distinct steps (GT+S60)? Tick this if -
<li> Building older Symbian^2 PDKs. e.g. 2.0.d or earlier.
-<li> Building current Symbian^3 PDKs.</description>
- <defaultValue>true</defaultValue>
+<li> Building older Symbian^3 PDKs. e.g. 3.0.f or earlier</description>
+ <defaultValue>false</defaultValue>
</hudson.model.BooleanParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
+ <name>LOCALISATION</name>
+ <description>Select whether to build more than one set of localised resources
+<li>engineering - just r01, results in quicker build
+<li>western - all defined language ids, build takes longer, but localised resources are created</description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>engineering</string>
+ <string>western</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
<name>SRC_LOCATION</name>
<description>How to get src for building the Platform.
<li>BOM - download source direct from <a href="https://developer.symbian.org/oss">web</a> using downloaded Bill Of Materials
@@ -103,7 +115,7 @@
<description>The tagged version of the FBF (Helium) to use to build the Platform.
<li>tip - is the latest revision from the web
<br><br>
-<i>Unless you want the latest changes, its recommended to use the revision that matches the build_BOM.zip downloaded</i>
+<i>Unless you want a specific revision, its recommended to use the tip revision of the FBF</i>
</description>
<choices class="java.util.Arrays$ArrayList">
<a class="string-array">
@@ -111,6 +123,9 @@
<string>PDK_2.0.2</string>
<string>PDK_2.0.1</string>
<string>PDK_2.0.0</string>
+ <string>PDK_3.0.g</string>
+ <string>PDK_3.0.f</string>
+ <string>PDK_3.0.e</string>
<string>PDK_3.0.d</string>
<string>PDK_3.0.c</string>
<string>PDK_3.0.b</string>
@@ -204,7 +219,7 @@
IF %REBUILD_TOOLS% == true set TOOLS_BASELINE_ENABLE=false
IF %REBUILD_TOOLS% == false set TOOLS_CONFIG=tools2_rel.whatlog
cd %BUILD_DRIVE%\maintools_%JOB_NAME%.%BUILD_NUMBER%\sf-config
-hlm sf-build-noprep -Dbuild.drive=%SUBST_DRIVE% -Dsf.spec.job.number=%JOB_NAME%.%BUILD_NUMBER% -Dsf.spec.job.codeline="%SRC_LOCATION%" -Dsf.project.location=%BUILD_DRIVE%\maintools_%JOB_NAME%.%BUILD_NUMBER%\build\config\%PLATFORM%\%PROJECT% -Dsf.spec.splitbuild=%SPLIT_BUILD% -Dsf.spec.sbs.config="%TARGET%" -Dsf.spec.baseline.enable=%TOOLS_BASELINE_ENABLE% -Dsf.spec.sbs.tools.config="%TOOLS_CONFIG%" -Dsf.spec.job.rootdir=%BUILD_DRIVE% -Dsf.suppress.buildenv.check=true -Dsf.suppress.drive.space.check=true -Dsf.spec.logs.raptorfilter.enable=false -Dsf.spec.publish.enable=false -Dsf.spec.package.bin.enable=false -Dsf.spec.test.sendpkg.enable=false</command>
+hlm sf-build-noprep -Dbuild.drive=%SUBST_DRIVE% -Dsf.spec.job.number=%JOB_NAME%.%BUILD_NUMBER% -Dsf.spec.job.codeline="%SRC_LOCATION%" -Dsf.project.location=%BUILD_DRIVE%\maintools_%JOB_NAME%.%BUILD_NUMBER%\build\config\%PLATFORM%\%PROJECT% -Dsf.spec.splitbuild=%SPLIT_BUILD% -Dsf.spec.sbs.config="%TARGET%" -Dsf.spec.baseline.enable=%TOOLS_BASELINE_ENABLE% -Dsf.spec.sbs.tools.config="%TOOLS_CONFIG%" -Dsf.spec.job.rootdir=%BUILD_DRIVE% -Dsf.suppress.buildenv.check=true -Dsf.suppress.drive.space.check=true -Dsf.spec.logs.raptorfilter.enable=false -Dsf.spec.publish.enable=false -Dsf.spec.package.bin.enable=false -Dsf.spec.test.sendpkg.enable=false -Dskip.sbs.layer.generation=true</command>
</hudson.tasks.BatchFile>
</builders>
<publishers/>
--- a/PDK_Raptor/config.xml Fri Feb 12 16:12:09 2010 +0000
+++ b/PDK_Raptor/config.xml Fri Feb 12 16:16:20 2010 +0000
@@ -44,10 +44,22 @@
<name>SPLIT_BUILD</name>
<description>Is the baseline run in two distinct steps (GT+S60). Tick this if -
<li> Building older Symbian^2 PDKs. e.g. 2.0.d or earlier.
-<li> Building current Symbian^3 PDKs.</description>
- <defaultValue>true</defaultValue>
+<li> Building older Symbian^3 PDKs. e.g. 3.0.f or earlier.</description>
+ <defaultValue>false</defaultValue>
</hudson.model.BooleanParameterDefinition>
<hudson.model.ChoiceParameterDefinition>
+ <name>LOCALISATION</name>
+ <description>Select whether to build more than one set of localised resources
+<li>engineering - just r01, results in quicker build
+<li>western - all defined language ids, build takes longer, but localised resources are created</description>
+ <choices class="java.util.Arrays$ArrayList">
+ <a class="string-array">
+ <string>engineering</string>
+ <string>western</string>
+ </a>
+ </choices>
+ </hudson.model.ChoiceParameterDefinition>
+ <hudson.model.ChoiceParameterDefinition>
<name>SRC_LOCATION</name>
<description>How to get src for building the Platform.
<li>BOM - download source direct from <a href="https://developer.symbian.org/oss">web</a> using downloaded Bill Of Materials
@@ -191,7 +203,7 @@
%SUBST_DRIVE%
set HG_PASSWORD=
cd\
-cmd /c sbs EXPORT %TARGET% --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\deviceplatformrelease\sf_config\config\western\group\bld.inf
+cmd /c sbs EXPORT %TARGET% --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\deviceplatformrelease\sf_config\config\%LOCALISATION%\group\bld.inf
cmd /c sbs EXPORT %TARGET% --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\deviceplatformrelease\sf_config\config\group\bld.inf
cmd /c sbs EXPORT %TARGET% --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\devicesrv\devicesrv_pub\platform_path_definitions_api\group\bld.inf
cmd /c sbs EXPORT %TARGET% --ignore-os-detection --export-only -b %SUBST_DRIVE%\sf\os\devicesrv\devicesrv_pub\common_platform_security_definitions_api\group\bld.inf
@@ -305,14 +317,14 @@
IF %PLATFORM% == symbian2 GOTO RUN_CENREP
cd \epoc32\rom\config
-cone generate -c convert.confml -o .
+cmd /c cone generate -c convert.confml -o .
cd \epoc32\tools
-cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\urel\z -c s60_root.confml
-cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\udeb\z -c s60_root.confml
-cone generate -p \epoc32\rom\config -o \epoc32\data\z -c s60_root.confml
-cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\urel\z -c symbianos_root.confml
-cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\udeb\z -c symbianos_root.confml
-cone generate -p \epoc32\rom\config -o \epoc32\data\z -c symbianos_root.confml
+cmd /c cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\urel\z -c s60_root.confml
+cmd /c cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\udeb\z -c s60_root.confml
+cmd /c cone generate -p \epoc32\rom\config -o \epoc32\data\z -c s60_root.confml
+cmd /c cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\urel\z -c symbianos_root.confml
+cmd /c cone generate -p \epoc32\rom\config -o \epoc32\release\winscw\udeb\z -c symbianos_root.confml
+cmd /c cone generate -p \epoc32\rom\config -o \epoc32\data\z -c symbianos_root.confml
exit 0
:RUN_CENREP