# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1267728861 0
# Node ID e4c5389160b35b750c1d3e3ecf964fc9eaf1c097
# Parent eeffe74cd1b2245916e9b4015a9acd8c4beee829
Fix scan_antlogs.pl execution plus fix ConE calls to use PDT_HOME env variable
diff -r eeffe74cd1b2 -r e4c5389160b3 common/build.postbuild.xml
--- a/common/build.postbuild.xml Wed Mar 03 19:46:30 2010 +0000
+++ b/common/build.postbuild.xml Thu Mar 04 18:54:21 2010 +0000
@@ -359,6 +359,8 @@
<exec executable="perl" dir="${build.log.dir}" failonerror="false" output="${build.log.dir}/analysis/${build.id}_scan_ant.log">
<arg value="${sf.common.config.dir}/tools/analysis/scan_antlogs.pl"/>
<arg value="*ant*"/>
+ <arg value="*stderr*"/> <!-- helium 7 splits output into stderr logs, so use them also -->
+ <arg value="*sbs_error*"/>
</exec>
</target>
diff -r eeffe74cd1b2 -r e4c5389160b3 common/build.xml
--- a/common/build.xml Wed Mar 03 19:46:30 2010 +0000
+++ b/common/build.xml Thu Mar 04 18:54:21 2010 +0000
@@ -81,12 +81,12 @@
<!-- Import test functionality distributed into other file(s) -->
<import file="${sf.common.config.dir}/build.test.xml"/>
- <!-- helium 7 compatability. needs to be defined -->
+ <!-- helium 7+ compatability. needs to be defined -->
<if>
- <or>
- <equals arg1="${helium.version}" arg2="7.0"/>
- <equals arg1="${last.major.helium.version}" arg2="7.0"/>
- </or>
+ <not><or>
+ <equals arg1="${helium.version}" arg2="5.0"/>
+ <equals arg1="${last.major.helium.version}" arg2="5.0"/>
+ </or></not>
<then>
<property name="schema.new" value="true"/>
<property name="skip.sbs.parser.exception" value="true"/>
diff -r eeffe74cd1b2 -r e4c5389160b3 sf-platform/build.xml
--- a/sf-platform/build.xml Wed Mar 03 19:46:30 2010 +0000
+++ b/sf-platform/build.xml Thu Mar 04 18:54:21 2010 +0000
@@ -11,22 +11,22 @@
<!-- import package references -->
<import file="${sf.platform.config.dir}/platform_refs.ant.xml" optional="true"/>
-
- <!-- make this conditional! -->
- <import file="${sf.platform.config.dir}/compile.ant.xml"/>
- <!-- pre helium 7+ should import compile targets from compile-hlm-5.ant.xml >
+
+ <!-- pre helium 7+ should import compile targets from compile-hlm-5.ant.xml -->
<if>
<or>
- <equals arg1="${helium.version}" arg2="7.0"/>
- <equals arg1="${last.major.helium.version}" arg2="7.0"/>
+ <equals arg1="${helium.version}" arg2="5.0"/>
+ <equals arg1="${last.major.helium.version}" arg2="5.0"/>
</or>
<then>
-
+ <echo>INFO Importing HLM5 compile targets</echo>
+ <import file="${sf.platform.config.dir}/compile-hlm-5.ant.xml"/>
</then>
<else>
- <import file="${sf.platform.config.dir}/compile-hlm-5.ant.xml"/>
+ <echo>INFO Importing HLM7 compile targets</echo>
+ <import file="${sf.platform.config.dir}/compile.ant.xml"/>
</else>
- </if-->
+ </if>
<!-- MattD - workaround until generating a model from package definitions works-->
<target name="sf-build-noprep" depends="sf-platform-bootstrap,sf-compile,sf-postbuild">
@@ -211,13 +211,13 @@
<target name="sf-s60-cone-cenrep">
<!-- TODO: Make this better, as multiple exec calls are a bit clunky -->
- <if><available file="${helium.dir}/../ConE/" type="dir"/>
+ <if><available file="${env.PDT_HOME}/ConE/" type="dir"/>
<then>
<echo message="INFO Generating ConE CenRep"/>
<exec executable="cmd" dir="${build.drive}/epoc32/rom/config" failonerror="false" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-c"/>
<arg value="convert.confml"/>
@@ -227,7 +227,7 @@
<exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-p"/>
<arg value="\epoc32\rom\config"/>
@@ -241,7 +241,7 @@
<exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-p"/>
<arg value="\epoc32\rom\config"/>
@@ -255,7 +255,7 @@
<exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-p"/>
<arg value="\epoc32\rom\config"/>
@@ -269,7 +269,7 @@
<exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-p"/>
<arg value="\epoc32\rom\config"/>
@@ -283,7 +283,7 @@
<exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-p"/>
<arg value="\epoc32\rom\config"/>
@@ -297,7 +297,7 @@
<exec executable="cmd" dir="${build.drive}/epoc32/tools" failonerror="false" append="true" output="${build.log.dir}/${build.id}_cenrep.log">
<arg value="/c"/>
- <arg value="cone"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
<arg value="generate"/>
<arg value="-p"/>
<arg value="\epoc32\rom\config"/>
@@ -311,7 +311,7 @@
</then>
<else>
- <echo message="WARNING ConE is required to run this target. ConE not found, please update your PDT."/>
+ <echo message="WARNING ConE is required to run this target. ConE not found in ${env.PDT_HOME}/ConE/, please update your PDT."/>
</else>
</if>
</target>
diff -r eeffe74cd1b2 -r e4c5389160b3 sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml Wed Mar 03 19:46:30 2010 +0000
+++ b/sf-platform/compile.ant.xml Thu Mar 04 18:54:21 2010 +0000
@@ -23,7 +23,7 @@
<!-- compile sbs.tools.config and sbs.config. tools built only if its not being unpacked first.
note: must be called from sf-os/s60-compile targets, as sys model input needed -->
<target name="sf-do-compile">
- <echo message="INFO Using Helium 7 for sf-do-compile"/>
+ <echo message="INFO Using Helium 7+ for sf-do-compile"/>
<propertyregex property="sf.unpack.tools" override="true" input="${sf.spec.baseline.getenv_options}" regexp="-i tools" select="true" defaultValue="false" casesensitive="false"/>
<if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them -->
@@ -69,8 +69,8 @@
<arg line="-t ${sf.spec.sbs.retry.limit}"/>
<arg line="${sf.spec.sbs.options}"/>
<arg name="--filters" value=""${sf.spec.sbs.filter.list}""/>
- <arg name="--logfile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_compile.log" />
- <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_Makefile" />
+ <arg name="--logfile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_${sf.spec.os.sysdef.clean.configurations.list}_compile.log" />
+ <arg name="--makefile" value="${compile.log.dir}/${build.id}_@{item.sbs.splitconfig}_${sf.spec.os.sysdef.clean.configurations.list}_Makefile" />
</sbsOptions>
</hlm:sbsinput>
@@ -89,9 +89,9 @@
<propertyregex property="i.sf.spec.sbs.config.expanded" override="true" input="${i.sf.spec.sbs.config}" regexp="(,)" replace=" -c " defaultValue="${i.sf.spec.sbs.config}" global="true" casesensitive="false"/>
<propertyregex property="i.sf.spec.sbs.config.expanded.logname" override="true" input="${i.sf.spec.sbs.config}" regexp="(,)" replace="_" defaultValue="${i.sf.spec.sbs.config}" global="true" casesensitive="false"/>
<echo message="INFO Target : ${i.sf.spec.sbs.config.expanded}"/>
- <echo message="INFO Logname: ${i.sf.spec.sbs.config.expanded.logname}"/>
+ <echo message="INFO Logname: ${i.sf.spec.sbs.config.expanded.logname} + Config: ${sf.spec.os.sysdef.clean.configurations.list}"/>
- <!-- TODO: Make this use above compile-main call -->
+ <!-- TODO: Make this use above compile-main call? -->
<!-- define sbs args, log name etc -->
<hlm:sbsinput id="sf.build">
@@ -102,8 +102,8 @@
<arg line="-t ${sf.spec.sbs.retry.limit}"/>
<arg line="${sf.spec.sbs.options}"/>
<arg name="--filters" value=""${sf.spec.sbs.filter.list}""/>
- <arg name="--logfile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_compile.log" />
- <arg name="--makefile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_Makefile" />
+ <arg name="--logfile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sf.spec.os.sysdef.clean.configurations.list}_compile.log" />
+ <arg name="--makefile" value="${compile.log.dir}/${build.id}_${i.sf.spec.sbs.config.expanded.logname}_${sf.spec.os.sysdef.clean.configurations.list}_Makefile" />
</sbsOptions>
</hlm:sbsinput>