From df613e42c8cdd9f257dfdce157be140a519f6bd1 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 11 Mar 2019 15:54:16 -0400 Subject: Fix issue #2799 - Get mingw tool to respect SHCCCOMSTR, SHLINKCOMSTR and LDMODULECOMSTR --- src/engine/SCons/Tool/mingw.py | 5 +-- test/MinGW/bug_2799/SConstruct | 14 ++++++++ test/MinGW/bug_2799/module.c | 3 ++ test/MinGW/bug_2799/sconstest.skip | 0 test/MinGW/bug_2799/shlib.c | 4 +++ test/MinGW/mingw_uses_comstr_issue_2799.py | 55 ++++++++++++++++++++++++++++++ 6 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 test/MinGW/bug_2799/SConstruct create mode 100644 test/MinGW/bug_2799/module.c create mode 100644 test/MinGW/bug_2799/sconstest.skip create mode 100644 test/MinGW/bug_2799/shlib.c create mode 100644 test/MinGW/mingw_uses_comstr_issue_2799.py diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index ce31f88..311a955 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -107,7 +107,8 @@ def shlib_emitter(target, source, env): 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') @@ -161,7 +162,7 @@ def generate(env): env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared') env['SHLINKCOM'] = shlib_action - env['LDMODULECOM'] = shlib_action + env['LDMODULECOM'] = ldmodule_action env.Append(SHLIBEMITTER = [shlib_emitter]) env.Append(LDMODULEEMITTER = [shlib_emitter]) env['AS'] = 'as' diff --git a/test/MinGW/bug_2799/SConstruct b/test/MinGW/bug_2799/SConstruct new file mode 100644 index 0000000..a1832f1 --- /dev/null +++ b/test/MinGW/bug_2799/SConstruct @@ -0,0 +1,14 @@ +env = Environment( + tools = ['mingw'], + SHCCCOMSTR = 'SHCC $TARGET', + SHLINKCOMSTR = 'SHLINK $TARGET', + LDMODULECOMSTR = 'LDMODULE $TARGET', + SHOBSUFFIX='.o', + SHLIBSUFFIX='.so', + SHLIBPREFIX='lib', + LDMODULESUFFIX='.so', +) + +env.SharedLibrary('testlib', 'shlib.c') + +env.LoadableModule('testmodule', 'module.c') diff --git a/test/MinGW/bug_2799/module.c b/test/MinGW/bug_2799/module.c new file mode 100644 index 0000000..3cf5ace --- /dev/null +++ b/test/MinGW/bug_2799/module.c @@ -0,0 +1,3 @@ +extern void bar(void) +{ +} diff --git a/test/MinGW/bug_2799/sconstest.skip b/test/MinGW/bug_2799/sconstest.skip new file mode 100644 index 0000000..e69de29 diff --git a/test/MinGW/bug_2799/shlib.c b/test/MinGW/bug_2799/shlib.c new file mode 100644 index 0000000..efe6b3f --- /dev/null +++ b/test/MinGW/bug_2799/shlib.c @@ -0,0 +1,4 @@ +extern int foo(void) +{ + return 0; +} diff --git a/test/MinGW/mingw_uses_comstr_issue_2799.py b/test/MinGW/mingw_uses_comstr_issue_2799.py new file mode 100644 index 0000000..cc92446 --- /dev/null +++ b/test/MinGW/mingw_uses_comstr_issue_2799.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +Test that mingw respects SHLINKCOMSTR, SHCCCOMSTR, and LDMODULECOMSTR +""" + +import sys +import TestSCons + +_python_ = TestSCons._python_ + +test = TestSCons.TestSCons() + +test.dir_fixture('bug_2799') + +test.run('-n -Q') +test.must_contain_all_lines(test.stdout(), + [ + 'SHCC shlib.o', + 'SHLINK libtestlib.so', + 'SHCC module.o', + 'LDMODULE libtestmodule.so',''], + ) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12 From c9d50a23d164c7e1ca2addad5f7be33083620507 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 11 Mar 2019 15:54:26 -0400 Subject: PEP8 --- src/engine/SCons/Tool/mingw.py | 59 +++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py index 311a955..df88d79 100644 --- a/src/engine/SCons/Tool/mingw.py +++ b/src/engine/SCons/Tool/mingw.py @@ -43,7 +43,6 @@ import SCons.Defaults import SCons.Tool import SCons.Util - mingw_paths = [ r'c:\MinGW\bin', r'C:\cygwin64\bin', @@ -52,8 +51,9 @@ mingw_paths = [ 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]) @@ -61,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)) @@ -97,15 +98,15 @@ 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, '$SHLINKCOMSTR', generator=1) ldmodule_action = SCons.Action.Action(shlib_generator, '$LDMODULECOMSTR', generator=1) @@ -121,7 +122,6 @@ SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan) key_program = 'mingw32-make' - def find_version_specific_mingw_paths(): """ One example of default mingw install paths is: @@ -130,14 +130,14 @@ def find_version_specific_mingw_paths(): 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): global mingw_paths # Check for reasoanble mingw default paths - mingw_paths +=find_version_specific_mingw_paths() + mingw_paths += find_version_specific_mingw_paths() mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths) if mingw: @@ -149,7 +149,7 @@ def generate(env): 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: @@ -161,16 +161,16 @@ def generate(env): env['CXX'] = 'g++' env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared') - env['SHLINKCOM'] = shlib_action + env['SHLINKCOM'] = shlib_action env['LDMODULECOM'] = ldmodule_action - env.Append(SHLIBEMITTER = [shlib_emitter]) - env.Append(LDMODULEEMITTER = [shlib_emitter]) + 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 @@ -181,13 +181,14 @@ 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): mingw = SCons.Tool.find_program_path(env, key_program, default_paths=mingw_paths) if mingw: -- cgit v0.12 From ac3962931843e52e59c93ce19b4d2b320b1f4e9f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 11 Mar 2019 23:35:46 -0400 Subject: [skip ci] Add info to CHANGES.txt --- src/CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6d8125f..3c19dd6 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -17,6 +17,7 @@ RELEASE 3.0.5.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE - Fix Issue #3303 - Handle --config=force overwriting the Environment passed into Configure()'s Decider and not clearing it when the configure context is completed. - Add default paths for yacc tool on windows to include cygwin, mingw, and chocolatey + - Fix issue #2799 - Fix mingw tool to respect SHCCCOMSTR, SHLINKCOMSTR and LDMODULECOMSTR From Daniel Moody: - Change the default for AppendENVPath to delete_existing=0, so path -- cgit v0.12