--- a/build.xml Fri Mar 06 15:05:38 2009 +0000
+++ b/build.xml Mon Mar 09 15:42:02 2009 +0000
@@ -8,7 +8,7 @@
-->
<!-- load build type from config/ -->
- <import file="${sf.config.dir}/../build/config/project_spec.xml" />
+ <import file="${sf.config.dir}/../build/config/project_spec.ant.xml" />
<import file="sf-${sf.project.type}/build.xml" />
--- a/common/build.xml Fri Mar 06 15:05:38 2009 +0000
+++ b/common/build.xml Mon Mar 09 15:42:02 2009 +0000
@@ -3,8 +3,9 @@
<dirname property="sf.common.config.dir" file="${ant.file.SF-COMMON-CONFIG}"/>
- <!-- import default properties file config -->
- <import file="${sf.common.config.dir}/properties.default.ant.xml"/>
+ <!-- import common properties/spec -->
+ <loadproperties srcFile="${sf.common.config.dir}/common.properties"/>
+ <import file="${sf.common.config.dir}/common_spec.ant.xml" />
<!-- import all core HELIUM targets -->
<import file="${helium.dir}/helium.ant.xml" />
@@ -60,6 +61,9 @@
<if>
<istrue value="${sf.spec.baseline.enable}" />
<then>
+ <property name="base_release.path" value="${sf.spec.baseline.location}"/>
+ <property name="base_release.getenv_options" value="${sf.spec.baseline.getenv_options}"/>
+ <echo>base_release.path=${base_release.path}, base_release.getenv_options=${base_release.getenv_options}</echo>
<runtarget target="preparation-getenv"/>
</then>
</if>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/common_spec.ant.xml Mon Mar 09 15:42:02 2009 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<project name="sf.common" >
+ <property name="sf.project.type" value="package" />
+
+ <property name="sf.spec.build.target" value="armv5" />
+ <property name="sf.spec.build.variant" value="udeb" />
+ <property name="sf.spec.build.productioncode.enable" value="true" />
+ <property name="sf.spec.build.testcode.enable" value="false" />
+ <property name="sf.spec.build.framework" value="sbsv2" />
+ <property name="sf.spec.build.sbsv2.config" value="" />
+ <property name="sf.spec.build.sbsv2.options" value="-k" />
+ <property name="sf.spec.build.clean.enable" value="true" />
+
+ <property name="sf.spec.referenceroms.createimages.enable" value="true" />
+ <property name="sf.spec.testroms.createimages.enable" value="true" />
+
+ <property name="sf.spec.sourcesync.enable" value="true" />
+ <property name="sf.spec.sourcesync.usecache" value="true" />
+ <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv" />
+
+ <property name="sf.spec.baseline.enable" value="true" />
+ <property name="sf.spec.baseline.select" value="auto" />
+ <property name="sf.spec.baseline.getenv_options" value="emu"/>
+ <property name="sf.spec.toolsbaseline.enable" value="true" />
+ <property name="sf.spec.toolsbaseline.select" value="auto" />
+
+ <property name="sf.spec.publish.unpackagedartefacts.enable" value="true" />
+ <property name="sf.spec.publish.packagedartefacts.enable" value="true" />
+
+ <property name="sf.spec.tagafterbuild.enable" value="true" />
+</project>
+
+
--- a/common/properties.default.ant.xml Fri Mar 06 15:05:38 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="SF-PROPERTIES-DEFAULT">
-
- <property environment="env"/> <!-- make environment variables available via env -->
- <property name="build.system" value="sbs"/>
- <property name="prep.root.dir" value=""/>
-
- <!-- Compile configuration -->
- <property name="sysdef.configurations.list" value="s60_build,s60_bldmelast"/>
-
- <!-- 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}"/>
-
- <!-- to get run getenv package/platform, what to get is defined by props below -->
- <property name="sf.baseline.enable" 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-engbuild68\d$\GRACE\Dummy\Symbian_OS_vtb91sf\SY_TB91_200910_101"/>
-
-
- <property name="email.from" value="shabe.razvi@nokia.com"/>
-
- <property name="local.free.space" value="10"/>
- <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="hg.tag" value="1"/>
-
-</project>
-
--- a/common/sysdef.config.ant.xml Fri Mar 06 15:05:38 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="SF-SYSDEF-CONFIG">
-
- <path id="system.definition.files">
- <fileset dir="${package.branch.config.dir}/sysdefs" includes="*.sysdef.xml"/>
- <fileset dir="${package.config.dir}/sysdefs" includes="*.sysdef.xml"/>
- <fileset dir="${package.common.config.dir}/sysdefs" includes="*.sysdef.xml"/>
- <fileset dir="${ccm.project.wa_path}" includes="*/*/*/layers.sysdef.xml"/>
- <fileset dir="${ccm.project.wa_path}" includes="*/*/adaptation/stubs/*/layers.sysdef.xml"/>
- </path>
-
-</project>
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/old_vars.txt Mon Mar 09 15:42:02 2009 +0000
@@ -0,0 +1,31 @@
+<!-- project name="SF-PROPERTIES-DEFAULT">
+
+ <property environment="env"/> <!-- make environment variables available via env -->
+ <property name="build.system" value="sbs"/>
+ <property name="prep.root.dir" value=""/>
+
+ <!-- Compile configuration -->
+ <property name="sysdef.configurations.list" value="s60_build,s60_bldmelast"/>
+
+ <!-- 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}"/>
+
+ <!-- to get run getenv package/platform, what to get is defined by props below -->
+ <property name="sf.baseline.enable" 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-engbuild68\d$\GRACE\Dummy\Symbian_OS_vtb91sf\SY_TB91_200910_101"/>
+
+
+ <property name="email.from" value="shabe.razvi@nokia.com"/>
+
+ <property name="local.free.space" value="10"/>
+ <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="hg.tag" value="1"/>
+
+</project -->
\ No newline at end of file
--- a/sf-package/build.xml Fri Mar 06 15:05:38 2009 +0000
+++ b/sf-package/build.xml Mon Mar 09 15:42:02 2009 +0000
@@ -13,14 +13,11 @@
* the target will fail.
-->
+ <!-- import properties/spec for this type of build -->
<loadproperties srcFile="${sf.package.config.dir}/package.properties"/>
-
-
+ <import file="${sf.package.config.dir}/package_spec.ant.xml" />
-
-
-
- <!-- import sf-common-config -->
+ <!-- import common config -->
<import file="../common/build.xml" />
</project>
--- a/sf-package/package.properties Fri Mar 06 15:05:38 2009 +0000
+++ b/sf-package/package.properties Mon Mar 09 15:42:02 2009 +0000
@@ -1,1 +0,0 @@
-base_release.getenv_options=emu
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sf-package/package_spec.ant.xml Mon Mar 09 15:42:02 2009 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<project name="sf.package" >
+ <property name="sf.project.type" value="package" />
+
+ <property name="sf.spec.build.target" value="armv5" />
+ <property name="sf.spec.build.variant" value="udeb" />
+ <property name="sf.spec.build.productioncode.enable" value="true" />
+ <property name="sf.spec.build.testcode.enable" value="false" />
+ <property name="sf.spec.build.framework" value="sbsv2" />
+ <property name="sf.spec.build.sbsv2.config" value="" />
+ <property name="sf.spec.build.sbsv2.options" value="-k" />
+ <property name="sf.spec.build.clean.enable" value="true" />
+
+ <property name="sf.spec.referenceroms.createimages.enable" value="true" />
+ <property name="sf.spec.testroms.createimages.enable" value="true" />
+
+ <property name="sf.spec.sourcesync.enable" value="true" />
+ <property name="sf.spec.sourcesync.usecache" value="true" />
+ <property name="sf.spec.sourcesync.sourcespecfile" value="sources.csv" />
+
+ <property name="sf.spec.baseline.enable" value="true" />
+ <property name="sf.spec.baseline.select" value="auto" />
+ <property name="sf.spec.toolsbaseline.enable" value="true" />
+ <property name="sf.spec.toolsbaseline.select" value="auto" />
+
+ <property name="sf.spec.publish.unpackagedartefacts.enable" value="true" />
+ <property name="sf.spec.publish.packagedartefacts.enable" value="true" />
+
+ <property name="sf.spec.tagafterbuild.enable" value="true" />
+</project>
+