FCL/sftools/dev/build: comparison buildframework/helium/tools/compile/cmaker.ant.xml

equal deleted inserted replaced

-:c7c26511138f
+:7c4a911dc066
 <project name="compile.cmaker" xmlns:hlm="http://www.nokia.com/helium">
 <description>
 cMaker support.
 </description>
+<!--* @property cmaker.enabled
+Set to true to run cmaker.
+@type boolean
+@editable required
+@scope public
+@since 11.0
+-->
+<!--* @property internal.cmaker.enabled
+Runs cmaker targets if cmaker.enabled is set to true.
+@type boolean
+@scope private
+-->
+<!--* @property enable.cmaker
+Set to true to run cmaker. - deprecated: Start using cmaker.enabled property.
+@type boolean
+@editable required
+@scope public
+@deprecated since 11.0
+-->
 <!-- Location of the cmaker component to install it.
 @type string
 @scope private
 -->
 <property name="cmaker.component.dir" location="${build.drive}/tools/cmaker"/>
 <property name="cmaker.s60.version" value=""/>
 <!-- Custom label added to the cmaker logs.
 @type string
 -->
 <property name="cmaker.log.label" value=""/>
+<!-- Check, is cmaker feature enabled -->
+<condition property="internal.cmaker.enabled">
+<or>
+<istrue value="${cmaker.enabled}"/>
+<isset property="enable.cmaker"/>
+</or>
+</condition>
 <!--
 The cmakerMacro enables the user to run cmaker commands directly from Ant.
 To configure it just provide NCP and S60 version and the action you want to run.
 Default action is WHAT.
 </macrodef>
 <!--  Installing CMaker. -->
 <target name="cmaker-install">
 <mkdir dir="${compile.log.dir}" />
-<record name="${compile.log.dir}/${build.id}_install.cmaker.log" emacsmode="true" action="start" />
+<hlm:fileBackupMacro file="${compile.log.dir}/${build.id}_install.cmaker.log"/>
+<hlm:record name="${compile.log.dir}/${build.id}_install.cmaker.log" emacsmode="true" action="start" />
 <exec executable="${cmaker.component.dir}/bin/mingw_make.exe" osfamily="windows" dir="${cmaker.component.dir}" failonerror="true">
 <arg line="install"/>
 </exec>
 <exec executable="make" osfamily="unix" dir="${cmaker.component.dir}" failonerror="true">
 <arg line="install"/>
 </exec>
-<record name="${compile.log.dir}/${build.id}_install.cmaker.log" action="stop" />
+<hlm:record name="${compile.log.dir}/${build.id}_install.cmaker.log" action="stop" />
 <!-- Blocks packaging configuration generation. -->
 <if>
 <istrue value="${blocks.enabled}" />
 <then>
 <mkdir dir="${blocks.config.dir}" />
 </then>
 </if>
 </target>
 <!-- CMaker export configuration. -->
-<target name="cmaker-export" depends="cmaker-install" if="enable.cmaker">
+<target name="cmaker-export" depends="cmaker-install" if="internal.cmaker.enabled">
 <mkdir dir="${compile.log.dir}" />
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.export.cmaker.log" emacsmode="true" action="start" />
+<hlm:fileBackupMacro file="${compile.log.dir}/${build.id}${cmaker.log.label}.export.cmaker.log"/>
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.export.cmaker.log" emacsmode="true" action="start" />
 <hlm:cmakerMacro ncp="${cmaker.pp.version}"
 s60="${cmaker.s60.version}"
 action="export"/>
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.export.cmaker.log" action="stop" />
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.export.cmaker.log" action="stop" />
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:abldmetadatainput>
 <fileset casesensitive="false" file="${compile.log.dir}/${build.id}${cmaker.log.label}.export.cmaker.log" />
 <metadatafilterset refid="filterset.compile" />
 </hlm:abldmetadatainput>
 </hlm:metadatarecord>
 </target>
 <!-- CMaker cleanup exported configuration. -->
-<target name="cmaker-clean" depends="cmaker-install" if="enable.cmaker">
+<target name="cmaker-clean" depends="cmaker-install" if="internal.cmaker.enabled">
 <mkdir dir="${compile.log.dir}" />
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.clean.cmaker.log" emacsmode="true" action="start" />
+<hlm:fileBackupMacro file="${compile.log.dir}/${build.id}${cmaker.log.label}.clean.cmaker.log"/>
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.clean.cmaker.log" emacsmode="true" action="start" />
 <hlm:cmakerMacro ncp="${cmaker.pp.version}"
 s60="${cmaker.s60.version}"
 action="clean"/>
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.clean.cmaker.log" action="stop" />
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.clean.cmaker.log" action="stop" />
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:abldmetadatainput>
 <fileset casesensitive="false" file="${compile.log.dir}/${build.id}${cmaker.log.label}.clean.cmaker.log" />
 <metadatafilterset refid="filterset.compile" />
 </hlm:abldmetadatainput>
 </hlm:metadatarecord>
 </target>
 <!-- CMaker list the final destination of what will be exported. -->
-<target name="cmaker-what" depends="cmaker-install" if="enable.cmaker">
+<target name="cmaker-what" depends="cmaker-install" if="internal.cmaker.enabled">
 <mkdir dir="${compile.log.dir}" />
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.what.cmaker.log" emacsmode="true" action="start" />
+<hlm:fileBackupMacro file="${compile.log.dir}/${build.id}${cmaker.log.label}.what.cmaker.log"/>
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.what.cmaker.log" emacsmode="true" action="start" />
 <hlm:cmakerMacro ncp="${cmaker.pp.version}"
 s60="${cmaker.s60.version}"
 action="what"/>
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.what.cmaker.log" action="stop" />
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.what.cmaker.log" action="stop" />
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:abldmetadatainput>
 <fileset casesensitive="false" file="${compile.log.dir}/${build.id}${cmaker.log.label}.what.cmaker.log" />
 <metadatafilterset refid="filterset.compile" />
 </hlm:abldmetadatainput>
 </then>
 </if>
 </target>
 <!-- CMaker list the source files what will be exported. -->
-<target name="cmaker-whatdeps" depends="cmaker-install" if="enable.cmaker">
+<target name="cmaker-whatdeps" depends="cmaker-install" if="internal.cmaker.enabled">
 <mkdir dir="${compile.log.dir}" />
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.whatdeps.cmaker.log" emacsmode="true" action="start" />
+<hlm:fileBackupMacro file="${compile.log.dir}/${build.id}${cmaker.log.label}.whatdeps.cmaker.log"/>
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.whatdeps.cmaker.log" emacsmode="true" action="start" />
 <hlm:cmakerMacro ncp="${cmaker.pp.version}"
 s60="${cmaker.s60.version}"
 action="what_deps"/>
-<record name="${compile.log.dir}/${build.id}${cmaker.log.label}.whatdeps.cmaker.log" action="stop" />
+<hlm:record name="${compile.log.dir}/${build.id}${cmaker.log.label}.whatdeps.cmaker.log" action="stop" />
 <hlm:metadatarecord database="${metadata.dbfile}">
 <hlm:abldmetadatainput>
 <fileset casesensitive="false" file="${compile.log.dir}/${build.id}${cmaker.log.label}.whatdeps.cmaker.log" />
 <metadatafilterset refid="filterset.compile" />
 </hlm:abldmetadatainput>
 </hlm:metadatarecord>
 </target>
 </project>

changeset 628	7c4a911dc066
parent 588	c7c26511138f
child 645	b8d81fa19e7d