Merge branch 'feature/upstream' into develop

1 files changed, 77 insertions, 55 deletions

diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index c2eaa96..ed3f1a3 100644
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -9,7 +9,7 @@ selection method.
 """
 
 #
-# Copyright (c) 2001 - 2017 The SCons Foundation
+# Copyright (c) 2001 - 2019 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,10 +31,11 @@ selection method.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Tool/mingw.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/mingw.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog"
 
 import os
 import os.path
+import glob
 
 import SCons.Action
 import SCons.Builder
@@ -42,29 +43,17 @@ import SCons.Defaults
 import SCons.Tool
 import SCons.Util
 
-# This is what we search for to find mingw:
-key_program = 'mingw32-gcc'
-
-def find(env):
-    # First search in the SCons path
-    path=env.WhereIs(key_program)
-    if (path):
-        return path
-    # then the OS path:
-    path=SCons.Util.WhereIs(key_program)
-    if (path):
-        return path
-
-    # If that doesn't work try default location for mingw
-    save_path=env['ENV']['PATH']
-    env.AppendENVPath('PATH',r'c:\MinGW\bin')
-    path =env.WhereIs(key_program)
-    if not path:
-        env['ENV']['PATH']=save_path
-    return path
+mingw_paths = [
+    r'c:\MinGW\bin',
+    r'C:\cygwin64\bin',
+    r'C:\msys64',
+    r'C:\cygwin\bin',
+    r'C:\msys',
+]
+
 
 def shlib_generator(target, source, env, for_signature):
-    cmd = SCons.Util.CLVar(['$SHLINK', '$SHLINKFLAGS']) 
+    cmd = SCons.Util.CLVar(['$SHLINK', '$SHLINKFLAGS'])
 
     dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
     if dll: cmd.extend(['-o', dll])
@@ -72,31 +61,32 @@ def shlib_generator(target, source, env, for_signature):
     cmd.extend(['$SOURCES', '$_LIBDIRFLAGS', '$_LIBFLAGS'])
 
     implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX')
-    if implib: cmd.append('-Wl,--out-implib,'+implib.get_string(for_signature))
+    if implib: cmd.append('-Wl,--out-implib,' + implib.get_string(for_signature))
 
     def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
     insert_def = env.subst("$WINDOWS_INSERT_DEF")
     if not insert_def in ['', '0', 0] and def_target: \
-        cmd.append('-Wl,--output-def,'+def_target.get_string(for_signature))
+            cmd.append('-Wl,--output-def,' + def_target.get_string(for_signature))
 
     return [cmd]
 
+
 def shlib_emitter(target, source, env):
     dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX')
     no_import_lib = env.get('no_import_lib', 0)
 
     if not dll:
-        raise SCons.Errors.UserError("A shared library should have exactly one target with the suffix: %s Target(s) are:%s" %  \
+        raise SCons.Errors.UserError(
+            "A shared library should have exactly one target with the suffix: %s Target(s) are:%s" % \
             (env.subst("$SHLIBSUFFIX"), ",".join([str(t) for t in target])))
-    
-    if not no_import_lib and \
-       not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'):
 
+    if not no_import_lib and \
+            not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'):
         # Create list of target libraries as strings
-        targetStrings=env.ReplaceIxes(dll,  
-                                      'SHLIBPREFIX', 'SHLIBSUFFIX',
-                                      'LIBPREFIX', 'LIBSUFFIX')
-        
+        targetStrings = env.ReplaceIxes(dll,
+                                        'SHLIBPREFIX', 'SHLIBSUFFIX',
+                                        'LIBPREFIX', 'LIBSUFFIX')
+
         # Now add file nodes to target list
         target.append(env.fs.File(targetStrings))
 
@@ -108,17 +98,18 @@ def shlib_emitter(target, source, env):
     skip_def_insert = env.subst("$WINDOWS_INSERT_DEF") in ['', '0', 0]
     if not def_source and not def_target and not skip_def_insert:
         # Create list of target libraries and def files as strings
-        targetStrings=env.ReplaceIxes(dll,  
-                                      'SHLIBPREFIX', 'SHLIBSUFFIX',
-                                      'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
-        
+        targetStrings = env.ReplaceIxes(dll,
+                                        'SHLIBPREFIX', 'SHLIBSUFFIX',
+                                        'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
+
         # Now add file nodes to target list
         target.append(env.fs.File(targetStrings))
 
     return (target, source)
-                         
 
-shlib_action = SCons.Action.Action(shlib_generator, generator=1)
+
+shlib_action = SCons.Action.Action(shlib_generator, '$SHLINKCOMSTR', generator=1)
+ldmodule_action = SCons.Action.Action(shlib_generator, '$LDMODULECOMSTR', generator=1)
 
 res_action = SCons.Action.Action('$RCCOM', '$RCCOMSTR')
 
@@ -126,38 +117,63 @@ res_builder = SCons.Builder.Builder(action=res_action, suffix='.o',
                                     source_scanner=SCons.Tool.SourceFileScanner)
 SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
 
+# This is what we search for to find mingw:
+# key_program = 'mingw32-gcc'
+key_program = 'mingw32-make'
+
+
+def find_version_specific_mingw_paths():
+    """
+    One example of default mingw install paths is:
+    C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev2\mingw64\bin
+
+    Use glob'ing to find such and add to mingw_paths
+    """
+    new_paths = glob.glob(r"C:\mingw-w64\*\mingw64\bin")
+
+    return new_paths
+
+
 def generate(env):
-    mingw = find(env)
+    global mingw_paths
+    # Check for reasoanble mingw default paths
+    mingw_paths += find_version_specific_mingw_paths()
+
+    mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths)
     if mingw:
-        dir = os.path.dirname(mingw)
-        env.PrependENVPath('PATH', dir )
-        
+        mingw_bin_dir = os.path.dirname(mingw)
+        env.AppendENVPath('PATH', mingw_bin_dir)
 
     # Most of mingw is the same as gcc and friends...
     gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas', 'gfortran', 'm4']
     for tool in gnu_tools:
         SCons.Tool.Tool(tool)(env)
 
-    #... but a few things differ:
+    # ... but a few things differ:
     env['CC'] = 'gcc'
+    # make sure the msvc tool doesnt break us, it added a /flag
+    if 'CCFLAGS' in env:
+        # make sure its a CLVar to handle list or str cases
+        if type(env['CCFLAGS']) is not SCons.Util.CLVar:
+            env['CCFLAGS'] = SCons.Util.CLVar(env['CCFLAGS'])
+        env['CCFLAGS'] = SCons.Util.CLVar(str(env['CCFLAGS']).replace('/nologo', ''))
     env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
     env['CXX'] = 'g++'
     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
     env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
-    env['SHLINKCOM']   = shlib_action
-    env['LDMODULECOM'] = shlib_action
-    env.Append(SHLIBEMITTER = [shlib_emitter])
-    env.Append(LDMODULEEMITTER = [shlib_emitter])
+    env['SHLINKCOM'] = shlib_action
+    env['LDMODULECOM'] = ldmodule_action
+    env.Append(SHLIBEMITTER=[shlib_emitter])
+    env.Append(LDMODULEEMITTER=[shlib_emitter])
     env['AS'] = 'as'
 
-    env['WIN32DEFPREFIX']        = ''
-    env['WIN32DEFSUFFIX']        = '.def'
-    env['WINDOWSDEFPREFIX']      = '${WIN32DEFPREFIX}'
-    env['WINDOWSDEFSUFFIX']      = '${WIN32DEFSUFFIX}'
+    env['WIN32DEFPREFIX'] = ''
+    env['WIN32DEFSUFFIX'] = '.def'
+    env['WINDOWSDEFPREFIX'] = '${WIN32DEFPREFIX}'
+    env['WINDOWSDEFSUFFIX'] = '${WIN32DEFSUFFIX}'
 
     env['SHOBJSUFFIX'] = '.o'
     env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-
     env['RC'] = 'windres'
     env['RCFLAGS'] = SCons.Util.CLVar('')
     env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
@@ -165,15 +181,21 @@ def generate(env):
     env['RCINCSUFFIX'] = ''
     env['RCCOM'] = '$RC $_CPPDEFFLAGS $RCINCFLAGS ${RCINCPREFIX} ${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
     env['BUILDERS']['RES'] = res_builder
-    
+
     # Some setting from the platform also have to be overridden:
     env['OBJSUFFIX'] = '.o'
     env['LIBPREFIX'] = 'lib'
     env['LIBSUFFIX'] = '.a'
     env['PROGSUFFIX'] = '.exe'
 
+
 def exists(env):
-    return find(env)
+    mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths)
+    if mingw:
+        mingw_bin_dir = os.path.dirname(mingw)
+        env.AppendENVPath('PATH', mingw_bin_dir)
+
+    return mingw
 
 # Local Variables:
 # tab-width:4