Import and use build_wxwidgets from buildtools

build.py

@@ -1135,18 +1135,16 @@ def cmd_build_wx(options, args):
                     
     try:
         # Import and run the wxWidgets build script
-        wxscript = os.path.join(wxDir(), "build/tools/build-wxwidgets.py")
-        sys.path.insert(0, os.path.dirname(wxscript))
-        wxbuild = __import__('build-wxwidgets')
+        from buildtools import build_wxwidgets as wxbuild
 
         print('wxWidgets build options: ' + str(build_options))
-        wxbuild.main(wxscript, build_options)
+        wxbuild.main(wxDir(), build_options)
         
         # build again without the --debug flag?
         if isWindows and options.both:
             build_options.remove('--debug')
             print('wxWidgets build options: ' + str(build_options))
-            wxbuild.main(wxscript, build_options)
+            wxbuild.main(wxDir(), build_options)
             
     except Exception:
         print("ERROR: failed building wxWidgets")

buildtools/build_wxwidgets.py

@@ -8,7 +8,6 @@
 import os
 import re
 import sys
-import builder
 import glob
 import optparse
 import platform
@@ -16,6 +15,8 @@ import shutil
 import types
 import subprocess
 
+from buildtools import builder
+
 PY3 = sys.version_info[0] == 3
 
 # builder object
@@ -167,8 +168,7 @@ def getoutput(cmd):
     return output
     
 
-def main(scriptName, args):
-    global scriptDir
+def main(wxDir, args):
     global wxRootDir
     global contribDir
     global options
@@ -176,8 +176,7 @@ def main(scriptName, args):
     global wxBuilder
     global nmakeCommand
     
-    scriptDir = os.path.dirname(os.path.abspath(scriptName))
-    wxRootDir = os.path.abspath(os.path.join(scriptDir, "..", ".."))
+    wxRootDir = wxDir
     
     contribDir = os.path.join("contrib", "src")
     installDir = None
@@ -371,7 +370,7 @@ def main(scriptName, args):
     
     elif toolkit in ["msvc", "msvcProject"]:
         flags = {}
-        buildDir = os.path.abspath(os.path.join(scriptDir, "..", "msw"))
+        buildDir = os.path.abspath(os.path.join(wxRootDir, "build", "msw"))
 
         print("creating wx/msw/setup.h from setup0.h")
         if options.unicode: