sf-platform/build.xml
author thomase
Tue, 23 Jun 2009 15:13:21 +0100
changeset 217 d5045b96f54a
parent 216 36d82a2f1f92
child 237 3e6009eec7ed
child 241 c451bd0c0782
permissions -rw-r--r--
Fixed single model genxml pre-processing workaround to enable single system definition builds. Added "tools" and "adaptation" to the list of packages to be prepended by sf where needed.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     1
<?xml version="1.0" encoding="UTF-8"?>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     2
<project name="SF-PLATFORM-CONFIG" xmlns:hlm="http://www.nokia.com/helium">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     3
  <!-- location of this config -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     4
  <dirname property="sf.platform.config.dir" file="${ant.file.SF-PLATFORM-CONFIG}"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     5
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     6
  <!--
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     7
  * Property defaults
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     8
   -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
     9
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    10
  <!-- workaround until GenXML can merge v2.0.0 fragments -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    11
  <target name="create-canonical-sysdef-file">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    12
66
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    13
    <runtarget target="preprocess-sysdef-files"/>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    14
    <echo message="Exporting preprocessed System Definition"/>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    15
    <if><istrue value="${sf.spec.splitbuild}"/>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    16
       <then>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    17
       <if><istrue value="${sf.spec.os.skipbuild}" />
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    18
            <then><echo message="Skipping OS sysdef creation"/></then>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    19
       <else>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    20
            <!-- TODO use better method to export or wait for GenXML fix?-->
69
c933fe776713 Fix generated sysdef filename and also remove erroneous comment
BuildAdmin@LON-ENGBUILD87
parents: 67
diff changeset
    21
            <copy file="${build.output.dir}\build\input\0000000000000001_system_model_os.xml"
66
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    22
            tofile="${canonical.sysdef.file}" failonerror="false" verbose="true"/>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    23
       </else>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    24
       </if>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    25
66
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    26
       <if><istrue value="${sf.spec.s60.skipbuild}" />
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    27
            <then><echo message="Skipping S60 sysdef creation"/></then>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    28
       <else>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    29
            <!-- TODO use better method to export or wait for GenXML fix?-->
69
c933fe776713 Fix generated sysdef filename and also remove erroneous comment
BuildAdmin@LON-ENGBUILD87
parents: 67
diff changeset
    30
            <copy file="${build.output.dir}\build\input\0000000000000001_system_model_s60.xml"
66
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    31
            tofile="${canonical.sysdef.file}" failonerror="false" verbose="true"/>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    32
	   </else>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    33
	   </if>
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    34
	   </then>
69
c933fe776713 Fix generated sysdef filename and also remove erroneous comment
BuildAdmin@LON-ENGBUILD87
parents: 67
diff changeset
    35
	
67
69c57a9ccb7d Fix missing <if> typo
ShabeR@UK-SHABER
parents: 66
diff changeset
    36
	<else>
69c57a9ccb7d Fix missing <if> typo
ShabeR@UK-SHABER
parents: 66
diff changeset
    37
	    <!-- TODO use better method to export or wait for GenXML fix?-->
217
d5045b96f54a Fixed single model genxml pre-processing workaround to enable single system definition builds.
thomase
parents: 216
diff changeset
    38
        <copy file="${build.output.dir}\build\input\0000000000000001_system_model_os.xml"
67
69c57a9ccb7d Fix missing <if> typo
ShabeR@UK-SHABER
parents: 66
diff changeset
    39
        tofile="${canonical.sysdef.file}" failonerror="false" verbose="true"/>
66
ddfb6b8da4b4 Remove GenXML filtering and merge as platform System Model xml files should now be complete
ShabeR@UK-SHABER
parents: 65
diff changeset
    40
67
69c57a9ccb7d Fix missing <if> typo
ShabeR@UK-SHABER
parents: 66
diff changeset
    41
	    <!-- TODO targets for single sysdef build -->
69c57a9ccb7d Fix missing <if> typo
ShabeR@UK-SHABER
parents: 66
diff changeset
    42
	    <runtarget target="sf-os-compile"/>
69c57a9ccb7d Fix missing <if> typo
ShabeR@UK-SHABER
parents: 66
diff changeset
    43
	</else>
