# HG changeset patch
# User raptorbot <raptorbot@systemstesthead.symbian.intra>
# Date 1263832822 0
# Node ID e8506cb183056b7e72006f25f05765ecb1579387
# Parent  4f2ae0d78608ece1f390da12d3fcecc5f6e7940e# Parent  ab4f8683701c562d73e3903e37390f885eb9fc10
Merge

diff -r 4f2ae0d78608 -r e8506cb18305 sbsv2/raptor/python/raptor_meta.py
--- a/sbsv2/raptor/python/raptor_meta.py	Mon Jan 18 16:39:52 2010 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py	Mon Jan 18 16:40:22 2010 +0000
@@ -2449,7 +2449,8 @@
 			key = str(detail['VARIANT_HRH']) \
 			 	+ str(detail['EPOCROOT']) \
 		    	+ detail['SYSTEMINCLUDE'] \
-		    	+ detail['PLATFORM']
+		    	+ detail['PLATFORM'] \
+		    	+ detail['PLATMACROS']
 
 		    # Keep a short version of the key for use in filenames.
 			uniq = hashlib.md5()
@@ -2485,11 +2486,7 @@
 			# Is this an unseen build platform?
 			# concatenate all the values we care about in a fixed order
 			# and use that as a signature for the platform.
-			items = ['PLATFORM', 'EPOCROOT', 'VARIANT_HRH', 'SYSTEMINCLUDE', 'TESTCODE']
-			if raptor_utilities.getOSPlatform().startswith("win"):
-				items.append('PLATMACROS.WINDOWS')
-			else:
-				items.append('PLATMACROS.LINUX')
+			items = ['PLATFORM', 'PLATMACROS', 'EPOCROOT', 'VARIANT_HRH', 'SYSTEMINCLUDE', 'TESTCODE']
 
 			items.extend(interfaces)
 			platform = ""