From 67769cb3a7673604be8e1ddcc8af2f3be552d905 Mon Sep 17 00:00:00 2001 From: Pawel Tomulik Date: Wed, 11 May 2016 02:17:30 +0200 Subject: fixed issue with _xxxxxxVERSIONFLAGS --- src/engine/SCons/Defaults.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 6344975..37cbc99 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -540,10 +540,10 @@ class Variable_Method_Caller(object): frame = frame.f_back return None -# if env[version_var] id defined, returns env[flags_var], otherwise returns None +# if $version_var is not empty, returns env[flags_var], otherwise returns None def __libversionflags(env, version_var, flags_var): try: - if env[version_var]: + if env.subst('$'+version_var): return env[flags_var] except KeyError: pass -- cgit v0.12 From 37eb6eeaa3dc3d850b784b6f808b710836a6c244 Mon Sep 17 00:00:00 2001 From: Pawel Tomulik Date: Sat, 14 May 2016 20:59:00 +0200 Subject: regression tests for #319 --- src/engine/SCons/Script/__init__.py | 1 + test/LINK/LDMODULEVERSIONFLAGS.py | 71 +++++++++++++++++++++++++++++++++++++ test/LINK/SHLIBVERSIONFLAGS.py | 28 ++++++++++----- 3 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 test/LINK/LDMODULEVERSIONFLAGS.py diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index a0c61c5..be6e5ce 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -354,6 +354,7 @@ GlobalDefaultBuilders = [ 'Java', 'JavaH', 'Library', + 'LoadableModule', 'M4', 'MSVSProject', 'Object', diff --git a/test/LINK/LDMODULEVERSIONFLAGS.py b/test/LINK/LDMODULEVERSIONFLAGS.py new file mode 100644 index 0000000..5a9a847 --- /dev/null +++ b/test/LINK/LDMODULEVERSIONFLAGS.py @@ -0,0 +1,71 @@ +#!/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__" + +import os +import re + +import TestSCons +import SCons.Platform +import SCons.Defaults + +foo_c_src = "void foo() {}\n" + +env = SCons.Defaults.DefaultEnvironment() +platform = SCons.Platform.platform_default() +tool_list = SCons.Platform.DefaultToolList(platform, env) + + +test = TestSCons.TestSCons() +if 'gnulink' in tool_list: + versionflags = r".+ -Wl,-Bsymbolic -Wl,-soname=libfoo.so.1( .+)+" +elif 'sunlink' in tool_list: + versionflags = r".+ -h libfoo.so.1( .+)+" +else: + test.skip_test('No testable likers found, skipping the test\n') + + +# We expect stdout to not contain LDMODULEVERSIONFLAGS if there is no +# SHLIBVERSION nor LDMODULEVERSION provided +test.write('foo.c', foo_c_src) +test.write('SConstruct', "LoadableModule('foo','foo.c')\n") +test.run() +test.fail_test(test.match_re_dotall(test.stdout(), versionflags)) +test.run(arguments = ['-c']) + +for versionvar in ['SHLIBVERSION', 'LDMODULEVERSION']: + test = TestSCons.TestSCons() + test.write('foo.c', foo_c_src) + test.write('SConstruct', "LoadableModule('foo','foo.c',%s='1.2.3')\n" % versionvar) + test.run(stdout = versionflags, match = TestSCons.match_re_dotall) + test.run(arguments = ['-c']) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/LINK/SHLIBVERSIONFLAGS.py b/test/LINK/SHLIBVERSIONFLAGS.py index d8fd2e6..7f7975f 100644 --- a/test/LINK/SHLIBVERSIONFLAGS.py +++ b/test/LINK/SHLIBVERSIONFLAGS.py @@ -31,8 +31,6 @@ import TestSCons import SCons.Platform import SCons.Defaults -linkers = [ 'gnulink', 'cyglink', 'sunlink' ] - foo_c_src = "void foo() {}\n" env = SCons.Defaults.DefaultEnvironment() @@ -40,15 +38,27 @@ platform = SCons.Platform.platform_default() tool_list = SCons.Platform.DefaultToolList(platform, env) test = TestSCons.TestSCons() -test.write('foo.c', foo_c_src) -test.write('SConstruct', "SharedLibrary('foo','foo.c',SHLIBVERSION='1.2.3')\n") - if 'gnulink' in tool_list: - test.run(stdout = r".+ -Wl,-Bsymbolic -Wl,-soname=libfoo.so.1( .+)+", match = TestSCons.match_re_dotall) - test.run(arguments = ['-c']) + versionflags = r".+ -Wl,-Bsymbolic -Wl,-soname=libfoo.so.1( .+)+" elif 'sunlink' in tool_list: - test.run(stdout = r".+ -h libfoo.so.1( .+)+", match = TestSCons.match_re_dotall) - test.run(arguments = ['-c']) + versionflags = r".+ -h libfoo.so.1( .+)+" +else: + test.skip_test('No testable likers found, skipping the test\n') + + +# stdout must not contain SHLIBVERSIONFLAGS if there is no SHLIBVERSION provided +test.write('foo.c', foo_c_src) +test.write('SConstruct', "SharedLibrary('foo','foo.c')\n") +test.run() +test.fail_test(test.match_re_dotall(test.stdout(), versionflags)) +test.run(arguments = ['-c']) + +# stdout must contain SHLIBVERSIONFLAGS if there is SHLIBVERSION provided +test = TestSCons.TestSCons() +test.write('foo.c', foo_c_src) +test.write('SConstruct', "SharedLibrary('foo','foo.c',SHLIBVERSION='1.2.3')\n") +test.run(stdout = versionflags, match = TestSCons.match_re_dotall) +test.run(arguments = ['-c']) test.pass_test() -- cgit v0.12 From d64346001c83adce8bdfd6f9e8df191762d11c44 Mon Sep 17 00:00:00 2001 From: Pawel Tomulik Date: Mon, 16 May 2016 00:11:59 +0200 Subject: add blurb to src/CHANGES.txt for #319 --- src/CHANGES.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b6973b7..25f982a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,6 +11,15 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Whatever John Doe did. + From Paweł Tomulik: + - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes + (https://pairlist4.pair.net/pipermail/scons-users/2016-May/004893.html). + An error was causing “-Wl,Bsymbolic” being added to linker's command-line + even when there was no specified value in LDMODULEVERSION and thus no + need for the flags to be specified. + - Added LoadableModule to the list of global functions (DefaultEnvironment + builders). + RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700 From Dirk Baechle: -- cgit v0.12 From 013d87ae5921b0bb55232a38257433ca256ee197 Mon Sep 17 00:00:00 2001 From: ptomulik Date: Mon, 16 May 2016 11:01:17 +0200 Subject: correct typos in test/LINK/{SHLIB,LDMODULE}VERSIONFLAGS.py --- test/LINK/LDMODULEVERSIONFLAGS.py | 2 +- test/LINK/SHLIBVERSIONFLAGS.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/LINK/LDMODULEVERSIONFLAGS.py b/test/LINK/LDMODULEVERSIONFLAGS.py index 5a9a847..0683b72 100644 --- a/test/LINK/LDMODULEVERSIONFLAGS.py +++ b/test/LINK/LDMODULEVERSIONFLAGS.py @@ -44,7 +44,7 @@ if 'gnulink' in tool_list: elif 'sunlink' in tool_list: versionflags = r".+ -h libfoo.so.1( .+)+" else: - test.skip_test('No testable likers found, skipping the test\n') + test.skip_test('No testable linkers found, skipping the test\n') # We expect stdout to not contain LDMODULEVERSIONFLAGS if there is no diff --git a/test/LINK/SHLIBVERSIONFLAGS.py b/test/LINK/SHLIBVERSIONFLAGS.py index 7f7975f..aae8843 100644 --- a/test/LINK/SHLIBVERSIONFLAGS.py +++ b/test/LINK/SHLIBVERSIONFLAGS.py @@ -43,7 +43,7 @@ if 'gnulink' in tool_list: elif 'sunlink' in tool_list: versionflags = r".+ -h libfoo.so.1( .+)+" else: - test.skip_test('No testable likers found, skipping the test\n') + test.skip_test('No testable linkers found, skipping the test\n') # stdout must not contain SHLIBVERSIONFLAGS if there is no SHLIBVERSION provided -- cgit v0.12