# HG changeset patch
# User Johan Groth <johang@symbian.org>
# Date 1286805070 -3600
# Node ID acc4b03313f03519e72d8e63fcb1f9fabed67778
# Parent  c79c5ad11c63a6627249f396cf09afeaa5d547d8# Parent  7fa08dafc6b9b7421f92bde6a44ab7aedc3aca3d
Merge.

diff -r c79c5ad11c63 -r acc4b03313f0 sf-tools/build.xml
--- a/sf-tools/build.xml	Fri Oct 08 15:18:03 2010 +0100
+++ b/sf-tools/build.xml	Mon Oct 11 14:51:10 2010 +0100
@@ -3,6 +3,9 @@
   <!-- location of this config -->
   <dirname property="sf.tools.config.dir" file="${ant.file.SF-TOOLS-CONFIG}"/>
 
+  <!-- tools template -->
+  <property name="qt.qmake.ant.template" value="${sf.tools.config.dir}/templates/run-qmake.ant.xml.ftl"/>
+
   <!-- import package properties -->
   <import file="${sf.tools.config.dir}/tools_props.ant.xml" optional="true"/>
   
@@ -62,6 +65,12 @@
   
  <target name="sf-compile" depends="sf-platform-bootstrap-gt">
 
+    <!-- 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>
+
    <!-- turn comma separated list into sbs friendly -c list, and _ separated list for friendly log names -->
    <propertyregex property="i.sf.spec.sbs.config.expanded"         override="true" input="${sf.spec.sbs.config}" regexp="(,)" replace=" -c " defaultValue="${sf.spec.sbs.config}" global="true"  casesensitive="false"/>
    <propertyregex property="i.sf.spec.sbs.config.expanded.logname" override="true" input="${sf.spec.sbs.config}" regexp="(,)" replace="_"    defaultValue="${sf.spec.sbs.config}" global="true"  casesensitive="false"/>
diff -r c79c5ad11c63 -r acc4b03313f0 sf-tools/run-qmake.ant.xml.ftl
--- a/sf-tools/run-qmake.ant.xml.ftl	Fri Oct 08 15:18:03 2010 +0100
+++ b/sf-tools/run-qmake.ant.xml.ftl	Mon Oct 11 14:51:10 2010 +0100
@@ -1,29 +1,34 @@
 <?xml version="1.0"?>
 <project name="run-qmake" default="all">
 
-    <target name="all" depends="sf-configure-orbit"/>
+    <target name="all" depends="sd-qmake-all-profiles"/>
 
 
     <target name="sf-configure-orbit">
         <sequential>
-                    <echo>INFO: Configuring Orbit host based tools.</echo>
-                    <exec executable="cmd" dir="${r'$'}{build.drive}/sf/mw/hb" failonerror="false" output="${r'$'}{build.drive}/output/logs/${ant['build.id']}_compile_hb_configure.log">
+  <#list data["//unit[@proFile = 'hb.pro']"] as unit>
+            <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" output="${r'$'}{build.drive}/output/logs/${ant['build.id']}_compile_hb_configure.log">
                         <arg value="/C"/>
                         <arg value="python"/>
                         <arg line ="configure.py --host-make-bin=mingw32-make.exe --host-qmake-bin=qmake.exe --qmake-spec=win32-g++ --platform=symbian --qmake-options=MMP_RULES+=EXPORTUNFROZEN CONFIG+=sgimagelite_support DEFINES+=HB_EFFECTS_OPENVG DEFINES+=HB_FILTER_EFFECTS"/>
                     </exec>
                         
-                    <echo>INFO: Making host based tools.</echo>
-                    <exec executable="cmd" dir="${r'$'}{build.drive}/sf/mw/hb" failonerror="false" output="${r'$'}{build.drive}/output/logs/${ant['build.id']}_compile_hb_make.log">
+                    <echo>INFO: Exporting Orbit mkspecs to epoc32\tools for ${unit.@bldFile}/${unit.@proFile}</echo>
+                    <echo>INFO: Running Orbit theme installer, make install step</echo>
+                    <exec executable="cmd" dir="${r'$'}{build.drive}${unit.@bldFile}" failonerror="false" output="${r'$'}{build.drive}/output/logs/${ant['build.id']}_install_hb_configure.log">
                         <arg value="/C"/>
-                        <arg value="mingw32-make"/>
+                        <arg value="make install"/>
                     </exec>
-                    <echo>INFO: Exporting Orbit mkspecs to epoc32\tools</echo>
-                    <echo>INFO: Running Orbit theme installer, make install step</echo>
-                    <exec executable="cmd" dir="${r'$'}{build.drive}/sf/mw/hb" failonerror="false" output="${r'$'}{build.drive}/output/logs/${ant['build.id']}_install_hb_configure.log">
-                        <arg value="/C"/>
-                        <arg value="mingw32-make install"/>
-                    </exec>
+                </then>
+                <else>
+                    <echo message="ERROR: Directory ${r'$'}{build.drive}${unit.@bldFile} doesn't exist."/>
+                </else>
+            </if>
+  </#list>
         </sequential>
     </target>