69
c933fe776713 Fix generated sysdef filename and also remove erroneous comment
BuildAdmin@LON-ENGBUILD87
parents: 67
diff changeset
    44
        </if>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    45
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    46
  </target>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    47
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    48
  <!--
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    49
    == Name: PREPROCESS-SYSDEF-FILES
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    50
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    51
    == Desc: Override of default target in order to deal with symbian os
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    52
    ==       system_definition.xml that does not have /sf source prefix
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    53
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    54
    ==       TODO get this moved as a Helium core target?
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    55
    -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    56
  <target name="preprocess-sysdef-files">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    57
        <mkdir dir="${build.output.dir}/build/input"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    58
        <delete verbose="true">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    59
            <fileset dir="${build.output.dir}/build/input/" includes="**"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    60
        </delete>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    61
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    62
        <for param="file">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    63
            <resources refid="system.definition.files"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    64
            <sequential>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    65
                <copy todir="${build.output.dir}/build/input" verbose="true">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    66
                    <fileset file="@{file}"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    67
                    <filterchain>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    68
                        <replaceregex pattern="bldFile=&quot;os" replace="bldFile=&quot;sf\\\\os" flags="gi"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    69
                        <replaceregex pattern="mrp=&quot;os" replace="mrp=&quot;sf\\\\os" flags="gi"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    70
                        <replaceregex pattern="bldFile=&quot;mw" replace="bldFile=&quot;sf\\\\mw" flags="gi"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    71
                        <replaceregex pattern="mrp=&quot;mw" replace="mrp=&quot;sf\\\\mw" flags="gi"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    72
                        <replaceregex pattern="bldFile=&quot;app" replace="bldFile=&quot;sf\\\\app" flags="gi"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    73
                        <replaceregex pattern="mrp=&quot;app" replace="mrp=&quot;sf\\\\app" flags="gi"/>
217
d5045b96f54a Fixed single model genxml pre-processing workaround to enable single system definition builds.
thomase
parents: 216
diff changeset
    74
                        <replaceregex pattern="bldFile=&quot;tools" replace="bldFile=&quot;sf\\\\tools" flags="gi"/>
d5045b96f54a Fixed single model genxml pre-processing workaround to enable single system definition builds.
thomase
parents: 216
diff changeset
    75
                        <replaceregex pattern="mrp=&quot;tools" replace="mrp=&quot;sf\\\\tools" flags="gi"/>
d5045b96f54a Fixed single model genxml pre-processing workaround to enable single system definition builds.
thomase
parents: 216
diff changeset
    76
                        <replaceregex pattern="bldFile=&quot;adaptation" replace="bldFile=&quot;sf\\\\adaptation" flags="gi"/>
d5045b96f54a Fixed single model genxml pre-processing workaround to enable single system definition builds.
thomase
parents: 216
diff changeset
    77
                        <replaceregex pattern="mrp=&quot;adaptation" replace="mrp=&quot;sf\\\\adaptation" flags="gi"/>
d5045b96f54a Fixed single model genxml pre-processing workaround to enable single system definition builds.
thomase
parents: 216
diff changeset
    78
                        
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    79
                        <expandproperties/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    80
                    </filterchain>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    81
                    <mapper>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    82
                        <scriptmapper language="jep" src="${helium.dir}/tools/common/jep/unique_filename.jep"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    83
                    </mapper>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    84
                </copy>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    85
            </sequential>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    86
        </for>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    87
    </target>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
    88
216
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
    89
209
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    90
    <target name="generate-layers">
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    91
       <echo message="canno-file:${canonical.sysdef.file}"/>
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    92
       <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    93
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    94
       <!-- All we want is a sysdef with the config name appended, so just copy it -->
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    95
       <echo message="INFO: Skip GenXML and copy sysdef to sysdef+config name"/>
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    96
       <copy file="${canonical.sysdef.file}" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
    97
216
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
    98
        <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml" tofile="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml">
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
    99
        <filterchain>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   100
            <linecontainsregexp negate="true">
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   101
                <regexp pattern="^\s*$"/>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   102
            </linecontainsregexp>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   103
        </filterchain>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   104
        </copy>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   105
        <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml" todir="${build.log.dir}/BOM/"/>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   106
        <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
