Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fixes for using Cairo on MSW.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-05-31 19:16:55 +00:00
parent 769c3372a2
commit 9f2b6b31b7
5 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
build/tools/build-wxwidgets.py
View File

@@ -396,6 +396,11 @@ def main(scriptName, args):
args.append("BUILD=release")
else:
args.append("BUILD=debug")
if options.shared:
args.append("SHARED=1")
if options.cairo:
args.append("USE_CAIRO=1")
wxBuilder = builder.MSVCBuilder()
@@ -416,11 +421,7 @@ def main(scriptName, args):
if options.clean:
print "Performing cleanup."
wxBuilder.clean()
if options.wxpython:
exitIfError(wxBuilder.clean(os.path.join(contribDir, "gizmos")), "Error building gizmos")
exitIfError(wxBuilder.clean(os.path.join(contribDir, "stc")), "Error building stc")
wxBuilder.clean(dir=buildDir, options=args)
sys.exit(0)
@@ -430,21 +431,12 @@ def main(scriptName, args):
if not sys.platform.startswith("win"):
args.append("--jobs=" + options.jobs)
exitIfError(wxBuilder.build(dir=buildDir, options=args), "Error building")
if options.wxpython and os.path.exists(contribDir):
exitIfError(wxBuilder.build(os.path.join(contribDir, "gizmos"), options=args), "Error building gizmos")
exitIfError(wxBuilder.build(os.path.join(contribDir, "stc"),options=args), "Error building stc")
if options.install:
extra=None
if installDir:
extra = ['DESTDIR='+installDir]
wxBuilder.install(dir=buildDir, options=extra)
if options.wxpython and os.path.exists(contribDir):
exitIfError(wxBuilder.install(os.path.join(contribDir, "gizmos"), options=extra), "Error building gizmos")
exitIfError(wxBuilder.install(os.path.join(contribDir, "stc"), options=extra), "Error building stc")
wxBuilder.install(dir=buildDir, options=extra)
if options.install and options.mac_framework:

16
build/tools/builder.py
View File

@@ -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