Don't exclude tests from wxMSW-Setup.exe.

[wxWidgets.git] / build / tools / build-wxwidgets.py

diff --git a/build/tools/build-wxwidgets.py b/build/tools/build-wxwidgets.py
index a0866e4b2cc02f4547cb546c64a5be4c7ad13caa..f04e15f1a84035d46eadc63cfcf06ccb5c758a1e 100755 (executable)
--- a/build/tools/build-wxwidgets.py
+++ b/build/tools/build-wxwidgets.py
@@ -9,7 +9,6 @@ import os
 import re
 import sys
 import builder
 import re
 import sys
 import builder

-import commands

 import glob
 import optparse
 import platform
 import glob
 import optparse
 import platform


@@ -27,6 +26,7 @@ contribDir = None
 options = None
 configure_opts = None
 exitWithException = True
 options = None
 configure_opts = None
 exitWithException = True

+nmakeCommand = 'nmake.exe'

 
 verbose = False
 
 
 verbose = False
 


@@ -38,7 +38,7 @@ def numCPUs():
     """
     # Linux, Unix and MacOS:
     if hasattr(os, "sysconf"):
     """
     # Linux, Unix and MacOS:
     if hasattr(os, "sysconf"):

-        if os.sysconf_names.has_key("SC_NPROCESSORS_ONLN"):
+        if "SC_NPROCESSORS_ONLN" in os.sysconf_names:

             # Linux & Unix:
             ncpus = os.sysconf("SC_NPROCESSORS_ONLN")
             if isinstance(ncpus, int) and ncpus > 0:
             # Linux & Unix:
             ncpus = os.sysconf("SC_NPROCESSORS_ONLN")
             if isinstance(ncpus, int) and ncpus > 0:


@@ -48,24 +48,36 @@ def numCPUs():
             return p.stdout.read()
             
     # Windows:
             return p.stdout.read()
             
     # Windows:

-    if os.environ.has_key("NUMBER_OF_PROCESSORS"):
+    if "NUMBER_OF_PROCESSORS" in os.environ:

             ncpus = int(os.environ["NUMBER_OF_PROCESSORS"]);
             if ncpus > 0:
                 return ncpus
     return 1 # Default
 
 
             ncpus = int(os.environ["NUMBER_OF_PROCESSORS"]);
             if ncpus > 0:
                 return ncpus
     return 1 # Default
 
 

-def getXcodePath():
-    p = subprocess.Popen("xcode-select -print-path", shell=True, stdout=subprocess.PIPE)
-    output = p.stdout.read()
-    return output.strip()
+def getXcodePaths():
+    base = getoutput("xcode-select -print-path")
+    return [base, base+"/Platforms/MacOSX.platform/Developer"]

 
 
 
 

+def getVisCVersion():
+    text = getoutput("cl.exe")
+    if 'Version 13' in text:
+        return '71'
+    if 'Version 15' in text:
+        return '90'
+    if 'Version 16' in text:
+        return '100'
+    # TODO: Add more tests to get the other versions...
+    else:
+        return 'FIXME'
+    
+

 def exitIfError(code, msg):
     if code != 0:
 def exitIfError(code, msg):
     if code != 0:

-        print msg
+        print(msg)

         if exitWithException:
         if exitWithException:

-            raise builder.BuildError, msg
+            raise builder.BuildError(msg)

         else:
             sys.exit(1)
      
         else:
             sys.exit(1)
      


@@ -110,14 +122,14 @@ def macFixupInstallNames(destdir, prefix, buildDir=None):
     # When an installdir is used then the install_names embedded in
     # the dylibs are not correct.  Reset the IDs and the dependencies
     # to use just the prefix.
     # When an installdir is used then the install_names embedded in
     # the dylibs are not correct.  Reset the IDs and the dependencies
     # to use just the prefix.

-    print "**** macFixupInstallNames(%s, %s, %s)" % (destdir, prefix, buildDir)
+    print("**** macFixupInstallNames(%s, %s, %s)" % (destdir, prefix, buildDir))

     pwd = os.getcwd()
     os.chdir(destdir+prefix+'/lib')
     dylibs = glob.glob('*.dylib')     # ('*[0-9].[0-9].[0-9].[0-9]*.dylib')
     for lib in dylibs:
         cmd = 'install_name_tool -id %s/lib/%s %s/lib/%s' % \
               (prefix,lib,  destdir+prefix,lib)
     pwd = os.getcwd()
     os.chdir(destdir+prefix+'/lib')
     dylibs = glob.glob('*.dylib')     # ('*[0-9].[0-9].[0-9].[0-9]*.dylib')
     for lib in dylibs:
         cmd = 'install_name_tool -id %s/lib/%s %s/lib/%s' % \
               (prefix,lib,  destdir+prefix,lib)