36d82a2f1f92 Tidy up generate-layers and add missing quote
Shabe Razvi <shaber@symbian.org>
parents: 211
diff changeset
   107
    </target>
209
29424d1bc56b Rollback the removal of overriden generate-layers target - required platform build
Shabe Razvi <shaber@symbian.org>
parents: 207
diff changeset
   108
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   109
  <!--
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   110
    == Name: SF-COMPILE
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   111
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   112
    == Desc: Override of common sf-compile target defined in
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   113
    ==       common\build.xml
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   114
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   115
    ==       os  build will be skipped if sf.spec.os.skipbuild=true
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   116
    ==       s60 build will be skipped if sf.spec.s60.skipbuild=true
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   117
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   118
    -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   119
  <target name="sf-compile">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   120
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   121
    <!-- TODO clean up to single target once genxml v2.0.0 merge is fixed -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   122
    <if><istrue value="${sf.spec.splitbuild}"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   123
       <then>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   124
       <if><istrue value="${sf.spec.os.skipbuild}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   125
            <then><echo message="Skipping OS build"/></then>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   126
       <else><runtarget target="sf-os-compile"/></else></if>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   127
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   128
       <if><istrue value="${sf.spec.s60.skipbuild}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   129
            <then><echo message="Skipping S60 build"/></then>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   130
       <else><runtarget target="sf-s60-compile"/></else></if>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   131
	   </then>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   132
	   <else>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   133
	        <!-- TODO targets for single sysdef build -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   134
	        <runtarget target="sf-os-compile"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   135
	   </else>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   136
    </if>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   137
  </target>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   138
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   139
  <!--
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   140
    == Name: SF-OS-COMPILE
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   141
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   142
    == Desc: Compile OS part of build using the spec defined in:
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   143
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   144
    ==         - job_props.ant.xml
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   145
    ==         - job_refs.ant.xml
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   146
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   147
    -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   148
  <target name="sf-os-compile">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   149
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   150
        <hlm:argSet id="sbs.tools2.var">
111
5b0bc2f89660 Add postbuild RnD packaging. Add .whatlog to os tools build.
Shabe Razvi <shaber@symbian.org>
parents: 80
diff changeset
   151
                <hlm:arg name="config" value="tools2_rel.whatlog" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   152
                <hlm:arg name="singlejob" value="false" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   153
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   154
        </hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   155
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   156
		<hlm:argSet id="sbs.tools2.clean.var">
111
5b0bc2f89660 Add postbuild RnD packaging. Add .whatlog to os tools build.
Shabe Razvi <shaber@symbian.org>
parents: 80
diff changeset
   157
                <hlm:arg name="config" value="tools2_rel.whatlog" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   158
                <hlm:arg name="singlejob" value="false" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   159
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   160
		<hlm:arg name="command" value="CLEAN --check" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   161
        </hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   162
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   163
        <hlm:argSet id="sbs.tools.var">
111
5b0bc2f89660 Add postbuild RnD packaging. Add .whatlog to os tools build.
Shabe Razvi <shaber@symbian.org>
parents: 80
diff changeset
   164
                <hlm:arg name="config" value="tools_rel.whatlog" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   165
                <hlm:arg name="singlejob" value="true" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   166
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   167
        </hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   168
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   169
		<hlm:argSet id="sbs.tools.clean.var">
111
5b0bc2f89660 Add postbuild RnD packaging. Add .whatlog to os tools build.
Shabe Razvi <shaber@symbian.org>
parents: 80
diff changeset
   170
                <hlm:arg name="config" value="tools_rel.whatlog" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   171
                <hlm:arg name="singlejob" value="true" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   172
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   173
		<hlm:arg name="command" value="CLEAN --check" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   174
        </hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   175
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   176
        <hlm:argSet id="sbs.main.sbs.var">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   177
                <hlm:arg name="config" value="${sf.spec.sbs.config}" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   178
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   179
        </hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   180
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   181
		<hlm:argSet id="sbs.main.clean.sbs.var">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   182
                <hlm:arg name="config" value="${sf.spec.sbs.config}" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   183
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   184
		<hlm:arg name="command" value="CLEAN --check" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   185
        </hlm:argSet>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   186
		
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   187
		<hlm:argSet id="sbs.main.what.sbs.var">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   188
                <hlm:arg name="config" value="${sf.spec.sbs.config}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   189
                <hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   190
		<hlm:arg name="command" value="WHAT" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   191
        </hlm:argSet>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   192
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   193
        <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   194
        <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   195
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   196
		<!-- generate baseline dir list to allow delta creation -->
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   197
		<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   198
			<param name="sf.list.name" value="baseline"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   199
		</antcall>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   200
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   201
		<!-- OS what -->
