Add merge of RnD binaries into epoc32 tree as HLM target. Also create empty sources.csv and baseline.txt files if source sync/get baseline is disabled.
authorShabe Razvi <shaber@symbian.org>
Tue, 05 May 2009 16:32:16 +0100
changeset 85 834b82541047
parent 84 fcf94a72b33e
child 86 3922155d5f82
Add merge of RnD binaries into epoc32 tree as HLM target. Also create empty sources.csv and baseline.txt files if source sync/get baseline is disabled.
common/build.xml
--- a/common/build.xml	Tue May 05 14:21:55 2009 +0100
+++ b/common/build.xml	Tue May 05 16:32:16 2009 +0100
@@ -135,26 +135,29 @@
                 <runtarget target="preparation-getenv"/>
                 
             </then>
+            <else>
+                <!-- record fact that no baseline used. required by diamondize-bom  -->
+                <touch file="${build.drive}/output/logs/BOM/baseline.txt"/>
+            </else>
         </if>
         
         <if>
             <istrue value="${sf.spec.sourcesync.enable}" />
             <then>
                 <runtarget target="sf-get-source"/>
-                
+                <runtarget target="sf-merge-epoc32"/>
+
                 <if><istrue value="${sf.spec.package.src.enable}"/>
                 <then>
                     <echo message="INFO Packaging Source"/>
                     <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>
+            <else>
+                <!-- record fact that no sources.csv used. required by diamondize-bom  -->
+                <touch file="${build.log.dir}/BOM/sources.csv"/> 
+            </else>
         </if>        
       <if>
         <istrue value="${sf.spec.publish.enable}"/>
@@ -356,5 +359,13 @@
         </antcall>
     </target>
 
+    <target name="sf-merge-epoc32">
+    <!-- merge RnD binaries into the epoc tree -->
+        <echo message="Merges RnD binaries into the Epoc tree"/>
+        <copy todir="${build.drive}/epoc32" verbose="false" overwrite="true">
+            <fileset dir="${build.drive}/rnd"/>
+            <regexpmapper from="^(.*)/(.*)/epoc32/(.*)" to="\3" handledirsep="true"/>
+        </copy>
+  </target>
 </project>