diff -r 34d87ffcc373 -r ea23b18a2ff6 sbsv2/raptor/python/raptor.py --- a/sbsv2/raptor/python/raptor.py Wed Nov 18 21:50:36 2009 +0000 +++ b/sbsv2/raptor/python/raptor.py Thu Nov 19 18:52:19 2009 +0000 @@ -274,7 +274,7 @@ # convert the list of bld.inf files into a specification # hierarchy suitable for all the configurations we are using. self.specs = list(build.generic_specs) - self.specs.extend(metaReader.ReadBldInfFiles(self.children, build.doExportOnly)) + self.specs.extend(metaReader.ReadBldInfFiles(self.children, doexport = build.doExport, dobuild = not build.doExportOnly)) except raptor_meta.MetaDataError, e: build.Error(e.Text) @@ -355,6 +355,14 @@ var.AddOperation(raptor_data.Set("MAKEFILE_PATH", makefile_path)) var.AddOperation(raptor_data.Set("CONFIGS", configList)) var.AddOperation(raptor_data.Set("CLI_OPTIONS", cli_options)) + + + # Allow the flm to skip exports. Note: this parameter + doexport_str = '1' + if not build.doExport: + doexport_str = '' + var.AddOperation(raptor_data.Set("DOEXPORT", doexport_str )) + # Pass on '-n' (if specified) to the makefile-generating sbs calls if build.noBuild: var.AddOperation(raptor_data.Set("NO_BUILD", "1")) @@ -467,6 +475,7 @@ self.maker = None self.debugOutput = False self.doExportOnly = False + self.doExport = True self.noBuild = False self.noDependInclude = False self.projects = set() @@ -568,6 +577,10 @@ self.doExportOnly = TrueOrFalse return True + def SetNoExport(self, TrueOrFalse): + self.doExport = TrueOrFalse + return True + def SetNoBuild(self, TrueOrFalse): self.noBuild = TrueOrFalse return True @@ -634,8 +647,6 @@ type = type.lower() if type == "on": self.doParallelParsing = True - elif type == "slave": - self.isParallelParsingSlave = True elif type == "off": self.doParallelParsing = False else: