equal
deleted
inserted
replaced
2447 # we need already using another platform with compatible values. |
2447 # we need already using another platform with compatible values. |
2448 |
2448 |
2449 key = str(detail['VARIANT_HRH']) \ |
2449 key = str(detail['VARIANT_HRH']) \ |
2450 + str(detail['EPOCROOT']) \ |
2450 + str(detail['EPOCROOT']) \ |
2451 + detail['SYSTEMINCLUDE'] \ |
2451 + detail['SYSTEMINCLUDE'] \ |
2452 + detail['PLATFORM'] |
2452 + detail['PLATFORM'] \ |
|
2453 + detail['PLATMACROS'] |
2453 |
2454 |
2454 # Keep a short version of the key for use in filenames. |
2455 # Keep a short version of the key for use in filenames. |
2455 uniq = hashlib.md5() |
2456 uniq = hashlib.md5() |
2456 uniq.update(key) |
2457 uniq.update(key) |
2457 |
2458 |
2483 self.ExportPlatforms.append(exp) |
2484 self.ExportPlatforms.append(exp) |
2484 |
2485 |
2485 # Is this an unseen build platform? |
2486 # Is this an unseen build platform? |
2486 # concatenate all the values we care about in a fixed order |
2487 # concatenate all the values we care about in a fixed order |
2487 # and use that as a signature for the platform. |
2488 # and use that as a signature for the platform. |
2488 items = ['PLATFORM', 'EPOCROOT', 'VARIANT_HRH', 'SYSTEMINCLUDE', 'TESTCODE'] |
2489 items = ['PLATFORM', 'PLATMACROS', 'EPOCROOT', 'VARIANT_HRH', 'SYSTEMINCLUDE', 'TESTCODE'] |
2489 if raptor_utilities.getOSPlatform().startswith("win"): |
|
2490 items.append('PLATMACROS.WINDOWS') |
|
2491 else: |
|
2492 items.append('PLATMACROS.LINUX') |
|
2493 |
2490 |
2494 items.extend(interfaces) |
2491 items.extend(interfaces) |
2495 platform = "" |
2492 platform = "" |
2496 for i in items: |
2493 for i in items: |
2497 if i in detail: |
2494 if i in detail: |