# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1272479281 -3600
# Node ID bc818b5bb6d9c8e760c1a0014ba7dea59488cb6a
# Parent  4bfee1aab881c68cb5296489f70994e4bac72c3e
Simplify compilation by requiring a prebuilt qmake, which will generate bld.infs first.

diff -r 4bfee1aab881 -r bc818b5bb6d9 sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml	Wed Apr 28 19:11:35 2010 +0100
+++ b/sf-platform/compile.ant.xml	Wed Apr 28 19:28:01 2010 +0100
@@ -27,6 +27,13 @@
     
     <propertyregex property="sf.unpack.tools" override="true" input="${sf.spec.baseline.getenv_options}" regexp="-i tools" select="true" defaultValue="false" casesensitive="false"/>
 
+    <!-- explicitly run qmake once, as iterative build will repeat the step. if qmake is not unpacked already, then this step is skipped  -->
+    <antcall target="run-qmake" inheritAll="false" inheritRefs="true">
+      <param name="qmake.enabled" value="true"/>
+      <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
+    </antcall>
+
+
     <!-- perform initial exports -->
     <antcall target="sf-do-full-export" inheritAll="false" inheritRefs="true">
         <param name="sf.export.stage.name" value="full_export"/>
@@ -50,18 +57,7 @@
         <echo message="INFO Skipping tools build, tools were unpacked from ${sf.spec.baseline.location}"/>        
       </else>
       </if>
-      
-	  <!-- explicitly run qmake once, as iterative build will repeat the step  -->
-	  <antcall target="run-qmake" inheritAll="false" inheritRefs="true">
-	      <param name="qmake.enabled" value="true"/>
-              <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
-	  </antcall>
-	  
-	  <!-- perform exports for bld.infs generated by qmake -->
-	  <antcall target="sf-do-full-export" inheritAll="false" inheritRefs="true">
-	      <param name="sf.export.stage.name" value="post_qmake_export"/>
-	  </antcall>	  
-	  
+      	  	  
       <!-- sf.spec.sbs.config param used. do-target-build will decide to build sequentially/together -->
       <antcall target="sf-do-target-compile" inheritAll="false" inheritRefs="true">
           <param name="i.sf.spec.sbs.config" value="${sf.spec.sbs.config}" />