155
c46069cf2fc7 'WHAT' build removed. parselistdirs.pl fixes for raptor logs.
matt.davies@SYM-BUILD02.ad-sfpd.intra
parents: 111
diff changeset
   202
		<!--
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   203
        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   204
                <param name="build.system" value="${sf.spec.build.system}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   205
                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   206
                <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   207
                <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   208
                <reference refid="sbs.main.what.sbs.var" torefid="sbs.var" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   209
                <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   210
                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   211
        </antcall>
155
c46069cf2fc7 'WHAT' build removed. parselistdirs.pl fixes for raptor logs.
matt.davies@SYM-BUILD02.ad-sfpd.intra
parents: 111
diff changeset
   212
		-->
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   213
		
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   214
		<!-- OS clean main build -->
79
d9875e573161 Implemented the "sf.spec.baseline.clean" switch.
ThomasE@UK-ThomasE.symbian.int
parents: 72
diff changeset
   215
		<if><istrue value="${sf.spec.baseline.clean}"/>
80
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   216
			<then>
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   217
				<antcall target="compile-main" inheritAll="false" inheritRefs="true">
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   218
						<param name="build.system" value="${sf.spec.build.system}" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   219
						<param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   220
						<param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   221
						<param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   222
						<reference refid="sbs.main.clean.sbs.var" torefid="sbs.var" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   223
						<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   224
						<reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   225
				</antcall>
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   226
			</then>
79
d9875e573161 Implemented the "sf.spec.baseline.clean" switch.
ThomasE@UK-ThomasE.symbian.int
parents: 72
diff changeset
   227
		</if>
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   228
		
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   229
		<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   230
			<param name="sf.list.name" value="post-clean"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   231
		</antcall>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   232
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   233
		<!-- what has been cleaned from baseline PDK by sos model -->
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   234
		<antcall target="sf-delta-dir" inheritAll="false">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   235
			<param name="sf.list_a.name" value="baseline"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   236
			<param name="sf.list_b.name" value="post-clean"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   237
		</antcall>		
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   238
		
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   239
        <!-- OS tools2 build first-->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   240
        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   241
                <param name="build.system" value="${sf.spec.build.system}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   242
                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   243
                <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   244
                <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   245
                <reference refid="sbs.tools2.var" torefid="sbs.var" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   246
                <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   247
                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   248
        </antcall>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   249
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   250
		<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   251
			<param name="sf.list.name" value="post-build-tools2"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   252
		</antcall>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   253
		
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   254
		
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   255
        <!-- OS tools build after tools2 -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   256
        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   257
                <param name="build.system" value="${sf.spec.build.system}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   258
                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   259
                <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   260
                <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   261
                <reference refid="sbs.tools.var" torefid="sbs.var" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   262
                <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   263
                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   264
        </antcall>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   265
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   266
		<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   267
			<param name="sf.list.name" value="post-build-tools"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   268
		</antcall>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   269
		
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   270
        <!-- OS main build -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   271
        <antcall target="compile-main" inheritAll="false" inheritRefs="true">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   272
                <param name="build.system" value="${sf.spec.build.system}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   273
                <param name="compile.sysdef.dtd.stub" value="${sf.spec.os.sysdef.dtd}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   274
                <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   275
                <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   276
                <reference refid="sbs.main.sbs.var" torefid="sbs.var" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   277
                <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   278
                <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   279
        </antcall>
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   280
		
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   281
		<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   282
			<param name="sf.list.name" value="post-build-main"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   283
		</antcall>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   284
		
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   285
		<!-- what has been built in tools2+tools+main -->
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   286
		<antcall target="sf-delta-dir" inheritAll="false">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   287
			<param name="sf.list_a.name" value="post-clean"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   288
			<param name="sf.list_b.name" value="post-build-main"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   289
		</antcall>
