--- a/sbsv2/raptor/python/raptor_make.py Tue May 18 19:36:14 2010 +0100
+++ b/sbsv2/raptor/python/raptor_make.py Fri Jun 04 13:09:28 2010 +0100
@@ -68,7 +68,10 @@
def AnnoFileParseOutput(annofile):
""" A generator that extracts log output from an emake annotation file,
perform an XML-unescape on it and "yields" it line by line. """
- af = open(annofile, "r")
+ if isinstance(annofile,str):
+ af = open(annofile, "r")
+ else:
+ af = annofile
inOutput = False
@@ -158,6 +161,12 @@
self.talonshell = str(evaluator.Get("TALON_SHELL"))
self.talontimeout = str(evaluator.Get("TALON_TIMEOUT"))
self.talonretries = str(evaluator.Get("TALON_RETRIES"))
+
+ # work around for RVCT 2.2 failed compiles
+ delete_on_failed_compile_s = evaluator.Get("DELETE_ON_FAILED_COMPILE")
+ self.delete_on_failed_compile = ""
+ if delete_on_failed_compile_s is not None and delete_on_failed_compile_s != "":
+ self.delete_on_failed_compile = "1"
# commands
self.initCommand = evaluator.Get("initialise")
@@ -271,6 +280,7 @@
FLMHOME:=%s
SHELL:=%s
THIS_FILENAME:=$(firstword $(MAKEFILE_LIST))
+DELETE_ON_FAILED_COMPILE:=%s
%s
@@ -282,6 +292,7 @@
self.raptor.filesystem,
str(self.raptor.systemFLM),
self.shellpath,
+ self.delete_on_failed_compile,
talon_settings,
self.raptor.systemFLM.Append('globals.mk') )