# HG changeset patch
# User ShabeR@UK-SHABER
# Date 1240244836 -3600
# Node ID 0099c046d4f388d59f36693235871e0042eaa311
# Parent  3554074ceb3497bb4518353cac7b6813f9a9d0d1
Add intersection target to FBF

diff -r 3554074ceb34 -r 0099c046d4f3 common/build.xml
--- a/common/build.xml	Mon Apr 20 16:26:33 2009 +0100
+++ b/common/build.xml	Mon Apr 20 17:27:16 2009 +0100
@@ -228,6 +228,24 @@
     </if>
   </target>
   
+    <target name="sf-intersect-dir">
+    <property name="sf.currentlist_a.name"   value="${sf.list_a.name}"/> 
+    <property name="sf.currentlist_b.name"   value="${sf.list_b.name}"/>
+    <property name="sf.dir.location" value="${build.drive}/epoc32"/> 
+    		
+    <if>
+      <istrue value="${sf.spec.dirdelta.enable}"/>
+      <then>
+        <echo message="Inersection requested for ${sf.currentlist_a.name} vs ${sf.currentlist_b.name} "/>
+        <exec executable="perl" dir="${build.log.dir}/" failonerror="true" output="${build.log.dir}/listdir_${build.id}_${sf.currentlist_b.name}_intersect.log">
+          <arg value="${sf.common.config.dir}/tools/difflist.pl"/>
+          <arg value="${build.log.dir}/listdir_${build.id}_${sf.currentlist_a.name}.log"/>
+          <arg value="${build.log.dir}/listdir_${build.id}_${sf.currentlist_b.name}.log"/>
+          <arg value="-I"/> <!-- run difflist in intersect mode -->
+        </exec>
+      </then>
+    </if>
+  </target>
     <target name="sf-build-noprep" depends="sf-compile">
         <echo>[SF-BUILD-NOPREP]</echo>
     </target>
diff -r 3554074ceb34 -r 0099c046d4f3 sf-platform/build.xml
--- a/sf-platform/build.xml	Mon Apr 20 16:26:33 2009 +0100
+++ b/sf-platform/build.xml	Mon Apr 20 17:27:16 2009 +0100
@@ -273,6 +273,15 @@
 			<param name="sf.list_a.name" value="post-clean"/>
 			<param name="sf.list_b.name" value="post-build-main"/>
 		</antcall>
+		
+		<!-- what has been cleaned and rebuilt -->
+		<antcall target="sf-intersect-dir" inheritAll="false">
+			<param name="sf.list_a.name" value="post-clean_delta"/>       <!-- clean list -->
+			<param name="sf.list_b.name" value="post-build-main_delta"/>  <!-- built list -->
+		</antcall>
+		
+		<!-- what has been cleaned and not rebuilt -->
+		
   </target>
 
   <!--
@@ -397,6 +406,13 @@
 				<param name="sf.list_a.name" value="s60-baseline"/>
 				<param name="sf.list_b.name" value="post-s60-bldmelast"/>
 			</antcall>		
+			
+			<!-- what has been cleaned and rebuilt -->
+			<antcall target="sf-intersect-dir" inheritAll="false">
+				<param name="sf.list_a.name" value="post-s60-clean_delta"/>       <!-- clean list -->
+				<param name="sf.list_b.name" value="post-s60-bldmelast_delta"/>  <!-- built list -->
+			</antcall>
+		
 	</target>
 
   <!-- import sf-common-config -->