65
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   290
		
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   291
		<!-- what has been cleaned and rebuilt -->
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   292
		<antcall target="sf-intersect-dir" inheritAll="false">
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   293
			<param name="sf.list_a.name" value="post-clean_delta"/>       <!-- clean list -->
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   294
			<param name="sf.list_b.name" value="post-build-main_delta"/>  <!-- built list -->
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   295
		</antcall>
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   296
		
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   297
		<!-- what has been cleaned and not rebuilt -->
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   298
		
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   299
  </target>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   300
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   301
  <!--
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   302
    == Name: SF-S60-COMPILE
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   303
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   304
    == Desc: Compile S60 part of build using the spec defined in:
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   305
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   306
    ==         - job_props.ant.xml
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   307
    ==         - job_refs.ant.xml
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   308
    ==
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   309
    -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   310
  <target name="sf-s60-compile">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   311
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   312
        <hlm:argSet id="sbs.tools.var">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   313
          			<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   314
          			<hlm:arg name="singlejob" value="true" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   315
          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   316
    		</hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   317
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   318
			<hlm:argSet id="sbs.tools.clean.var">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   319
          			<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   320
          			<hlm:arg name="singlejob" value="true" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   321
          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   322
    		</hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   323
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   324
    		<hlm:argSet id="sbs.main.sbs.var">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   325
          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   326
          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   327
    		</hlm:argSet>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   328
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   329
			<hlm:argSet id="sbs.main.clean.sbs.var">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   330
          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   331
          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   332
				<hlm:arg name="command" value="CLEAN --check" />
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   333
    		</hlm:argSet>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   334
			
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   335
			<hlm:argSet id="sbs.main.what.sbs.var">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   336
          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   337
          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   338
				<hlm:arg name="command" value="WHAT" />
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   339
    		</hlm:argSet>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   340
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   341
    		<hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   342
    		<hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   343
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   344
		<antcall target="sf-list-dir" inheritAll="false">
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   345
			<param name="sf.list.name" value="s60-baseline"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   346
		</antcall>
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   347
		
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   348
			<!-- s60 what  -->
155
c46069cf2fc7 'WHAT' build removed. parselistdirs.pl fixes for raptor logs.
matt.davies@SYM-BUILD02.ad-sfpd.intra
parents: 111
diff changeset
   349
			<!--
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   350
    		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   351
          			<param name="build.system" value="${sf.spec.build.system}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   352
          			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   353
                    <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   354
          			<reference refid="sbs.main.what.sbs.var" torefid="sbs.var" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   355
          			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   356
          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   357
    		</antcall>
155
c46069cf2fc7 'WHAT' build removed. parselistdirs.pl fixes for raptor logs.
matt.davies@SYM-BUILD02.ad-sfpd.intra
parents: 111
diff changeset
   358
			-->
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   359
			<!-- s60 clean main build -->
79
d9875e573161 Implemented the "sf.spec.baseline.clean" switch.
ThomasE@UK-ThomasE.symbian.int
parents: 72
diff changeset
   360
			<if><istrue value="${sf.spec.baseline.clean}"/>
80
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   361
				<then>
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   362
					<antcall target="compile-main" inheritAll="false" inheritRefs="true">
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   363
							<param name="build.system" value="${sf.spec.build.system}" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   364
							<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   365
							<param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/>
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   366
							<reference refid="sbs.main.clean.sbs.var" torefid="sbs.var" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   367
							<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   368
							<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   369
					</antcall>
5e7e3b1825aa Fixed ant syntax from previous commit.
ThomasE@UK-ThomasE.symbian.int
parents: 79
diff changeset
   370
				</then>
