equal
deleted
inserted
replaced
279 <if> |
279 <if> |
280 <istrue value="${sf.spec.package.bin.enable}"/> |
280 <istrue value="${sf.spec.package.bin.enable}"/> |
281 <then> |
281 <then> |
282 <echo message="INFO Packaging Binaries"/> |
282 <echo message="INFO Packaging Binaries"/> |
283 <runtarget target="sf-package-binary"/> |
283 <runtarget target="sf-package-binary"/> |
|
284 <runtarget target="sf-package-tools"/> |
284 </then> |
285 </then> |
285 </if> |
286 </if> |
286 </parallel> |
287 </parallel> |
287 |
288 |
288 <if><istrue value="${sf.spec.test.sendpkg.enable}"/> |
289 <if><istrue value="${sf.spec.test.sendpkg.enable}"/> |
475 <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/> |
476 <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/> |
476 <param name="zip.target.name" value="src" /> |
477 <param name="zip.target.name" value="src" /> |
477 </antcall> |
478 </antcall> |
478 </target> |
479 </target> |
479 |
480 |
|
481 <target name="sf-package-tools" depends="sf-preprocess-package-config"> |
|
482 <echo message="Packaging epoc32 tools - Temporary method"/> |
|
483 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log"> |
|
484 <arg value="a"/> |
|
485 <arg value="-tzip"/> |
|
486 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> |
|
487 <!-- <arg value="-x@${build.log.dir}/*_includefile.txt"/> --> |
|
488 <arg value="tools_epoc.zip"/> |
|
489 <arg value="epoc32/tools"/> |
|
490 </exec> |
|
491 <if><available file="${build.drive}/tools_epoc.zip"/> |
|
492 <then><move file="${build.drive}/tools_epoc.zip" todir="${build.drive}/output/zips/"/></then> |
|
493 </if> |
|
494 |
|
495 </target> |
|
496 |
|
497 |
480 <target name="sf-package-binary" depends="sf-preprocess-package-config,sf-package-postbuild-rnd"> |
498 <target name="sf-package-binary" depends="sf-preprocess-package-config,sf-package-postbuild-rnd"> |
481 <!--antcall target="sf-zip-content"> |
499 <!--antcall target="sf-zip-content"> |
482 <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/> |
500 <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/> |
483 <param name="zip.target.name" value="bin" /> |
501 <param name="zip.target.name" value="bin" /> |
484 </antcall--> |
502 </antcall--> |
488 <echo message="Packaging with exclude list"/> |
506 <echo message="Packaging with exclude list"/> |
489 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log"> |
507 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log"> |
490 <arg value="a"/> |
508 <arg value="a"/> |
491 <arg value="-tzip"/> |
509 <arg value="-tzip"/> |
492 <arg value="-x@${build.drive}/rnd_excludefile.txt"/> <!-- excludes --> |
510 <arg value="-x@${build.drive}/rnd_excludefile.txt"/> <!-- excludes --> |
|
511 <arg value="-x!epoc32\tools"/> |
493 <arg value="-x!epoc32\build"/> |
512 <arg value="-x!epoc32\build"/> |
494 <arg value="-xr!*.sym"/> |
513 <arg value="-xr!*.sym"/> |
495 <arg value="binaries_epoc.zip"/> |
514 <arg value="binaries_epoc.zip"/> |
496 <arg value="epoc32\"/> |
515 <arg value="epoc32\"/> |
497 </exec> |
516 </exec> |
500 <else> |
519 <else> |
501 <echo message="Packaging without exclude list"/> |
520 <echo message="Packaging without exclude list"/> |
502 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log"> |
521 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log"> |
503 <arg value="a"/> |
522 <arg value="a"/> |
504 <arg value="-tzip"/> |
523 <arg value="-tzip"/> |
|
524 <arg value="-x!epoc32\tools"/> |
505 <arg value="-x!epoc32\build"/> <!-- excludes --> |
525 <arg value="-x!epoc32\build"/> <!-- excludes --> |
506 <arg value="-xr!*.sym"/> |
526 <arg value="-xr!*.sym"/> |
507 <arg value="binaries_epoc.zip"/> |
527 <arg value="binaries_epoc.zip"/> |
508 <arg value="epoc32\"/> |
528 <arg value="epoc32\"/> |
509 </exec> |
529 </exec> |
510 </else> |
530 </else> |
511 </if> |
531 </if> |
512 <if><available file="${build.drive}/binaries_epoc.zip"/> |
532 <if><available file="${build.drive}/binaries_epoc.zip"/> |
513 <then><move file="${build.drive}/binaries_epoc.zip" todir="${build.drive}/output/zips/"/></then> |
533 <then><move file="${build.drive}/binaries_epoc.zip" todir="${build.drive}/output/zips/"/></then> |
514 </if> |
534 </if> |
|
535 |
515 </target> |
536 </target> |
516 |
537 |
517 <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config"> |
538 <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config"> |
518 |
539 |
519 <!-- zip any RnD _includefile.txt files generated during source packaging --> |
540 <!-- zip any RnD _includefile.txt files generated during source packaging --> |