equal
deleted
inserted
replaced
48 <property name="build.system" value="ec-helium" /> |
48 <property name="build.system" value="ec-helium" /> |
49 <property name="rvct.version" value="22_616" /> |
49 <property name="rvct.version" value="22_616" /> |
50 |
50 |
51 <!-- Archiving configuration--> |
51 <!-- Archiving configuration--> |
52 <property name="zip.config.file" location="archive.cfg.xml" /> |
52 <property name="zip.config.file" location="archive.cfg.xml" /> |
53 <property name="zips.ee.spec.name" value="minibuild_archive" /> |
53 <property name="zips.ee.spec.name" value="minibuild_archive" /> |
|
54 <property name="zips.ee-empty.spec.name" value="empty_minibuild_archive" /> |
54 |
55 |
55 <!-- Synergy is not configured --> |
56 <!-- Synergy is not configured --> |
56 <property name="skip.password.validation" value="1" /> |
57 <property name="skip.password.validation" value="1" /> |
57 |
58 |
58 |
59 |
95 </fmpp> |
96 </fmpp> |
96 </target> |
97 </target> |
97 |
98 |
98 <!-- Test ec history option is create for single node build and merge is for multinode build. --> |
99 <!-- Test ec history option is create for single node build and merge is for multinode build. --> |
99 <target name="test-ec-history-option" if="build.system.ec-helium"> |
100 <target name="test-ec-history-option" if="build.system.ec-helium"> |
100 <loadfile srcfile="${build.log.dir}/${build.id}.${sysdef.configurations.list}_run_emake.bat" property="emake.bat.file"/> |
101 <loadfile srcfile="${temp.build.dir}/${build.id}.${sysdef.configurations.list}_run_emake.bat" property="emake.bat.file"/> |
101 <if> |
102 <if> |
102 <equals arg1="${ec.maxagents}" arg2="1" /> |
103 <equals arg1="${ec.maxagents}" arg2="1" /> |
103 <then> |
104 <then> |
104 <au:assertTrue> |
105 <au:assertTrue> |
105 <contains string="${emake.bat.file}" substring="--emake-history=create"/> |
106 <contains string="${emake.bat.file}" substring="--emake-history=create"/> |
230 <string id="test.id" value="${diamonds.log.start.output}" /> |
231 <string id="test.id" value="${diamonds.log.start.output}" /> |
231 <hlm:assertXmlEqual control="control.id" test="test.id" failonerror="true" /> |
232 <hlm:assertXmlEqual control="control.id" test="test.id" failonerror="true" /> |
232 </target> |
233 </target> |
233 |
234 |
234 |
235 |
235 <target name="mini-build-archive" depends="mini-build-archive-ant,mini-build-archive-ec-full" /> |
236 <target name="mini-build-archive" depends="mini-build-archive-ant,mini-build-archive-ec-full,mini-build-archive-ant-empty-config" /> |
236 |
237 |
237 <!-- This target will copy a part of the tree structure to test policy.remover mapper. --> |
238 <!-- This target will copy a part of the tree structure to test policy.remover mapper. --> |
238 <target name="prepare-archiving"> |
239 <target name="prepare-archiving"> |
239 <delete dir="${build.drive}/test_policy" failonerror="false" /> |
240 <delete dir="${build.drive}/test_policy" failonerror="false" /> |
240 <mkdir dir="${build.drive}/test_policy/os" /> |
241 <mkdir dir="${build.drive}/test_policy/os" /> |
263 <param name="build.system" value="ebs" /> |
264 <param name="build.system" value="ebs" /> |
264 <param name="archive.using.ec" value="false" /> |
265 <param name="archive.using.ec" value="false" /> |
265 <param name="zipping.type" value="ant" /> |
266 <param name="zipping.type" value="ant" /> |
266 <!-- Uses to set the target location --> |
267 <!-- Uses to set the target location --> |
267 </antcall> |
268 </antcall> |
|
269 |
|
270 </target> |
|
271 |
|
272 <target name="mini-build-archive-ant-empty-config"> |
|
273 <hlm:zipContentMacro type="ee-empty" ec="false" file="${zip.config.file}" failonemptyconfig="false" /> |
|
274 <au:expectfailure> |
|
275 <hlm:zipContentMacro type="ee-empty" ec="false" file="${zip.config.file}" failonemptyconfig="true" /> |
|
276 </au:expectfailure> |
268 </target> |
277 </target> |
269 |
278 |
270 <target name="do-mini-build-archive"> |
279 <target name="do-mini-build-archive"> |
271 <runtarget target="prepare-archiving" /> |
280 <runtarget target="prepare-archiving" /> |
272 <runtarget target="zip-ee" /> |
281 <runtarget target="zip-ee" /> |
286 <au:assertFileExists file="${zips.build.dir}/${zipping.type}/sf_os_1308.zip" /> |
295 <au:assertFileExists file="${zips.build.dir}/${zipping.type}/sf_os_1308.zip" /> |
287 </target> |
296 </target> |
288 |
297 |
289 |
298 |
290 <target name="mini-build-cleanup"> |
299 <target name="mini-build-cleanup"> |
291 <delete verbose="true" includeemptydirs="true"> |
300 <delete verbose="true" includeemptydirs="true" failonerror="false"> |
292 <fileset dir="${build.drive}/" casesensitive="false"> |
301 <fileset dir="${build.drive}/" casesensitive="false"> |
293 <include name="makefile" /> |
302 <include name="makefile" /> |
294 <include name="*.mk" /> |
303 <include name="*.mk" /> |
295 <include name="*.make" /> |
304 <include name="*.make" /> |
296 <include name="ecloud_tmp_*/**" /> |
305 <include name="ecloud_tmp_*/**" /> |
340 |
349 |
341 <if> |
350 <if> |
342 <isset property="build.system.ec-helium" /> |
351 <isset property="build.system.ec-helium" /> |
343 <then> |
352 <then> |
344 <au:assertFileExists file="${build.drive}/emake.data" /> |
353 <au:assertFileExists file="${build.drive}/emake.data" /> |
345 <au:assertFileExists file="${build.log.dir}/${build.id}.helium_minibuild_compile_run_emake.bat" /> |
354 <au:assertFileExists file="${temp.build.dir}/${build.id}.helium_minibuild_compile_run_emake.bat" /> |
346 </then> |
355 </then> |
347 </if> |
356 </if> |
348 |
357 |
349 <resourcecount property="fpsx.count"> |
358 <resourcecount property="fpsx.count"> |
350 <fileset dir="${build.output.dir}"> |
359 <fileset dir="${build.output.dir}"> |
365 </makefileset> |
374 </makefileset> |
366 <targetset> |
375 <targetset> |
367 <include name="fota" /> |
376 <include name="fota" /> |
368 </targetset> |
377 </targetset> |
369 </imakerconfiguration> |
378 </imakerconfiguration> |
370 <imakerconfiguration regionalVariation="true"> |
379 <imakerconfiguration> |
371 <makefileset> |
380 <makefileset> |
372 <include name="**/${product.name}/*ui.mk"/> |
381 <include name="**/${product.name}/*ui.mk"/> |
373 </makefileset> |
382 </makefileset> |
374 <targetset> |
383 <targetset> |
375 <include name="core(?:-prd|-rnd|-subcon)?$" /> |
384 <include name="core(?:-prd|-rnd|-subcon)?$" /> |
386 |
395 |
387 <fileset dir="${build.drive}/" id="mmp.to.target.config"> |
396 <fileset dir="${build.drive}/" id="mmp.to.target.config"> |
388 <include name="s60/app/**/*.mmp" /> |
397 <include name="s60/app/**/*.mmp" /> |
389 </fileset> |
398 </fileset> |
390 |
399 |
|
400 <import file="build.sbsinput.ant.xml" /> |
391 </project> |
401 </project> |
392 |
402 |