Moved further feature database artifacts from binaries zip to tools zip.
This should be enough to ensure that a platform build that uses a tools baseline includes the necessary feature database files.
<?xml version="1.0"?><project name="run-qmake" default="all"> <target name="all"> <!-- Qmake needs to have been built in this environment, to generate bld.infs to built Qt itself. Qmake.exe only exists in the source tree if its been built --> <if><not><available file="${r'$'}{build.drive}/sf/mw/qt/bin/qmake.exe" type="file"/></not> <then> <sequential> <#list data["//unit/@bldFile/.."] as unit> <#if (unit.@bldFile=="/sf/mw/qt/src/s60installs/deviceconfiguration")> <echo>INFO: Building and configuring qmake for ${unit.@bldFile}</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 line="sbs -c tools2 -j 4 --logfile=${r'$'}{build.drive}/output/logs/${ant['build.id']}_compile_qmake.log"/> </exec> </then> <else> <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/> <fail message="Unit /sf/mw/qt/src/s60installs/deviceconfiguration is in the model, but not present on disk. Cannot build qmake!"/> </else> </if> </#if> </#list> </sequential> </then> </if> <sequential> <#list data["//unit/@bldFile/.."] as unit> <#if (unit.@bldFile=="/sf/mw/qtextensions/group")> <echo>INFO: Configuring qtextensions for ${unit.@bldFile}</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 line="sbs -c tools2 -j 4 --logfile=${r'$'}{build.drive}/output/logs/${ant['build.id']}_compile_qtextensions.log"/> </exec> </then> <else> <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/> </else> </if> </#if> </#list> </sequential> <sequential> <#list data["//unit/@proFile/.."] as unit> <#if (unit.@proFile=="hb.pro")> <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 --qmake-spec=symbian-sbsv2 --platform=symbian --qmake-options=MMP_RULES+=EXPORTUNFROZEN CONFIG+=sgimagelite_support DEFINES+=HB_EFFECTS_OPENVG DEFINES+=HB_FILTER_EFFECTS"/> </exec> <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="make install"/> </exec> </then> <else> <echo message="ERROR: Directory ${r'$'}{build.drive}/${unit.@bldFile} doesn't exist."/> </else> </if> </#if> </#list> </sequential> <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"/> <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> </sequential> </#list> </parallel> </target></project>