-        print cmd
+        print(cmd)

         run(cmd)
         for dep in dylibs:
             if buildDir is not None:
         run(cmd)
         for dep in dylibs:
             if buildDir is not None:


@@ -126,7 +138,7 @@ def macFixupInstallNames(destdir, prefix, buildDir=None):
             else:
                 cmd = 'install_name_tool -change %s/lib/%s %s/lib/%s %s/lib/%s' % \
                       (destdir+prefix,dep,  prefix,dep,  destdir+prefix,lib)
             else:
                 cmd = 'install_name_tool -change %s/lib/%s %s/lib/%s %s/lib/%s' % \
                       (destdir+prefix,dep,  prefix,dep,  destdir+prefix,lib)

-            print cmd
+            print(cmd)

             run(cmd)        
     os.chdir(pwd)
 
             run(cmd)        
     os.chdir(pwd)
 


@@ -134,10 +146,25 @@ def macFixupInstallNames(destdir, prefix, buildDir=None):
 def run(cmd):
     global verbose
     if verbose:
 def run(cmd):
     global verbose
     if verbose:

-        print "Running %s" % cmd
+        print("Running %s" % cmd)

     return exitIfError(os.system(cmd), "Error running %s" % cmd)
 
 
     return exitIfError(os.system(cmd), "Error running %s" % cmd)
 
 

+def getoutput(cmd):
+    sp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    output = None
+    output = sp.stdout.read()
+    if sys.version_info > (3,):
+        output = output.decode('utf-8')  # TODO: is utf-8 okay here?
+    output = output.rstrip()
+    rval = sp.wait()
+    if rval:
+        # Failed!
+        print("Command '%s' failed with exit code %d." % (cmd, rval))
+        sys.exit(rval)
+    return output
+    
+

 def main(scriptName, args):
     global scriptDir
     global wxRootDir
 def main(scriptName, args):
     global scriptDir
     global wxRootDir


@@ -145,6 +172,7 @@ def main(scriptName, args):
     global options
     global configure_opts
     global wxBuilder
     global options
     global configure_opts
     global wxBuilder

+    global nmakeCommand

     
     scriptDir = os.path.dirname(os.path.abspath(scriptName))
     wxRootDir = os.path.abspath(os.path.join(scriptDir, "..", ".."))
     
     scriptDir = os.path.dirname(os.path.abspath(scriptName))
     wxRootDir = os.path.abspath(os.path.join(scriptDir, "..", ".."))


@@ -175,8 +203,7 @@ def main(scriptName, args):
         "installdir"    : ("", "Directory where built wxWidgets will be installed"),
         "mac_distdir"   : (None, "If set on Mac, will create an installer package in the specified dir."),
         "mac_universal_binary" 
         "installdir"    : ("", "Directory where built wxWidgets will be installed"),
         "mac_distdir"   : (None, "If set on Mac, will create an installer package in the specified dir."),
         "mac_universal_binary" 

-                        : (False, "Build Mac version as a universal binary"),
-        "mac_arch"      : ("", "Build just the specified architecture on Mac"),
+                        : ("", "Comma separated list of architectures to include in the Mac universal binary"),

         "mac_framework" : (False, "Install the Mac build as a framework"),
         "mac_framework_prefix" 
                         : (defFwPrefix, "Prefix where the framework should be installed. Default: %s" % defFwPrefix),
         "mac_framework" : (False, "Install the Mac build as a framework"),
         "mac_framework_prefix" 
                         : (defFwPrefix, "Prefix where the framework should be installed. Default: %s" % defFwPrefix),


@@ -192,16 +219,16 @@ def main(scriptName, args):
         "extra_make"    : ("", "Extra args to pass on [n]make's command line."),
         "features"      : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."),
         "verbose"       : (False, "Print commands as they are run, (to aid with debugging this script)"),
         "extra_make"    : ("", "Extra args to pass on [n]make's command line."),
         "features"      : ("", "A comma-separated list of wxUSE_XYZ defines on Win, or a list of configure flags on unix."),
         "verbose"       : (False, "Print commands as they are run, (to aid with debugging this script)"),

+        "jom"           : (False, "Use jom.exe instead of nmake for MSW builds."),

     }
         
     parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0")
 
     keys = option_dict.keys()
     }
         
     parser = optparse.OptionParser(usage="usage: %prog [options]", version="%prog 1.0")
 
     keys = option_dict.keys()

