# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1271161812 -3600
# Node ID f3b5772862f74400dab74025e6e81ff1313aa30e
# Parent  6dc1dae496c0cc3bf16ca66ee108fcbefbe67957# Parent  da1f0ffac2017e60d81cd6e7af72139d54784369
Merge windows tests fix for rpp dep files.

diff -r da1f0ffac201 -r f3b5772862f7 sbsv2/raptor/RELEASE-NOTES.html
--- a/sbsv2/raptor/RELEASE-NOTES.html	Fri Apr 09 17:57:03 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Tue Apr 13 13:30:12 2010 +0100
@@ -45,6 +45,7 @@
 <li>Fix : Makefile Parse Performance in Resource stage is poor. Large size of included dependency files is a factor. In --no-depend-generate mode, create dependency files which only refer to other rsg/mbg files that are yet to be built - store no other dependencies.</li>
 <li>Fix : don't generate multiple copies of the same resource just because there are several target paths. Generate it once and copy that to the different target paths.</li>
 <li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2302"> SF Bug 2302 </a> - sbs_filter refers to python.exe in win32/python264/                                                                  </li>
+<li>                                                                  Fix : ensure that FLMDEBUG is empty by default                                                                                          </li>
 
 </ul>
 
diff -r da1f0ffac201 -r f3b5772862f7 sbsv2/raptor/lib/config/root.xml
--- a/sbsv2/raptor/lib/config/root.xml	Fri Apr 09 17:57:03 2010 +0100
+++ b/sbsv2/raptor/lib/config/root.xml	Tue Apr 13 13:30:12 2010 +0100
@@ -11,6 +11,8 @@
 	-->
 
 	<var name="root">
+		<env name='FLMDEBUG' default=''/>	
+	
 		<varRef ref="root.places"/>
 		<varRef ref="root.properties"/>
 		
diff -r da1f0ffac201 -r f3b5772862f7 sbsv2/raptor/lib/flm/base.xml
--- a/sbsv2/raptor/lib/flm/base.xml	Fri Apr 09 17:57:03 2010 +0100
+++ b/sbsv2/raptor/lib/flm/base.xml	Tue Apr 13 13:30:12 2010 +0100
@@ -16,6 +16,7 @@
 		<param name='PROJECT_META' default=''/>     <!-- my.mmp  -->
 		<param name='DATE' default=''/>
 		<param name='DUMPBCINFO' default=''/>
+		<param name='FLMDEBUG'  default=''/>
 		<param name='PLATFORM' default=''/>
 		<param name='GNUMAKE38'/>
 		<param name='GNUCP'/>
diff -r da1f0ffac201 -r f3b5772862f7 sbsv2/raptor/lib/flm/resource.flm
--- a/sbsv2/raptor/lib/flm/resource.flm	Fri Apr 09 17:57:03 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Tue Apr 13 13:30:12 2010 +0100
@@ -156,7 +156,7 @@
       # of full dependency information which can overwhelm make in large builds.
       # The strategy is to filter out lines (apart from the target line which is the first) which don't have .rsg or 
       # .mbg dependencies in them. 
-      DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '1 p;\% [^ \/]+\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
+      DEPENDENCY_CORRECTOR:={ $(GNUSED) -n -r '/.*: +.$$$$/ p;\%\.((rsg)|(mbg))%I {s% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig; p}' && echo "" ; }
     else
       # Generate full dependency information
       DEPENDENCY_CORRECTOR:=$(GNUSED)  -r 's% ([^ \/]+\.((rsg)|(mbg)))% $(EPOCROOT)\/epoc32\/include\/\1%ig' 
diff -r da1f0ffac201 -r f3b5772862f7 sbsv2/raptor/python/raptor_version.py
--- a/sbsv2/raptor/python/raptor_version.py	Fri Apr 09 17:57:03 2010 +0100
+++ b/sbsv2/raptor/python/raptor_version.py	Tue Apr 13 13:30:12 2010 +0100
@@ -16,7 +16,7 @@
 
 # replace CHANGESET with the Hg changeset for ANY release
 
-version=(2,13,0,"2010-04-09","symbian build system","CHANGESET")
+version=(2,13,0,"2010-04-12","symbian build system","CHANGESET")
 
 def numericversion():
 	"""Raptor version string"""
diff -r da1f0ffac201 -r f3b5772862f7 sbsv2/raptor/test/smoke_suite/resource.py
--- a/sbsv2/raptor/test/smoke_suite/resource.py	Fri Apr 09 17:57:03 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/resource.py	Tue Apr 13 13:30:12 2010 +0100
@@ -90,7 +90,7 @@
 	t.mustnotmatch = []
 
 	t.mustmatch = [
-			"3 .*.dependentresource_.dependentresource_sc.rpp.d"
+			"4 .*.dependentresource_.dependentresource_sc.rpp.d"
 		      ]
 
 	t.run()