# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1272477885 -3600
# Node ID 92dd719cc91b2474259cfc7ce53142b8fbe10982
# Parent  64899060ea4db1e50891176d0cf823e387cc14b4# Parent  6c90564578a6d339ee9982b22b2a6cc130110008
Merge

diff -r 64899060ea4d -r 92dd719cc91b common/templates/run-qmake.ant.xml.ftl
--- a/common/templates/run-qmake.ant.xml.ftl	Wed Apr 28 18:02:45 2010 +0100
+++ b/common/templates/run-qmake.ant.xml.ftl	Wed Apr 28 19:04:45 2010 +0100
@@ -2,9 +2,15 @@
 <project name="run-qmake-${ant['sysdef.configuration']}" default="all">
 
     <target name="all">
+    <if><available file="${r'$'}{build.drive}/epoc32/tools/qmake.bat" type="file"/>
+    <then>
+
         <parallel threadCount="${r'$'}{number.of.threads}">
     <#list data["//unit/@proFile/.."] as unit>
             <sequential>
+
+          <#if (unit.@proFile!="hb.pro")>
+
                 <echo>Running qmake for ${unit.@bldFile}/${unit.@proFile}</echo>
                 <if>
                     <available file="${r'$'}{build.drive}/${unit.@bldFile}" type="dir"/>
@@ -25,9 +31,32 @@
                        <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/>
                     </else>
                 </if>
+          <#else>
+
+                <echo>Running configure.py 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="python"/>
+                            <arg line ="configure.py --qmake-bin=\epoc32\tools\qmake.bat --qmake-spec=symbian-sbsv2 --platform=symbian --qmake-options=MMP_RULES+=EXPORTUNFROZEN"/>
+                        </exec>
+                    </then>
+                    <else>
+                       <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/>
+                    </else>
+                </if>
+          
+	  </#if>
+
+
             </sequential>
     </#list>
         </parallel>
+
+    </then>
+    </if>
     </target>
     
 </project>