--- a/sf-platform/build.xml Mon Mar 15 16:24:22 2010 +0000
+++ b/sf-platform/build.xml Tue Mar 16 10:11:52 2010 +0000
@@ -175,21 +175,22 @@
<stopwatch name="sf-compile" action="elapsed"/>
</target>
- <target name="sf-s60-create-cenrep">
+ <target name="sf-s60-create-cenrep">
<echo message="INFO Generating CenRep"/>
<echo message="Move 'sf.spec.s60.cenrep.export.location' out of the build..."/>
<property name="sf.spec.s60.cenrep.export.location.1" value="/epoc32/rom/config/confml_data/s60"/>
<property name="sf.spec.s60.cenrep.export.location.2" value="/epoc32/rom/config/assets"/>
- <if><available file="${build.drive}/${sf.spec.s60.cenrep.export.location.1}" type="dir"/>
- <then>
- <property name="sf.spec.s60.cenrep.export.location" value="${sf.spec.s60.cenrep.export.location.1}"/>
+ <if><available file="${build.drive}/${sf.spec.s60.cenrep.export.location.1}" type="dir"/>
+ <then>
+ <property name="sf.spec.s60.cenrep.export.location" value="${sf.spec.s60.cenrep.export.location.1}"/>
</then>
<else>
- <property name="sf.spec.s60.cenrep.export.location" value="${sf.spec.s60.cenrep.export.location.2}"/>
+ <property name="sf.spec.s60.cenrep.export.location" value="${sf.spec.s60.cenrep.export.location.2}"/>
</else>
- </if>
- <echo message="${helium.dir}/../ConfigurationTool/cli_build.cmd -master_conf s60 -impl ${sf.spec.s60.cenrep.export.location} -confml ${sf.spec.s60.cenrep.export.location} -ignore_errors" />
+ </if>
+
+ <echo message="${helium.dir}/../ConfigurationTool/cli_build.cmd -master_conf s60 -impl ${sf.spec.s60.cenrep.export.location} -confml ${sf.spec.s60.cenrep.export.location} -ignore_errors" />
<exec executable="${helium.dir}/../ConfigurationTool/cli_build.cmd" dir="${build.drive}" failonerror="false" output="${build.log.dir}/${build.id}_create_cenrep.log">
<arg value="-master_conf"/>
<arg value="s60"/>
@@ -199,122 +200,122 @@
<arg value="${sf.spec.s60.cenrep.export.location}"/>
<arg value="-ignore_errors"/>
</exec>
-
- <if><available file="${build.drive}/cli_build_error.log" />
- <then>
- <echo message="INFO CenRep error log found, moving to ${build.log.dir}" />
- <move file="${build.drive}/cli_build_error.log" todir="${build.log.dir}" failonerror="false"/>
- </then>
- </if>
-
- </target>
-
- <target name="sf-s60-cone-cenrep">
- <!-- TODO: Make this better, as multiple exec calls are a bit clunky -->
- <if><available file="${env.PDT_HOME}/ConE/" type="dir"/>
- <then>
+
+ <if><available file="${build.drive}/cli_build_error.log" />
+ <then>
+ <echo message="INFO CenRep error log found, moving to ${build.log.dir}" />
+ <move file="${build.drive}/cli_build_error.log" todir="${build.log.dir}" failonerror="false"/>
+ </then>
+ </if>
+ </target>
+
+ <target name="sf-s60-cone-cenrep">
+ <!-- TODO: Make this better, as multiple exec calls are a bit clunky -->
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-c"/>
- <arg value="convert.confml"/>
- <arg value="-o"/>
- <arg value="."/>
- </exec>
+ <exec executable="cmd" dir="${build.drive}/epoc32/rom/config" failonerror="false" output="${build.log.dir}/${build.id}_cenrep.log">
+ <arg value="/c"/>
+ <arg value="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-c"/>
+ <arg value="convert.confml"/>
+ <arg value="-o"/>
+ <arg value="."/>
+ </exec>
- <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-p"/>
- <arg value="\epoc32\rom\config"/>
- <arg value="-o"/>
- <arg value="\epoc32\release\winscw\udeb\z"/>
- <arg value="-c"/>
- <arg value="s60_root.confml"/>
- <arg value="-v"/>
- <arg value="5"/>
- </exec>
-
- <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-p"/>
- <arg value="\epoc32\rom\config"/>
- <arg value="-o"/>
- <arg value="\epoc32\release\winscw\urel\z"/>
- <arg value="-c"/>
- <arg value="s60_root.confml"/>
- <arg value="-v"/>
- <arg value="5"/>
- </exec>
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-p"/>
+ <arg value="\epoc32\rom\config"/>
+ <arg value="-o"/>
+ <arg value="\epoc32\release\winscw\udeb\z"/>
+ <arg value="-c"/>
+ <arg value="s60_root.confml"/>
+ <arg value="-v"/>
+ <arg value="5"/>
+ </exec>
+
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-p"/>
+ <arg value="\epoc32\rom\config"/>
+ <arg value="-o"/>
+ <arg value="\epoc32\release\winscw\urel\z"/>
+ <arg value="-c"/>
+ <arg value="s60_root.confml"/>
+ <arg value="-v"/>
+ <arg value="5"/>
+ </exec>
- <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-p"/>
- <arg value="\epoc32\rom\config"/>
- <arg value="-o"/>
- <arg value="\epoc32\data\z"/>
- <arg value="-c"/>
- <arg value="s60_root.confml"/>
- <arg value="-v"/>
- <arg value="5"/>
- </exec>
-
- <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-p"/>
- <arg value="\epoc32\rom\config"/>
- <arg value="-o"/>
- <arg value="\epoc32\release\winscw\udeb\z"/>
- <arg value="-c"/>
- <arg value="symbianos_root.confml"/>
- <arg value="-v"/>
- <arg value="5"/>
- </exec>
-
- <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-p"/>
- <arg value="\epoc32\rom\config"/>
- <arg value="-o"/>
- <arg value="\epoc32\release\winscw\urel\z"/>
- <arg value="-c"/>
- <arg value="symbianos_root.confml"/>
- <arg value="-v"/>
- <arg value="5"/>
- </exec>
-
- <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="${env.PDT_HOME}/ConE/cone.cmd"/>
- <arg value="generate"/>
- <arg value="-p"/>
- <arg value="\epoc32\rom\config"/>
- <arg value="-o"/>
- <arg value="\epoc32\data\z"/>
- <arg value="-c"/>
- <arg value="symbianos_root.confml"/>
- <arg value="-v"/>
- <arg value="5"/>
- </exec>
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-p"/>
+ <arg value="\epoc32\rom\config"/>
+ <arg value="-o"/>
+ <arg value="\epoc32\data\z"/>
+ <arg value="-c"/>
+ <arg value="s60_root.confml"/>
+ <arg value="-v"/>
+ <arg value="5"/>
+ </exec>
+
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-p"/>
+ <arg value="\epoc32\rom\config"/>
+ <arg value="-o"/>
+ <arg value="\epoc32\release\winscw\udeb\z"/>
+ <arg value="-c"/>
+ <arg value="symbianos_root.confml"/>
+ <arg value="-v"/>
+ <arg value="5"/>
+ </exec>
- </then>
- <else>
- <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>
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-p"/>
+ <arg value="\epoc32\rom\config"/>
+ <arg value="-o"/>
+ <arg value="\epoc32\release\winscw\urel\z"/>
+ <arg value="-c"/>
+ <arg value="symbianos_root.confml"/>
+ <arg value="-v"/>
+ <arg value="5"/>
+ </exec>
+
+ <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="${env.PDT_HOME}/ConE/cone.cmd"/>
+ <arg value="generate"/>
+ <arg value="-p"/>
+ <arg value="\epoc32\rom\config"/>
+ <arg value="-o"/>
+ <arg value="\epoc32\data\z"/>
+ <arg value="-c"/>
+ <arg value="symbianos_root.confml"/>
+ <arg value="-v"/>
+ <arg value="5"/>
+ </exec>
+
+ </then>
+ <else>
+ <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>
</project>