# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1265047102 0
# Node ID 11f6b5e5cd2de66e208666087ed596d591423d24
# Parent  a2ab739ff0b087523123faef9cc39d60dbc31d31
Add ConE or ConfigurationTool support. ConfigurationTool is used for Symbian2 only.

diff -r a2ab739ff0b0 -r 11f6b5e5cd2d sf-platform/build.xml
--- a/sf-platform/build.xml	Mon Feb 01 11:35:14 2010 +0000
+++ b/sf-platform/build.xml	Mon Feb 01 17:58:22 2010 +0000
@@ -151,7 +151,15 @@
     </if>
 
     <!-- always run cenrep -->
-    <runtarget target="sf-s60-create-cenrep"/>
+    <if><equals arg1="${sf.spec.job.name}" arg2="symbian2"/>
+    <then>
+        <runtarget target="sf-s60-create-cenrep"/>
+    </then>
+    <else>
+        <!-- symbian3+ should use ConE -->
+        <runtarget target="sf-s60-cone-cenrep"/>
+    </else>
+    </if>
     <stopwatch name="sf-compile" action="elapsed"/>
   </target>
 
@@ -507,6 +515,99 @@
 		</if>
 		
 	</target>
+    
+    <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"/>
+        <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="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="cone"/>
+              <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="cone"/>
+              <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="cone"/>
+              <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="cone"/>
+              <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="cone"/>
+              <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, please update your PDT."/>
+        </else>
+        </if>
+    </target>
+    
 </project>