# HG changeset patch
# User ThomasE@UK-ThomasE.symbian.int
# Date 1241186857 -3600
# Node ID 5e724ff842b4a1e40e1510b0c3a78a21b98574c1
# Parent  5e7e3b1825aa5a5c9464a916e670edf3e355655d
Added RnD binaries support in PRE-BUILD stage.

diff -r 5e7e3b1825aa -r 5e724ff842b4 common/build.xml
--- a/common/build.xml	Fri May 01 14:06:09 2009 +0100
+++ b/common/build.xml	Fri May 01 15:07:37 2009 +0100
@@ -148,6 +148,12 @@
 					<runtarget target="sf-package-source"/>
 				</then>
 				</if>
+				
+				<!-- merge RnD binaries into the epoc tree -->
+				<echo message="Merges RnD binaries into the Epoc tree"/>
+				<exec executable="perl" dir="${build.drive}/" failonerror="true" output="${build.log.dir}/mergeepoc32.log">
+					<arg value="${sf.common.config.dir}/tools/mergeepoc32.pl"/>
+				</exec>
             </then>
         </if>        
       <if>
diff -r 5e7e3b1825aa -r 5e724ff842b4 common/tools/mergeepoc32.pl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/tools/mergeepoc32.pl	Fri May 01 15:07:37 2009 +0100
@@ -0,0 +1,12 @@
+#!perl -w
+use strict;
+
+# Assume that all rnd repositories are delivered onto the build machine in \rnd\category\name\epoc32\...
+
+my @rndRepositories = glob "/rnd/*/*";
+foreach (@rndRepositories)
+{
+	s{/}{\\}g;
+	system("xcopy /Q/C/I/Y/E $_\\epoc32 \\epoc32 > nul:");
+}
+