equal
deleted
inserted
replaced
159 usetalon_s = evaluator.Get("USE_TALON") |
159 usetalon_s = evaluator.Get("USE_TALON") |
160 self.usetalon = usetalon_s is not None and usetalon_s != "" |
160 self.usetalon = usetalon_s is not None and usetalon_s != "" |
161 self.talonshell = str(evaluator.Get("TALON_SHELL")) |
161 self.talonshell = str(evaluator.Get("TALON_SHELL")) |
162 self.talontimeout = str(evaluator.Get("TALON_TIMEOUT")) |
162 self.talontimeout = str(evaluator.Get("TALON_TIMEOUT")) |
163 self.talonretries = str(evaluator.Get("TALON_RETRIES")) |
163 self.talonretries = str(evaluator.Get("TALON_RETRIES")) |
|
164 |
|
165 # work around for RVCT 2.2 failed compiles |
|
166 delete_on_failed_compile_s = evaluator.Get("DELETE_ON_FAILED_COMPILE") |
|
167 self.delete_on_failed_compile = "" |
|
168 if delete_on_failed_compile_s is not None and delete_on_failed_compile_s != "": |
|
169 self.delete_on_failed_compile = "1" |
164 |
170 |
165 # commands |
171 # commands |
166 self.initCommand = evaluator.Get("initialise") |
172 self.initCommand = evaluator.Get("initialise") |
167 self.buildCommand = evaluator.Get("build") |
173 self.buildCommand = evaluator.Get("build") |
168 self.shutdownCommand = evaluator.Get("shutdown") |
174 self.shutdownCommand = evaluator.Get("shutdown") |
272 HOSTPLATFORM_DIR:=%s |
278 HOSTPLATFORM_DIR:=%s |
273 OSTYPE:=%s |
279 OSTYPE:=%s |
274 FLMHOME:=%s |
280 FLMHOME:=%s |
275 SHELL:=%s |
281 SHELL:=%s |
276 THIS_FILENAME:=$(firstword $(MAKEFILE_LIST)) |
282 THIS_FILENAME:=$(firstword $(MAKEFILE_LIST)) |
|
283 DELETE_ON_FAILED_COMPILE:=%s |
277 |
284 |
278 %s |
285 %s |
279 |
286 |
280 include %s |
287 include %s |
281 |
288 |
283 " ".join(raptor.hostplatform), |
290 " ".join(raptor.hostplatform), |
284 raptor.hostplatform_dir, |
291 raptor.hostplatform_dir, |
285 self.raptor.filesystem, |
292 self.raptor.filesystem, |
286 str(self.raptor.systemFLM), |
293 str(self.raptor.systemFLM), |
287 self.shellpath, |
294 self.shellpath, |
|
295 self.delete_on_failed_compile, |
288 talon_settings, |
296 talon_settings, |
289 self.raptor.systemFLM.Append('globals.mk') ) |
297 self.raptor.systemFLM.Append('globals.mk') ) |
290 |
298 |
291 # Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to |
299 # Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to |
292 # trap missing dependencies (ignoring user config files that we know are usually absent) |
300 # trap missing dependencies (ignoring user config files that we know are usually absent) |