--- a/common/templates/source-spec.ant.xml.ftl Wed Oct 21 13:54:33 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl Mon Oct 26 19:53:47 2009 +0000
@@ -134,6 +134,10 @@
<arg value="log"/>
<arg value="-r"/>
<arg value="${dollar}{sf.sourcesync.${count}.checksum}:${dollar}{sf.previous.pdk.tag}"/>
+ <#if "${pkg_detail.type}"=="branch">
+ <arg value="-b"/>
+ <arg value="${pkg_detail.pattern}"/>
+ </#if>
</exec>
</sequential>
</target>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/coretelephony/coretelephony.pl Mon Oct 26 19:53:47 2009 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+# Brendan Donegan <brendand@symbian.org>
+#
+# Description:
+# Script to build ATS test drop for BC RTC Core Telephony tests
+
+
+use strict;
+use File::Copy;
+use File::Path;
+
+unlink "coretelephony.zip";
+rmtree "temp";
+mkpath "temp/rtcct/winscw_udeb";
+
+my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
+copy("coretelephony.xml", "temp/test.xml");
+
+copy($epoc . "release/winscw/udeb/BCLogEngineTest.dll", "temp/rtcct/winscw_udeb/BCLogEngineTest.dll") or die "failed : $!";
+
+system("7z a -tzip coretelephony.zip ./temp/*");
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/bctest/coretelephony/coretelephony.xml Mon Oct 26 19:53:47 2009 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<test>
+ <id>1</id>
+ <owner>admin</owner>
+ <priority>10</priority>
+ <buildid></buildid>
+ <name>RTC Core Telephony BC Tests</name>
+ <target>
+ <device rank="master" alias="emulator_udeb">
+ <property name="HARNESS" value="ATSINTERFACE" />
+ </device>
+ </target>
+ <plan id="" name="RTC Core Telephony BC WINSCW UDEB" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <target>
+ <device rank="master" alias="emulator_udeb"/>
+ </target>
+ <session id="" name="RTC Core Telephony Binary Compatibility Tests" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <set id="" name="RTC Core Telephony" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <case id="" name="Core Telephony Log Engine API" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <step id="" name="SPD_Logs XML (makedir)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>makedir</command>
+ <params>
+ <param dir="c:\spd_logs\xml" />
+ </params>
+ </step>
+ <step id="" name="BCLogEngineTest.dll (install)" harness="ATSINTERFACE" enabled="true" passrate="100" significant="false">
+ <command>install</command>
+ <params>
+ <param type="binary"/>
+ <param src="BCLogEngineTest.dll"/>
+ <param dst="c:\sys\bin\BCLogEngineTest.dll"/>
+ <param component-path="rtcct" />
+ </params>
+ </step>
+ <step id="" name="BCLogEngineTest (execute)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>execute</command>
+ <params>
+ <param file="atsinterface.exe"/>
+ <param parameters="-testmodule BCLogEngineTest"/>
+ <param result-file="c:\spd_logs\xml\BCLogEngineTest.xml"/>
+ <param timeout="3600"/>
+ </params>
+ </step>
+ <step id="" name="BCLogEngineTest (fetch-log)" harness="ATSINTERFACE" enabled="true" passrate="100">
+ <command>fetch-log</command>
+ <params>
+ <param path="c:\logs\testframework\TestReport.txt" />
+ </params>
+ </step>
+ </case>
+ </set>
+ </session>
+ </plan>
+ <files>
+ <file>rtcct/winscw_udeb/BCLogEngineTest.dll</file>
+ </files>
+</test>
\ No newline at end of file
--- a/common/tools/ats/bctest/package_definition.xml Wed Oct 21 13:54:33 2009 +0100
+++ b/common/tools/ats/bctest/package_definition.xml Mon Oct 26 19:53:47 2009 +0000
@@ -157,10 +157,10 @@
<command cmd="&cmd.update; ¶m.updatebranch;" dir="interim/fbf/configs/default" />
<command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/app/contacts sf/app/contacts" />
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/app/contacts" />
+ <command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/app/location sf/app/location" />
+ <command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/app/location" />
<command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/app/messaging sf/app/messaging" />
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/app/messaging" />
- <command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/app/location sf/app/location" />
- <command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/app/location" />
<command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/mw/appinstall sf/mw/appinstall" />
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/mw/appinstall" />
<command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/mw/appsupport sf/mw/appsupport" />
@@ -185,7 +185,7 @@
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/os/kernelhwsrv" />
<command cmd="&cmd.clone; &codeline.sfl.mcl;/sf/os/mm sf/os/mm" />
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/os/mm" />
- <command cmd="&cmd.clone; &codeline.sfl.mcl;/sf/os/ossrv sf/os/ossrv" />
+ <command cmd="&cmd.clone; &codeline.sfl.fcl;/sf/os/ossrv sf/os/ossrv" />
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/os/ossrv" />
<command cmd="&cmd.clone; &codeline.sfl.mcl;/sf/os/shortlinksrv sf/os/shortlinksrv" />
<command cmd="&cmd.update; ¶m.updatebranch;" dir="sf/os/shortlinksrv" />
@@ -197,12 +197,24 @@
</meta>
</layer>
<layer name="bld_production" long-name="Binary Compatability Production code build" levels="generic specific">
+ <collection name="xvid" long-name="XVid">
+ <component id="xvid" name="XVid">
+ <unit bldFile="xvidpu/group" />
+ <unit bldFile="xvidhwdevice/group" />
+ </component>
+ </collection>
<collection name="multimediasvs" long-name="SVS Multimedia API Tests">
<component id="mmtestenv" name="Multimedia Test Framework Server">
<unit bldFile="sf/os/mm/mmtestenv/mmtestfw/group" />
</component>
</collection>
<collection name="ossrv" long-name="OS Services">
+ <component id="glib" name="glib">
+ <unit bldFile="sf/os/ossrv/glib/tsrc/BC/group" />
+ </component>
+ <component id="ssl" name="ssl">
+ <unit bldFile="sf/os/ossrv/ssl/tsrc/BC/group" />
+ </component>
<component id="stdcpp" name="Standard C++">
<unit bldFile="sf/os/ossrv/stdcpp/tsrc/BC/group" />
</component>
@@ -216,12 +228,19 @@
<collection name="appsupport" long-name="Application Support Middleware">
<component id="appsupport_pub" name="Application Support Middleware Puplic">
<unit bldFile="sf/mw/appsupport/appsupport_pub/flash_viewer_framework_api/tsrc/bc/flashviewerframework/group" />
+ <unit bldFile="sf/mw/appsupport/appsupport_pub/network_status_api/tsrc/bc/networkstatus/group" />
<unit bldFile="sf/mw/appsupport/appsupport_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/group" />
</component>
</collection>
+ <collection name="classicui" long-name="Classic UI">
+ <component id="classicui_pub" name="Classic UI Public">
+ <unit bldFile="sf/mw/classicui/classicui_pub/tsrc/bc/group" />
+ </component>
+ </collection>
<collection name="drm" long-name="DRM Middleware">
<component id="drm_pub" name="DRM Middleware Public">
- <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/group" />
+ <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/group" />
+ <unit bldFile="sf/mw/drm/drm_pub/oma_drm_caf_agent_api/tsrc/bc/BCDRMCAFCAPS_exe/group" />
</component>
</collection>
<collection name="locationsrv" long-name="Location Server Middleware">
@@ -236,12 +255,12 @@
</collection>
<collection name="websrv" long-name="Web Services Middleware">
<component id="websrv_pub" name="Web Services Middleware Public">
+ <unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group" />
<unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/connection/group" />
- <unit bldFile="sf/mw/websrv/websrv_pub/hostlet_connection_api/tsrc/bc/hostconn/group" />
- <unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group" />
+ <unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/bc/senutils/group" />
<unit bldFile="sf/mw/websrv/websrv_pub/web_service_description_api/tsrc/bc/senservdesc/group" />
<unit bldFile="sf/mw/websrv/websrv_pub/web_service_manager_api/tsrc/bc/senservicemanager/group" />
- <unit bldFile="sf/mw/websrv/websrv_pub/web_service_connection_api/tsrc/senutils/group" />
+ <unit bldFile="sf/mw/websrv/websrv_pub/web_service_messaging_api/tsrc/bc/newsoapclasses/group" />
</component>
</collection>
<collection name="contacts" long-name="Contacts Application">
@@ -276,14 +295,13 @@
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_database_management_api/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LandmarksEngine/landmarks_search_api/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/location/apps/LocationFW/LocAquisition/group" />
- <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/apps/mrt/apps/glib/group" />
- <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/apps/mrt/apps/ssl/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/multimedia/apps/BCAppContentManagement/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/networking/apps/ConnectionSettings/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/networking/apps/ConnectionSettingsUI/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/rtcct/apps/BCLogEngineTest/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/rtcct/apps/IsvTelephonyTest/group" />
<unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/systemsw/apps/cenrepnotifyhandler/group" />
+ <unit bldFile="sftools/ana/compatanamdw/apicompatanamdw/bcdrivers/src/bcdrivers/apps/systemsw/apps/SystemSWMisc50Test/group" />
</component>
</collection>
</layer>
--- a/common/tools/ats/bctest/ssl/ssl.xml Wed Oct 21 13:54:33 2009 +0100
+++ b/common/tools/ats/bctest/ssl/ssl.xml Mon Oct 26 19:53:47 2009 +0000
@@ -73,7 +73,7 @@
<params>
<param type="data"/>
<param src="testframework/evptests.txt"/>
- <param dst="c:\testframework\evptests.txt"/>
+ <param dst="c:\evptests.txt"/>
<param component-path="ssltest" />
</params>
</step>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/lon-engbuild87/EMULATOR_ATSINTERFACE_LON-ENGBUILD87.properties Mon Oct 26 19:53:47 2009 +0000
@@ -0,0 +1,24 @@
+
+NAME=ATSINTERFACE EMULATOR on LON-ENGBUILD87
+
+CATEGORY=hardware
+
+TYPE=WINSCW
+
+CONNECTION=emulator
+
+TEMPDIR=D:\\ats3
+
+CLASS=RTestableDevice
+
+HARNESS=ATSINTERFACE
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=WINSCW
+BUILD=udeb
+
+IMAGE=winscw_smoketest
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/ats/devices/lon-engbuild89/EMULATOR_ATSINTERFACE_LON-ENGBUILD89.properties Mon Oct 26 19:53:47 2009 +0000
@@ -0,0 +1,24 @@
+
+NAME=ATSINTERFACE EMULATOR on LON-ENGBUILD89
+
+CATEGORY=hardware
+
+TYPE=WINSCW
+
+CONNECTION=emulator
+
+TEMPDIR=D:\\ATS3
+
+CLASS=RTestableDevice
+
+HARNESS=ATSINTERFACE
+
+#reinstall files after reboot
+REINSTALL=false
+
+PLATFORM=WINSCW
+BUILD=udeb
+
+IMAGE=winscw_smoketest
+
+
--- a/common/tools/ats/smoketest/apploader/scripts/smoketest_apploader.script Wed Oct 21 13:54:33 2009 +0100
+++ b/common/tools/ats/smoketest/apploader/scripts/smoketest_apploader.script Mon Oct 26 19:53:47 2009 +0000
@@ -68,3 +68,27 @@
//! @SYMTestCaseDesc Send key events to close UI setup dialogs
RUN_TEST_STEP 1000 smoketest_apploader KeyEvents c:\smoketest\smoketest_apploader.ini SMOKE_APP_KEYEVENTS_0008
END_TESTCASE SMOKE_APP_LAUNCH_0008
+
+START_TESTCASE SMOKE_APP_LAUNCH_0009
+//! @SYMTestCaseID SMOKE_APP_LAUNCH_0009
+//! @SYMTestCaseDesc Start Eshell and end it
+ RUN_TEST_STEP 1000 smoketest_apploader AppStart c:\smoketest\smoketest_apploader.ini SMOKE_APP_LAUNCH_0009
+ DELAY 5000
+ RUN_TEST_STEP 1000 smoketest_apploader EndTask c:\smoketest\smoketest_apploader.ini SMOKE_APP_END_0009
+END_TESTCASE SMOKE_APP_LAUNCH_0009
+
+START_TESTCASE SMOKE_APP_LAUNCH_0010
+//! @SYMTestCaseID SMOKE_APP_LAUNCH_0010
+//! @SYMTestCaseDesc Start Media player and end it
+ RUN_TEST_STEP 1000 smoketest_apploader AppStart c:\smoketest\smoketest_apploader.ini SMOKE_APP_LAUNCH_0010
+ DELAY 5000
+ RUN_TEST_STEP 1000 smoketest_apploader EndTask c:\smoketest\smoketest_apploader.ini SMOKE_APP_END_0010
+END_TESTCASE SMOKE_APP_LAUNCH_0010
+
+START_TESTCASE SMOKE_APP_LAUNCH_0011
+//! @SYMTestCaseID SMOKE_APP_LAUNCH_0011
+//! @SYMTestCaseDesc Start Notepad and end it
+ RUN_TEST_STEP 1000 smoketest_apploader AppStart c:\smoketest\smoketest_apploader.ini SMOKE_APP_LAUNCH_0011
+ DELAY 5000
+ RUN_TEST_STEP 1000 smoketest_apploader EndTask c:\smoketest\smoketest_apploader.ini SMOKE_APP_END_0011
+END_TESTCASE SMOKE_APP_LAUNCH_0011
\ No newline at end of file
--- a/common/tools/ats/smoketest/apploader/testdata/smoketest_apploader.ini Wed Oct 21 13:54:33 2009 +0100
+++ b/common/tools/ats/smoketest/apploader/testdata/smoketest_apploader.ini Mon Oct 26 19:53:47 2009 +0000
@@ -36,3 +36,21 @@
delay4 =5000
key5 =EKeyDevice1
delay5 =5000
+
+[SMOKE_APP_LAUNCH_0009]
+program =eshell.exe
+
+[SMOKE_APP_END_0009]
+program =ESHELL
+
+[SMOKE_APP_LAUNCH_0010]
+program =mpx.exe
+
+[SMOKE_APP_END_0010]
+program =Music player
+
+[SMOKE_APP_LAUNCH_0011]
+program =Notepad.exe
+
+[SMOKE_APP_END_0011]
+program =Notes
--- a/sf-package/build.xml Wed Oct 21 13:54:33 2009 +0100
+++ b/sf-package/build.xml Mon Oct 26 19:53:47 2009 +0000
@@ -29,124 +29,41 @@
</target>
<target name="sf-package-compile" depends="sf-compile-options">
+
+ <for list="${sf.spec.sbs.config}" delimiter="," param="item.sbs.splitconfig">
+ <sequential>
+ <echo message="INFO [Iterative compile] Building target: @{item.sbs.splitconfig}"/>
- <!-- BUILD tools2_rel CLEAN -->
- <!--
- <hlm:argSet id="sbs.tools2_rel.clean.var">
- <hlm:arg name="config" value="tools2_rel" />
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}"/>
- <hlm:arg name="command" value="CLEAN"/>
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.tools2_rel.clean.var" torefid="sbs.var" />
- <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
- -->
-
- <!-- BUILD tools2_rel -->
- <hlm:argSet id="sbs.tools2_rel.var">
- <hlm:arg name="config" value="tools2_rel.whatlog" />
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.tools2_rel.var" torefid="sbs.var" />
- <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
-
- <!-- BUILD tools CLEAN -->
- <!--
- <hlm:argSet id="sbs.tools.clean.var">
- <hlm:arg name="config" value="tools"/>
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- <hlm:arg name="command" value="CLEAN"/>
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.tools.clean.var" torefid="sbs.var" />
- <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
- -->
-
- <!-- BUILD tools -->
- <!--
- <hlm:argSet id="sbs.tools.var">
- <hlm:arg name="config" value="tools.whatlog"/>
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.tools.var" torefid="sbs.var" />
- <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
- -->
-
- <!-- BUILD winscw CLEAN -->
- <!--
- <hlm:argSet id="sbs.winscw.clean.var">
- <hlm:arg name="config" value="winscw" />
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- <hlm:arg name="command" value="CLEAN"/>
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.winscw.clean.var" torefid="sbs.var" />
- <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
- -->
-
- <!-- BUILD winscw -->
- <hlm:argSet id="sbs.winscw.var">
- <hlm:arg name="config" value="winscw.whatlog" />
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.winscw.var" torefid="sbs.var" />
- <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
-
- <!-- BUILD armv5 CLEAN -->
- <!--
- <hlm:argSet id="sbs.armv5.clean.var">
- <hlm:arg name="config" value="armv5" />
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- <hlm:arg name="command" value="CLEAN"/>
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.armv5.clean.var" torefid="sbs.var" />
- <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
- -->
-
- <!-- BUILD armv5 -->
- <hlm:argSet id="sbs.armv5.var">
- <hlm:arg name="config" value="armv5.whatlog" />
- <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
- </hlm:argSet>
- <antcall target="compile-main" inheritAll="false" inheritRefs="true">
- <param name="build.system" value="${sf.spec.build.system}" />
- <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
- <reference refid="sbs.armv5.var" torefid="sbs.var" />
- <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
- <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
- </antcall>
+ <!-- Do CLEAN
+ <hlm:argSet id="sbs.iterate.clean.var">
+ <hlm:arg name="config" value="@{item.sbs.splitconfig}" />
+ <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+ <hlm:arg name="command" value="CLEAN"/>
+ </hlm:argSet>
+ <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+ <param name="build.system" value="${sf.spec.build.system}" />
+ <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
+ <reference refid="sbs.iterate.clean.var" torefid="sbs.var" />
+ <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+ <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+ </antcall>
+ -->
+
+ <!-- Do BUILD -->
+ <hlm:argSet id="sbs.main.iterate.sbs.var">
+ <hlm:arg name="config" value="@{item.sbs.splitconfig}" />
+ <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
+ <hlm:arg name="retry-limit" value="${sf.spec.sbs.retry.limit}" />
+ </hlm:argSet>
+ <antcall target="compile-main" inheritAll="false" inheritRefs="true">
+ <param name="build.system" value="${sf.spec.build.system}" />
+ <param name="sysdef.configurations.list" value="${sf.spec.sysdef.configurations.list}" />
+ <reference refid="sbs.main.iterate.sbs.var" torefid="sbs.var" />
+ <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
+ <reference refid="sf.spec.system.definition.files" torefid="system.definition.files" />
+ </antcall>
+ </sequential>
+ </for>
<!-- CHECK -->
<exec executable="cmd" dir="${build.drive}/" output="${build.drive}/output\logs\build_check_compile.log">
--- a/sf-package/package_props.ant.xml Wed Oct 21 13:54:33 2009 +0100
+++ b/sf-package/package_props.ant.xml Mon Oct 26 19:53:47 2009 +0000
@@ -24,7 +24,7 @@
<property name="sf.spec.systemdefinition.location" value="\definition.xml"/>
<property name="sf.spec.sysdef.configurations.list" value="SF"/>
- <property name="sf.spec.sbs.config" value="winscw"/>
+ <property name="sf.spec.sbs.config" value="tools2_rel.whatlog,winscw.whatlog,armv5.whatlog"/>
<property name="sf.spec.sbs.numberofjobs" value="2"/>
<property name="sf.spec.logs.raptorfilter.enable" value="false"/>