X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1098adfe2ca30f011f370da2c34278a7e3282e1..ef40bc3dae5b9bce810fa6d44b5f43071109a2d9:/build/tools/builder.py diff --git a/build/tools/builder.py b/build/tools/builder.py index 5eecbe87a2..a61ca3d2b2 100755 --- a/build/tools/builder.py +++ b/build/tools/builder.py @@ -18,7 +18,7 @@ def runInDir(command, dir=None, verbose=True): commandStr = " ".join(command) if verbose: - print commandStr + print(commandStr) result = os.system(commandStr) if dir: @@ -89,17 +89,21 @@ class Builder: return self.name - def clean(self, dir=None, projectFile=None): + def clean(self, dir=None, projectFile=None, options=None): """ dir = the directory containing the project file projectFile = Some formats need to explicitly specify the project file's name """ - - args = [self.getProgramPath(), "clean"] - if dir: - args.append(dir) if self.isAvailable(): - result = runInDir(args) + if options: + optionList = list(options) + else: + optionList = [] + + optionList.insert(0, self.getProgramPath()) + optionList.append("clean") + + result = runInDir(optionList, dir) return result return False @@ -177,7 +181,7 @@ class AutoconfBuilder(GNUMakeBuilder): optionsStr = string.join(options, " ") if options else "" command = "%s %s" % (configure_cmd, optionsStr) - print command + print(command) result = os.system(command) #os.chdir(olddir) return result @@ -200,7 +204,7 @@ class MSVCProjectBuilder(Builder): Builder.__init__(self, commandName="VCExpress.exe", formatName="msvcProject") for key in ["VS90COMNTOOLS", "VC80COMNTOOLS", "VC71COMNTOOLS"]: if os.environ.has_key(key): - self.prgoramDir = os.path.join(os.environ[key], "..", "IDE") + self.programDir = os.path.join(os.environ[key], "..", "IDE") if self.programDir == None: for version in ["9.0", "8", ".NET 2003"]: