# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1274889937 -3600
# Node ID f3a459ab2cfe399a2c742863ce95492293bead68
# Parent  ee03efed9e3ce427d26e53dac9d08f3a0890c8ef
Run qmake after exports too, to allow -configure options to be applied

diff -r ee03efed9e3c -r f3a459ab2cfe common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl	Wed May 26 13:46:40 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl	Wed May 26 17:05:37 2010 +0100
@@ -3,6 +3,8 @@
 
     <target name="all">
 
+    <if><not><available file="${r'$'}{build.drive}/epoc32/tools/qt/qmake.exe" type="file"/></not>
+    <then>
 	        <sequential>
 
 	<#list data["//unit/@bldFile/.."] as unit>
@@ -24,7 +26,8 @@
 	      </#if>
     </#list>			
 			</sequential>
-
+    </then>
+    </if>
 	        <sequential>
 
 	<#list data["//unit/@bldFile/.."] as unit>
@@ -76,7 +79,7 @@
     <#list data["//unit/@proFile/.."] as unit>
             <sequential>
 
-          <#if (unit.@proFile!="projects.pro" && unit.@proFile!="hb.pro")>
+          <#if (unit.@proFile!="hb.pro")>
 
                 <echo>Running qmake for ${unit.@bldFile}/${unit.@proFile}</echo>
                 <if>
@@ -104,33 +107,6 @@
             </sequential>
     </#list>
         </parallel>
-
-            <sequential>
-    <#list data["//unit/@proFile/.."] as unit>
-          <#if (unit.@proFile="projects.pro")>
-                <echo>Running qmake for ${unit.@bldFile}/${unit.@proFile}</echo>
-                <if>
-                    <available file="${r'$'}{build.drive}/${unit.@bldFile}" type="dir"/>
-                    <then>
-                        <exec executable="cmd" dir="${r'$'}{build.drive}/${unit.@bldFile}" failonerror="false">
-                            <arg value="/C"/>
-                            <arg value="qmake"/>
-                            <!-- arg value="-listgen"/ -->
-                            <#if unit.@qmakeArgs[0]??>
-                            <arg line="${unit.@qmakeArgs?xml}"/>
-                            <#else>
-                            <arg line="${ant['qt.qmake.default.args']?xml}"/>
-                            </#if>
-                            <arg value="${unit.@proFile?xml}"/>
-                        </exec>
-                    </then>
-                    <else>
-                       <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/>
-                    </else>
-                </if>          
-	  </#if>
-    </#list>
-            </sequential>
     </target>
     
 </project>
diff -r ee03efed9e3c -r f3a459ab2cfe sf-platform/compile.ant.xml
--- a/sf-platform/compile.ant.xml	Wed May 26 13:46:40 2010 +0100
+++ b/sf-platform/compile.ant.xml	Wed May 26 17:05:37 2010 +0100
@@ -33,11 +33,16 @@
       <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"/>
     </antcall>	  
+
+    <!-- explicitly run qmake second time to allow -configure options to be applied -->
+    <antcall target="run-qmake" inheritAll="false" inheritRefs="true">
+      <param name="qmake.enabled" value="true"/>
+      <param name="sysdef.configuration" value="${sysdef.configurations.list}"/>
+    </antcall>
 	
     <if> <!-- If tools baseline unpack has not been specified, or its not a "fast" build then try to build them -->
       <or>