# HG changeset patch
# User ThomasE@UK-ThomasE.symbian.int
# Date 1242228380 -3600
# Node ID fb924d87bc0c72b04bf6ec54503d9d6e07988a6d
# Parent  5e9bdb9269c7e414d65af66c640f8ed61101ed31# Parent  27826401fee51a09b9bccce864627198b5f95dfb
Merge with previous modifications.

diff -r 5e9bdb9269c7 -r fb924d87bc0c common/build.xml
--- a/common/build.xml	Wed May 13 16:25:14 2009 +0100
+++ b/common/build.xml	Wed May 13 16:26:20 2009 +0100
@@ -406,8 +406,12 @@
         <then>
         <echo message="RnD binaries found, fast-copying into ${build.drive}/epoc32 tree"/>
         <hlm:fastcopy todir="${build.drive}/epoc32" verbose="true" overwrite="true" threadCount="4">
-            <fileset dir="${build.drive}/rnd"/>
-            <regexpmapper from="^(.*)/(.*)/epoc32/(.*)" to="\3" handledirsep="true"/>
+            <fileset dir="${build.drive}/rnd">
+            <exclude name="**/.hg/**"/>
+            </fileset>
+            <regexpmapper from="internal/initial/epoc32/(.*)" to="\1" handledirsep="true"/>
+            <!--regexpmapper from="[^/]+/[^/]+/epoc32/(.*)" to="\1" handledirsep="true"/-->
+            <!-- TODO make match exactly 2 levels deep otherwise nested epoc32 trees will also be merged -->
         </hlm:fastcopy>
         </then>
     </if>