equal
deleted
inserted
replaced
629 else: |
629 else: |
630 self.logFileName = generic_path.Path(logfile) |
630 self.logFileName = generic_path.Path(logfile) |
631 return True |
631 return True |
632 |
632 |
633 def SetMakeEngine(self, makeEngine): |
633 def SetMakeEngine(self, makeEngine): |
634 self.makeEngine = makeEngine |
634 self.makeEngineName = makeEngine |
635 return True |
635 return True |
636 |
636 |
637 def AddMakeOption(self, makeOption): |
637 def AddMakeOption(self, makeOption): |
638 self.makeOptions.append(makeOption) |
638 self.makeOptions.append(makeOption) |
639 return True |
639 return True |
1274 self.AssertBuildOK() |
1274 self.AssertBuildOK() |
1275 |
1275 |
1276 if self.toolcheck != 'off': |
1276 if self.toolcheck != 'off': |
1277 self.CheckConfigs(buildUnitsToBuild) |
1277 self.CheckConfigs(buildUnitsToBuild) |
1278 else: |
1278 else: |
1279 self.Info(" Not Checking Tool Versions") |
1279 self.Info("Not Checking Tool Versions") |
1280 |
1280 |
1281 self.AssertBuildOK() |
1281 self.AssertBuildOK() |
1282 |
1282 |
1283 # Setup a make engine. |
1283 # Setup a make engine. |
1284 if not self.maker: |
1284 if not self.maker: |
1285 self.maker = raptor_make.MakeEngine(self) |
1285 try: |
1286 if self.maker == None: |
1286 self.maker = raptor_make.MakeEngine(self, self.makeEngineName) |
1287 self.Error("No make engine present") |
1287 except raptor_make.BadMakeEngineException,e: |
|
1288 self.Error("Unable to use make engine: %s " % str(e)) |
|
1289 |
1288 |
1290 |
1289 self.AssertBuildOK() |
1291 self.AssertBuildOK() |
1290 |
1292 |
1291 # if self.doParallelParsing and not (len(layers) == 1 and len(layers[0]) == 1): |
1293 # if self.doParallelParsing and not (len(layers) == 1 and len(layers[0]) == 1): |
1292 if self.doParallelParsing: |
1294 if self.doParallelParsing: |