equal
deleted
inserted
replaced
115 usetalon_s = evaluator.Get("USE_TALON") |
115 usetalon_s = evaluator.Get("USE_TALON") |
116 self.usetalon = usetalon_s is not None and usetalon_s != "" |
116 self.usetalon = usetalon_s is not None and usetalon_s != "" |
117 self.talonshell = str(evaluator.Get("TALON_SHELL")) |
117 self.talonshell = str(evaluator.Get("TALON_SHELL")) |
118 self.talontimeout = str(evaluator.Get("TALON_TIMEOUT")) |
118 self.talontimeout = str(evaluator.Get("TALON_TIMEOUT")) |
119 self.talonretries = str(evaluator.Get("TALON_RETRIES")) |
119 self.talonretries = str(evaluator.Get("TALON_RETRIES")) |
|
120 |
|
121 # work around for RVCT 2.2 failed compiles |
|
122 delete_on_failed_compile_s = evaluator.Get("DELETE_ON_FAILED_COMPILE") |
|
123 self.delete_on_failed_compile = "" |
|
124 if delete_on_failed_compile_s is not None and delete_on_failed_compile_s != "": |
|
125 self.delete_on_failed_compile = "1" |
120 |
126 |
121 # commands |
127 # commands |
122 self.initCommand = evaluator.Get("initialise") |
128 self.initCommand = evaluator.Get("initialise") |
123 self.buildCommand = evaluator.Get("build") |
129 self.buildCommand = evaluator.Get("build") |
124 self.shutdownCommand = evaluator.Get("shutdown") |
130 self.shutdownCommand = evaluator.Get("shutdown") |
228 HOSTPLATFORM_DIR:=%s |
234 HOSTPLATFORM_DIR:=%s |
229 OSTYPE:=%s |
235 OSTYPE:=%s |
230 FLMHOME:=%s |
236 FLMHOME:=%s |
231 SHELL:=%s |
237 SHELL:=%s |
232 THIS_FILENAME:=$(firstword $(MAKEFILE_LIST)) |
238 THIS_FILENAME:=$(firstword $(MAKEFILE_LIST)) |
|
239 DELETE_ON_FAILED_COMPILE:=%s |
233 |
240 |
234 %s |
241 %s |
235 |
242 |
236 include %s |
243 include %s |
237 |
244 |
239 " ".join(raptor.hostplatform), |
246 " ".join(raptor.hostplatform), |
240 raptor.hostplatform_dir, |
247 raptor.hostplatform_dir, |
241 self.raptor.filesystem, |
248 self.raptor.filesystem, |
242 str(self.raptor.systemFLM), |
249 str(self.raptor.systemFLM), |
243 self.shellpath, |
250 self.shellpath, |
|
251 self.delete_on_failed_compile, |
244 talon_settings, |
252 talon_settings, |
245 self.raptor.systemFLM.Append('globals.mk') ) |
253 self.raptor.systemFLM.Append('globals.mk') ) |
246 |
254 |
247 # Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to |
255 # Unless dependency processing has been eschewed via the CLI, use a .DEFAULT target to |
248 # trap missing dependencies (ignoring user config files that we know are usually absent) |
256 # trap missing dependencies (ignoring user config files that we know are usually absent) |