-    keys.sort()
-    for opt in keys:
+    for opt in sorted(keys):

         default = option_dict[opt][0]
         action = "store"
         default = option_dict[opt][0]
         action = "store"

-        if type(default) == types.BooleanType:
+        if type(default) == bool:

             action = "store_true"
         parser.add_option("--" + opt, default=default, action=action, dest=opt, 
                           help=option_dict[opt][1])
             action = "store_true"
         parser.add_option("--" + opt, default=default, action=action, dest=opt, 
                           help=option_dict[opt][1])


@@ -237,9 +264,6 @@ def main(scriptName, args):
         if options.osx_cocoa:
             configure_opts.append("--with-osx_cocoa")
 
         if options.osx_cocoa:
             configure_opts.append("--with-osx_cocoa")
 

-        if  options.mac_arch: 
-            configure_opts.append("--enable-macosx_arch=%s" % options.mac_arch)
-            

         wxpy_configure_opts = [
                             "--with-opengl",
                             "--enable-sound",
         wxpy_configure_opts = [
                             "--with-opengl",
                             "--enable-sound",


@@ -259,28 +283,26 @@ def main(scriptName, args):
             wxpy_configure_opts.append("--with-sdl")
             wxpy_configure_opts.append("--with-gnomeprint")
                                         
             wxpy_configure_opts.append("--with-sdl")
             wxpy_configure_opts.append("--with-gnomeprint")
                                         

-        # Ensure that the Carbon build stays compatible back to 10.4 and
-        # for the Cocoa build allow running on 10.5 and newer.  We only add
-        # them to the wxpy options because this is a hard-requirement for
-        # wxPython, but other cases it is optional and is left up to the
-        # developer.  TODO: there should be a command line option to set
-        # the SDK...
+        # Try to use use lowest available SDK back to 10.5. Both Carbon and
+        # Cocoa builds require at least the 10.5 SDK now. We only add it to
+        # the wxpy options because this is a hard-requirement for wxPython,
+        # but other cases it is optional and is left up to the developer.
+        # TODO: there should be a command line option to set the SDK...

         if sys.platform.startswith("darwin"):
         if sys.platform.startswith("darwin"):

-            xcodePath = getXcodePath()
-            sdks = [
-                xcodePath+"/SDKs/MacOSX10.5.sdk",
-                xcodePath+"/SDKs/MacOSX10.6.sdk",
-                xcodePath+"/SDKs/MacOSX10.7.sdk",
-            ]
-            if not options.osx_cocoa:
-                sdks.insert(0, xcodePath+"/SDKs/MacOSX10.4u.sdk")
+            for xcodePath in getXcodePaths():
+                sdks = [
+                    xcodePath+"/SDKs/MacOSX10.5.sdk",
+                    xcodePath+"/SDKs/MacOSX10.6.sdk",
+                    xcodePath+"/SDKs/MacOSX10.7.sdk",
+                    xcodePath+"/SDKs/MacOSX10.8.sdk",
+                    ]

             
             

-            # use the lowest available sdk
-            for sdk in sdks:
-                if os.path.exists(sdk):
-                    wxpy_configure_opts.append(
-                        "--with-macosx-sdk=%s" % sdk)
-                    break
+                # use the lowest available sdk
+                for sdk in sdks:
+                    if os.path.exists(sdk):
+                        wxpy_configure_opts.append(
+                            "--with-macosx-sdk=%s" % sdk)
+                        break

 
         if not options.mac_framework:
             if installDir and not prefixDir:
 
         if not options.mac_framework:
             if installDir and not prefixDir:


@@ -307,11 +329,6 @@ def main(scriptName, args):
             # TODO: Should options.install be automatically turned on if the
             # mac_framework flag is given?
             
             # TODO: Should options.install be automatically turned on if the
             # mac_framework flag is given?
             

-            # The framework build is always a universal binary, unless we are
-            # explicitly told to build only one architecture
-            if not options.mac_arch:
-                options.mac_universal_binary = True
-                

             # framework builds always need to be monolithic
             if not "--enable-monolithic" in configure_opts:
                 configure_opts.append("--enable-monolithic")
             # framework builds always need to be monolithic
             if not "--enable-monolithic" in configure_opts:
                 configure_opts.append("--enable-monolithic")


@@ -329,10 +346,16 @@ def main(scriptName, args):
                     shutil.rmtree(frameworkRootDir)
 
         if options.mac_universal_binary: 
                     shutil.rmtree(frameworkRootDir)
 
         if options.mac_universal_binary: 

-            configure_opts.append("--enable-universal_binary")
+            if options.mac_universal_binary == 'default':
+                if options.osx_cocoa:
+                    configure_opts.append("--enable-universal_binary=i386,x86_64")                
+                else:
+                    configure_opts.append("--enable-universal_binary")                
+            else:
+                configure_opts.append("--enable-universal_binary=%s" % options.mac_universal_binary)

 
             
 
             

-        print "Configure options: " + `configure_opts`
+        print("Configure options: " + repr(configure_opts))

         wxBuilder = builder.AutoconfBuilder()
         if not options.no_config and not options.clean:
             olddir = os.getcwd()
         wxBuilder = builder.AutoconfBuilder()
         if not options.no_config and not options.clean:
             olddir = os.getcwd()


@@ -343,14 +366,14 @@ def main(scriptName, args):
             os.chdir(olddir)
 
         if options.config_only:
             os.chdir(olddir)
 
         if options.config_only:

-            print "Exiting after configure"
+            print("Exiting after configure")

             return
     
     elif toolkit in ["msvc", "msvcProject"]:
         flags = {}
         buildDir = os.path.abspath(os.path.join(scriptDir, "..", "msw"))
 
             return
     
     elif toolkit in ["msvc", "msvcProject"]:
         flags = {}
         buildDir = os.path.abspath(os.path.join(scriptDir, "..", "msw"))
 

-        print "creating wx/msw/setup.h from setup0.h"
+        print("creating wx/msw/setup.h from setup0.h")

         if options.unicode:
             flags["wxUSE_UNICODE"] = "1"
             if VERSION < (2,9):
         if options.unicode:
             flags["wxUSE_UNICODE"] = "1"
             if VERSION < (2,9):


@@ -358,7 +381,7 @@ def main(scriptName, args):
     
         if options.cairo:
             if not os.environ.get("CAIRO_ROOT"):
     
         if options.cairo:
             if not os.environ.get("CAIRO_ROOT"):

-                print "WARNING: Expected CAIRO_ROOT set in the environment!"
+                print("WARNING: Expected CAIRO_ROOT set in the environment!")

             flags["wxUSE_CAIRO"] = "1"
     
         if options.wxpython:
             flags["wxUSE_CAIRO"] = "1"
     
         if options.wxpython:


@@ -386,7 +409,7 @@ def main(scriptName, args):
         for flag in flags:
             setupText, subsMade = re.subn(flag + "\s+?\d", "%s %s" % (flag, flags[flag]), setupText)
             if subsMade == 0:
         for flag in flags:
             setupText, subsMade = re.subn(flag + "\s+?\d", "%s %s" % (flag, flags[flag]), setupText)
             if subsMade == 0:

-                print "Flag %s wasn't found in setup0.h!" % flag
+                print("Flag %s wasn't found in setup0.h!" % flag)

                 sys.exit(1)
     
         setupFile = open(os.path.join(mswIncludeDir, "setup.h"), "wb")
                 sys.exit(1)
     
         setupFile = open(os.path.join(mswIncludeDir, "setup.h"), "wb")


@@ -394,7 +417,7 @@ def main(scriptName, args):
         setupFile.close()
         args = []
         if toolkit == "msvc":
         setupFile.close()
         args = []
         if toolkit == "msvc":

-            print "setting build options..."
+            print("setting build options...")

             args.append("-f makefile.vc")
             if options.unicode:
                 args.append("UNICODE=1")
             args.append("-f makefile.vc")
             if options.unicode:
                 args.append("UNICODE=1")


@@ -403,6 +426,7 @@ def main(scriptName, args):
     
             if options.wxpython:
                 args.append("OFFICIAL_BUILD=1")
     
             if options.wxpython:
                 args.append("OFFICIAL_BUILD=1")

+                args.append("COMPILER_VERSION=%s" % getVisCVersion())

                 args.append("SHARED=1")
                 args.append("MONOLITHIC=0")
                 args.append("USE_OPENGL=1")
                 args.append("SHARED=1")
                 args.append("MONOLITHIC=0")
                 args.append("USE_OPENGL=1")


@@ -420,8 +444,11 @@ def main(scriptName, args):
                 args.append(
                     "CPPFLAGS=/I%s" %
                      os.path.join(os.environ.get("CAIRO_ROOT", ""), 'include\\cairo'))
                 args.append(
                     "CPPFLAGS=/I%s" %
                      os.path.join(os.environ.get("CAIRO_ROOT", ""), 'include\\cairo'))

+                
+            if options.jom:
+                nmakeCommand = 'jom.exe'

     
     

-            wxBuilder = builder.MSVCBuilder()
+            wxBuilder = builder.MSVCBuilder(commandName=nmakeCommand)

             
         if toolkit == "msvcProject":
             args = []
             
         if toolkit == "msvcProject":
             args = []


@@ -435,11 +462,11 @@ def main(scriptName, args):
         
             
     if not wxBuilder:
         
             
     if not wxBuilder:

-        print "Builder not available for your specified platform/compiler."
+        print("Builder not available for your specified platform/compiler.")

         sys.exit(1)
     
     if options.clean:
         sys.exit(1)
     
     if options.clean:

-        print "Performing cleanup."
+        print("Performing cleanup.")

         wxBuilder.clean(dir=buildDir, options=args)
         
         sys.exit(0)
         wxBuilder.clean(dir=buildDir, options=args)
         
         sys.exit(0)


@@ -466,7 +493,7 @@ def main(scriptName, args):
                 links.append(reallib)
                 reallib = "lib/" + os.readlink(reallib)
                 
                 links.append(reallib)
                 reallib = "lib/" + os.readlink(reallib)
                 

-            #print "reallib is %s" % reallib
+            #print("reallib is %s" % reallib)

             run("mv -f %s lib/%s.dylib" % (reallib, frameworkname))
             
             for link in links:
             run("mv -f %s lib/%s.dylib" % (reallib, frameworkname))
             
             for link in links:


@@ -474,7 +501,7 @@ def main(scriptName, args):
     
         frameworkRootDir = prefixDir
         if installDir:
     
         frameworkRootDir = prefixDir
         if installDir:

-            print "installDir = %s" % installDir
+            print("installDir = %s" % installDir)

             frameworkRootDir = installDir + prefixDir
         os.chdir(frameworkRootDir)
         build_string = ""
             frameworkRootDir = installDir + prefixDir
         os.chdir(frameworkRootDir)
         build_string = ""


@@ -482,10 +509,10 @@ def main(scriptName, args):
             build_string = "d"
 
         fwname = getFrameworkName(options)
             build_string = "d"
 
         fwname = getFrameworkName(options)

-        version = commands.getoutput("bin/wx-config --release")
-        version_full = commands.getoutput("bin/wx-config --version")
-        basename = commands.getoutput("bin/wx-config --basename")
-        configname = commands.getoutput("bin/wx-config --selected-config")
+        version = getoutput("bin/wx-config --release")
+        version_full = getoutput("bin/wx-config --version")
+        basename = getoutput("bin/wx-config --basename")
+        configname = getoutput("bin/wx-config --selected-config")

         
         os.makedirs("Resources")
         wxplist = dict(
         
         os.makedirs("Resources")
         wxplist = dict(


@@ -570,10 +597,10 @@ def main(scriptName, args):
         file('lib/wx/config/%s' % configname, 'w').write(text)
         
         # The framework is finished!
         file('lib/wx/config/%s' % configname, 'w').write(text)
         
         # The framework is finished!

-        print "wxWidgets framework created at: " + \
+        print("wxWidgets framework created at: " + 

               os.path.join( installDir, 
                             options.mac_framework_prefix,
               os.path.join( installDir, 
                             options.mac_framework_prefix,

-                            '%s.framework' % fwname)
+                            '%s.framework' % fwname))

         
         
     # adjust the install_name if needed
         
         
     # adjust the install_name if needed


@@ -599,7 +626,7 @@ def main(scriptName, args):
         os.makedirs(packagedir)
         basename = os.path.basename(prefixDir.split(".")[0])
         packageName = basename + "-" + getWxRelease()
         os.makedirs(packagedir)
         basename = os.path.basename(prefixDir.split(".")[0])
         packageName = basename + "-" + getWxRelease()

-        packageMakerPath = getXcodePath()+"/usr/bin/packagemaker "
+        packageMakerPath = getXcodePaths()[0]+"/usr/bin/packagemaker "

         args = []
         args.append("--root %s" % options.installdir)
         args.append("--id org.wxwidgets.%s" % basename.lower())
         args = []
         args.append("--root %s" % options.installdir)
         args.append("--id org.wxwidgets.%s" % basename.lower())


@@ -607,7 +634,7 @@ def main(scriptName, args):
         args.append("--version %s" % getWxRelease())
         args.append("--out %s" % os.path.join(packagedir, packageName + ".pkg"))
         cmd = packageMakerPath + ' '.join(args)
         args.append("--version %s" % getWxRelease())
         args.append("--out %s" % os.path.join(packagedir, packageName + ".pkg"))
         cmd = packageMakerPath + ' '.join(args)

-        print "cmd = %s" % cmd
+        print("cmd = %s" % cmd)

         run(cmd)
         
         os.chdir(options.mac_distdir)
         run(cmd)
         
         os.chdir(options.mac_distdir)