# HG changeset patch
# User shaberazvi@L063442.prod.ad.symbian.intra
# Date 1236187004 0
# Node ID cee0afe798557baa140a0e9074d8c18ff86b69e6
# Parent b55de085507d4100c63e719b9aa5f566b8bbf5cf
Fix error in template counter
diff -r b55de085507d -r cee0afe79855 common/build.xml
--- a/common/build.xml Wed Mar 04 16:53:51 2009 +0000
+++ b/common/build.xml Wed Mar 04 17:16:44 2009 +0000
@@ -28,28 +28,52 @@
<tempfile property="prep.dynamic.config" suffix="ant.xml" destdir="${temp.build.dir}"/>
</target>
- <target name="sf-prebuild" depends="preparation-getenv">
-
+ <target name="sf-prebuild">
<echo>[SF-PREBUILD]</echo>
+ <if>
+ <istrue value="${sf.prebuild.getenv}" />
+ <then>
+ <runtarget target="preparation-getenv"/>
+ </then>
+ </if>
+
+ <if>
+ <istrue value="${sf.prebuild.getsrc}" />
+ <then>
+ <runtarget target="sf-get-source"/>
+ </then>
+ </if>
+
+
</target>
- <!-- <target name="sf-preparation-getenv">
- <antcall target="preparation-getenv">
-
- </antcall>
- </target>
-
- -->
-
<target name="sf-postbuild">
<echo>[SF-POSTBUILD]</echo>
</target>
- <target name="sf-build-run">
+ <target name="sf-build-run" depends="sf-compile">
<echo>[SF-BUILD-RUN]</echo>
</target>
+ <target name="sf-compile">
+
+ <!--<path id="sf.system.definition.files">
+ <fileset dir="${sf.common.config.dir}/sysdefs" includes="*.sysdef.xml"/>
+ <fileset dir="${build.drive}/sf/app/camera" includes="*.sysdef.xml"/>
+ </path>
+ -->
+
+ <!-- target name="compile-main-prebuild" -->
+ <antcall target="compile-main" inheritAll="false">
+ <param name="build.system" value="sbs" />
+ <param name="sysdef.configurations.list" value="s60_build_clean,s60_build" />
+ <!--<reference refid="sf.system.definition.files" torefid="system.definition.files" />-->
+ </antcall>
+
+ </target>
+
+
<target name="scm-get-input">
<ant antfile="${sf.common.config.dir}/../../build/hg-pkg-build.ant.xml" />
</target>
diff -r b55de085507d -r cee0afe79855 common/properties.default.ant.xml
--- a/common/properties.default.ant.xml Wed Mar 04 16:53:51 2009 +0000
+++ b/common/properties.default.ant.xml Wed Mar 04 17:16:44 2009 +0000
@@ -11,9 +11,14 @@
<!-- Template for the WA location, each branch got a different location -->
<property name="ccm.project.wa_path" location="${data.drive.letter}:\Build_${data.drive.letter}\${env.USERNAME}\ido_wa\${build.name}"/>
- <!-- defaults to get source/bin release for package/platform -->
- <property name="release.getsource" value="1"/>
- <property name="release.getbin" value="1"/>
+ <!-- to get run getenv package/platform, what to get is defined by props below -->
+ <property name="sf.prebuild.getenv" value="true"/>
+ <property name="sf.prebuild.getsrc" value="true"/>
+
+ <property name="base_release.getenv_options" value=""/>
+ <!--property name="base_release.path" value="\\fasrrm01.europe.nokia.com\GRACE\s60_devices_sw\S60_5_1\S60.MCL_200904_S60.51"/-->
+ <property name="base_release.path" value="\\lon-engbuild88\d$\TB91_Releases\week04.grace"/>
+
<property name="email.from" value="shabe.razvi@nokia.com"/>
@@ -21,12 +26,7 @@
<property name="network.free.space" value="10"/>
<property name="network.drive" value="\\builds01\devbuilds\GRACE"/>
<property name="publish.root.dir" value="\\builds01\devbuilds\GRACE"/>
-
- <property name="base_release.path" value="\\fasrrm01.europe.nokia.com\GRACE\s60_devices_sw\S60_5_1\S60.MCL_200904_S60.51"/>
- <!--<property name="base_release.path" value="\\lonfiler02\nokbuilds\from_nokia\DFS70_91_91\S60.e_200906_hw79"/> -->
-
- <property name="base_release.getenv_options" value=""/>
-
+
<property name="hg.tag" value="1"/>
</project>