equal
deleted
inserted
replaced
404 <!-- conditional execution of merge if rnd dir is found --> |
404 <!-- conditional execution of merge if rnd dir is found --> |
405 <if><available file="${build.drive}/rnd" type="dir" /> |
405 <if><available file="${build.drive}/rnd" type="dir" /> |
406 <then> |
406 <then> |
407 <echo message="RnD binaries found, fast-copying into ${build.drive}/epoc32 tree"/> |
407 <echo message="RnD binaries found, fast-copying into ${build.drive}/epoc32 tree"/> |
408 <hlm:fastcopy todir="${build.drive}/epoc32" verbose="true" overwrite="true" threadCount="4"> |
408 <hlm:fastcopy todir="${build.drive}/epoc32" verbose="true" overwrite="true" threadCount="4"> |
409 <fileset dir="${build.drive}/rnd"/> |
409 <fileset dir="${build.drive}/rnd"> |
410 <regexpmapper from="^(.*)/(.*)/epoc32/(.*)" to="\3" handledirsep="true"/> |
410 <exclude name="**/.hg/**"/> |
|
411 </fileset> |
|
412 <regexpmapper from="internal/initial/epoc32/(.*)" to="\1" handledirsep="true"/> |
|
413 <!--regexpmapper from="[^/]+/[^/]+/epoc32/(.*)" to="\1" handledirsep="true"/--> |
|
414 <!-- TODO make match exactly 2 levels deep otherwise nested epoc32 trees will also be merged --> |
411 </hlm:fastcopy> |
415 </hlm:fastcopy> |
412 </then> |
416 </then> |
413 </if> |
417 </if> |
414 </target> |
418 </target> |
415 |
419 |