79
d9875e573161 Implemented the "sf.spec.baseline.clean" switch.
ThomasE@UK-ThomasE.symbian.int
parents: 72
diff changeset
   371
			</if>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   372
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   373
			<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   374
				<param name="sf.list.name" value="post-s60-clean"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   375
			</antcall>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   376
			
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   377
			<!-- what has been cleaned from baseline PDK by s60 model -->
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   378
			<antcall target="sf-delta-dir" inheritAll="false">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   379
				<param name="sf.list_a.name" value="s60-baseline"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   380
				<param name="sf.list_b.name" value="post-s60-clean"/>
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   381
			</antcall>		
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   382
			
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   383
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   384
            <!-- s60  tools build -->
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   385
    		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   386
          			<param name="build.system" value="${sf.spec.build.system}" />
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   387
          			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   388
					<param name="sf.spec.sysdef.version" value ="${sf.spec.s60.sysdef.version}"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   389
          			<reference refid="sbs.tools.var" torefid="sbs.var" />
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   390
          			<reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   391
          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   392
    		</antcall>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   393
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   394
			<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   395
				<param name="sf.list.name" value="post-s60-build-tools"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   396
			</antcall>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   397
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   398
    		<!-- s60 main build -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   399
    		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   400
          			<param name="build.system" value="${sf.spec.build.system}" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   401
          			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
70
7f26de0cdae5 Include --check on CLEAN and also remove S60_bldmelast configuration. It didnt work anyway as s60cli.exe is not present.
ShabeR@UK-SHABER
parents: 69
diff changeset
   402
                                <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   403
          			<reference refid="sbs.main.sbs.var" torefid="sbs.var" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   404
          			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   405
          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   406
    		</antcall>
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   407
			
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   408
			<runtarget target="sf-s60-create-cenrep"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   409
			
39
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   410
			<antcall target="sf-list-dir" inheritAll="false">
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   411
				<param name="sf.list.name" value="post-s60-build-main"/>
9edae8fe1416 Add tools to create file tree deltas and integrate them into build f/w
ShabeR@UK-SHABER
parents: 38
diff changeset
   412
			</antcall>
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   413
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   414
			<!-- what has been built by tools+2+main -->
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   415
			<antcall target="sf-delta-dir" inheritAll="false">
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   416
				<param name="sf.list_a.name" value="s60-baseline"/>
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   417
				<param name="sf.list_b.name" value="post-s60-build-main"/>
40
54444a2ae2db 1. Update list and delta targets
ShabeR@UK-SHABER
parents: 39
diff changeset
   418
			</antcall>		
65
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   419
			
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   420
			<!-- what has been cleaned and rebuilt -->
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   421
			<antcall target="sf-intersect-dir" inheritAll="false">
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   422
				<param name="sf.list_a.name" value="post-s60-clean_delta"/>       <!-- clean list -->
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   423
				<param name="sf.list_b.name" value="post-s60-build-main_delta"/>  <!-- built list -->
65
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   424
			</antcall>
0099c046d4f3 Add intersection target to FBF
ShabeR@UK-SHABER
parents: 40
diff changeset
   425
		
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   426
	</target>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   427
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   428
	<target name="sf-s60-create-cenrep">
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   429
        <echo message="INFO Generating CenRep"/>
72
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   430
        <exec executable="${helium.dir}/../ConfigurationTool/cli_build.cmd" dir="${build.drive}" failonerror="false" output="${build.log.dir}/${build.id}_create_cenrep.log">
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   431
		  <arg value="-master_conf"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   432
		  <arg value="s60"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   433
		  <arg value="-impl"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   434
		  <arg value="/epoc32/rom/config/confml_data/s60"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   435
		  <arg value="-confml"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   436
		  <arg value="/epoc32/rom/config/confml_data/s60"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   437
		  <arg value="-ignore_errors"/>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   438
        </exec>
72
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   439
		
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   440
		<if><available  file="${build.drive}/cli_build_error.log" />
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   441
		<then>
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   442
            <echo message="INFO CenRep error log found, moving to ${build.log.dir}" />
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   443
    		<move file="${build.drive}/cli_build_error.log" todir="${build.log.dir}" failonerror="false"/>
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   444
		</then>
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   445
		</if>
4846dd5df20a If found then export cli_build_error.log to logs directory
shaber@UK-SHABER
parents: 71
diff changeset
   446
		
71
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   447
	</target>
cc9038ba0f21 Remove old s60 bldmelast step and replace with call to generate cenrep files.
shaber@UK-SHABER
parents: 70
diff changeset
   448
38
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   449
  <!-- import sf-common-config -->
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   450
  <import file="../common/build.xml" />
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   451
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   452
</project>
c7be4c65f97e Update to allow foundation model build in single step
ShabeR@UK-SHABER
parents: 36
diff changeset
   453