--- 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>