From f837e2e6511cc8049e5a765c9af25afc9fd730fe Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Sat, 17 Aug 2013 12:12:56 -0700 Subject: Add a cyglink tool Add cyglink, a specialization of gnulink with the following properties: 1. Set SHLIBPREFIX to "cyg" and SHLIBSUFFIX = ".dll". 2. Remove any "lib" after "cyg", to accommodate build scripts that name libraries "libFoo". 3. Create DLL import libraries. --- src/engine/MANIFEST.in | 1 + src/engine/SCons/Tool/__init__.py | 8 ++++ src/engine/SCons/Tool/__init__.xml | 13 +++++- src/engine/SCons/Tool/cyglink.py | 96 ++++++++++++++++++++++++++++++++++++++ src/engine/SCons/Tool/link.py | 12 +++++ 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 src/engine/SCons/Tool/cyglink.py diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 5e7627f..0afda50 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -62,6 +62,7 @@ SCons/Tool/bcc32.py SCons/Tool/BitKeeper.py SCons/Tool/c++.py SCons/Tool/cc.py +SCons/Tool/cyglink.py SCons/Tool/cvf.py SCons/Tool/CVS.py SCons/Tool/default.py diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 89aabb5..af1282c 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -733,6 +733,14 @@ def tool_list(platform, env): assemblers = ['as'] fortran_compilers = ['gfortran', 'f95', 'f90', 'g77'] ars = ['ar'] + elif str(platform) == 'cygwin': + "prefer GNU tools on Cygwin, except for a platform-specific linker" + linkers = ['cyglink', 'mslink', 'ilink'] + c_compilers = ['gcc', 'msvc', 'intelc', 'icc', 'cc'] + cxx_compilers = ['g++', 'msvc', 'intelc', 'icc', 'c++'] + assemblers = ['gas', 'nasm', 'masm'] + fortran_compilers = ['gfortran', 'g77', 'ifort', 'ifl', 'f95', 'f90', 'f77'] + ars = ['ar', 'mslib'] else: "prefer GNU tools on all other platforms" linkers = ['gnulink', 'mslink', 'ilink'] diff --git a/src/engine/SCons/Tool/__init__.xml b/src/engine/SCons/Tool/__init__.xml index 18bfd3e..9c3dc85 100644 --- a/src/engine/SCons/Tool/__init__.xml +++ b/src/engine/SCons/Tool/__init__.xml @@ -168,6 +168,17 @@ listed in the targets. +On Cygwin systems, the +&b-SharedLibrary; +builder method will always build an import +(.dll.a) library +in addition to the shared (.dll) library, +adding a .dll.a library with the same basename +if there is not already a .dll.a file explicitly +listed in the targets. + + + Any object files listed in the source must have been built for a shared library @@ -485,4 +496,4 @@ letters to designate alpha, beta, or release candidate patch levels. - \ No newline at end of file + diff --git a/src/engine/SCons/Tool/cyglink.py b/src/engine/SCons/Tool/cyglink.py new file mode 100644 index 0000000..23c1adf --- /dev/null +++ b/src/engine/SCons/Tool/cyglink.py @@ -0,0 +1,96 @@ +"""SCons.Tool.cyglink + +Customization of gnulink for Cygwin (http://www.cygwin.com/) + +There normally shouldn't be any need to import this module directly. +It will usually be imported through the generic SCons.Tool.Tool() +selection method. + +""" + +import SCons.Action +import SCons.Util + +import gnulink + +def shlib_generator(target, source, env, for_signature): + cmd = SCons.Util.CLVar(['$SHLINK']) + + dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX') + if dll: cmd.extend(['-o', dll]) + + cmd.extend(['$SHLINKFLAGS', '$__RPATH']) + + implib = env.FindIxes(target, 'IMPLIBPREFIX', 'IMPLIBSUFFIX') + if implib: + cmd.extend([ + '-Wl,--out-implib='+implib.get_string(for_signature), + '-Wl,--export-all-symbols', + '-Wl,--enable-auto-import', + '-Wl,--whole-archive', '$SOURCES', + '-Wl,--no-whole-archive', '$_LIBDIRFLAGS', '$_LIBFLAGS' + ]) + else: + cmd.extend(['$SOURCES', '$_LIBDIRFLAGS', '$_LIBFLAGS']) + + 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 or len(target) > 1: + raise SCons.Errors.UserError("A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX")) + + # Remove any "lib" after the prefix + pre = env.subst('$SHLIBPREFIX') + dll_name = str(dll) + if dll_name[len(pre):len(pre)+3] == 'lib': + dll_name = pre + dll_name[len(pre)+3:] + dll = env.fs.File(dll_name) + + orig_target = target + target = [env.fs.File(dll)] + target[0].attributes.shared = 1 + + # Append an import lib target + if not no_import_lib: + # Create list of target libraries as strings + target_strings = env.ReplaceIxes(orig_target[0], + 'SHLIBPREFIX', 'SHLIBSUFFIX', + 'IMPLIBPREFIX', 'IMPLIBSUFFIX') + + implib_target = env.fs.File(target_strings) + implib_target.attributes.shared = 1 + target.append(implib_target) + + return (target, source) + + +shlib_action = SCons.Action.Action(shlib_generator, generator=1) + +def generate(env): + """Add Builders and construction variables for cyglink to an Environment.""" + gnulink.generate(env) + + env['LINKFLAGS'] = SCons.Util.CLVar('-Wl,-no-undefined') + + env['SHLINKCOM'] = shlib_action + env['LDMODULECOM'] = shlib_action + env.Append(SHLIBEMITTER = [shlib_emitter]) + + env['SHLIBPREFIX'] = 'cyg' + env['SHLIBSUFFIX'] = '.dll' + + env['IMPLIBPREFIX'] = 'lib' + env['IMPLIBSUFFIX'] = '.dll.a' + +def exists(env): + return gnulink.exists(env) + + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index 2ba419e..3f20fe0 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -127,6 +127,18 @@ def shlib_emitter_names(target, source, env): print "shlib_emitter_names: side effect: ", name # add version_name to list of names to be a Side effect version_names.append(version_name) + elif platform == 'cygwin': + shlib_suffix = env.subst('$SHLIBSUFFIX') + name = target[0].name + # generate library name with the version number + suffix_re = re.escape(shlib_suffix) + version_name = re.sub(suffix_re, '-' + re.sub('\.', '-', version) + shlib_suffix, name) + if Verbose: + print "shlib_emitter_names: target is ", version_name + print "shlib_emitter_names: side effect: ", name + # add version_name to list of names to be a Side effect + version_names.append(version_name) + except KeyError: version = None return version_names -- cgit v0.12 From 09172cd7b265174703131c9945fc18315cc1bc82 Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Sat, 17 Aug 2013 20:52:11 -0700 Subject: Fix VersionedLib test Adjust for Cygwin coding conventions and test for existence of the import libraries. --- QMTest/TestCommon.py | 2 +- test/LINK/VersionedLib.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/QMTest/TestCommon.py b/QMTest/TestCommon.py index 6eeda5e..4e90e16 100644 --- a/QMTest/TestCommon.py +++ b/QMTest/TestCommon.py @@ -163,7 +163,7 @@ elif sys.platform == 'cygwin': shobj_prefix = '' lib_prefix = 'lib' lib_suffix = '.a' - dll_prefix = '' + dll_prefix = 'cyg' dll_suffix = '.dll' elif sys.platform.find('irix') != -1: exe_suffix = '' diff --git a/test/LINK/VersionedLib.py b/test/LINK/VersionedLib.py index 0d45789..3c92252 100644 --- a/test/LINK/VersionedLib.py +++ b/test/LINK/VersionedLib.py @@ -98,6 +98,18 @@ elif platform == 'darwin': 'libtest.dylib', 'libtest.2.5.4.dylib', ] +elif platform == 'cygwin': + # All (?) the files we expect will get created in the current directory + files = [ + 'cygtest-2-5-4.dll', + 'libtest-2-5-4.dll.a', + 'test.os', + ] + # All (?) the files we expect will get created in the 'installtest' directory + instfiles = [ + 'cygtest-2-5-4.dll', + 'libtest-2-5-4.dll.a', + ] elif platform == 'win32': # All (?) the files we expect will get created in the current directory files = [ -- cgit v0.12 From dc219f6fbf579c9ac9aecc5b3ea76dcc327a948c Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Sat, 17 Aug 2013 20:54:14 -0700 Subject: Fix Libs/SharedLibrary.py Check for files using Cygwin naming conventions. --- test/Libs/SharedLibrary.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py index 18d1f24..b7d1374 100644 --- a/test/Libs/SharedLibrary.py +++ b/test/Libs/SharedLibrary.py @@ -44,7 +44,7 @@ else: SharedLibrary(target = 'foo2', source = Split('f2a.c f2b.c f2c.c'), WINDOWS_INSERT_DEF = 1) -env.SharedLibrary(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c']) +env.SharedLibrary(target = 'foo3', source = ['f3a.c', 'f3b.c', 'f3c.c'], no_import_lib = 1) env2.Program(target = 'prog', source = 'prog.c') """) @@ -207,6 +207,13 @@ if sys.platform.find('irix') != -1: test.run(program = test.workpath('prog'), stdout = "f1.c\nf2a.c\nf2b.c\nf2c.c\nf3a.c\nf3b.c\nf3c.c\nprog.c\n") +if sys.platform == 'cygwin': + # Cygwin: Make sure the DLLs are prefixed correctly. + test.must_exist('cygfoo1.dll', 'cygfoo2.dll', 'cygfoo3.dll') + test.must_exist('libfoo1.dll.a', 'libfoo2.dll.a') + test.must_not_exist('foo3.dll.a') + + if sys.platform == 'win32' or sys.platform.find('irix') != -1: test.run(arguments = '-f SConstructFoo') else: -- cgit v0.12 From 7db1283d35814648a4c387990c25b167f7413f1a Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Sat, 17 Aug 2013 20:55:13 -0700 Subject: Fix Libs/SharedLibraryIxes.py Accommodate the renaming of libfoo shared libraries to cygfoo under Cygwin. --- test/Libs/SharedLibraryIxes.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/test/Libs/SharedLibraryIxes.py b/test/Libs/SharedLibraryIxes.py index 4804f5f..6924769 100644 --- a/test/Libs/SharedLibraryIxes.py +++ b/test/Libs/SharedLibraryIxes.py @@ -30,12 +30,14 @@ libraries that have non-standard library prefixes and suffixes. """ import re +import sys import TestSCons test = TestSCons.TestSCons() test.write('SConstruct', """ import sys +isCygwin = sys.platform == 'cygwin' isWindows = sys.platform == 'win32' isMingw = False if isWindows: @@ -107,9 +109,9 @@ def nameInLib(source, lib, libname): return (source, libname) libmethods = [nodeInSrc, pathInSrc, nodeInLib, pathInLib] -# We skip the nameInLib test for MinGW...it would fail, due to +# We skip the nameInLib test for MinGW and Cygwin...they would fail, due to # the Tool's internal naming conventions -if not isMingw: +if not isMingw and not isCygwin: libmethods.extend([nameInLib]) def buildAndlinkAgainst(builder, target, source, method, lib, libname, **kw): @@ -122,11 +124,11 @@ def buildAndlinkAgainst(builder, target, source, method, lib, libname, **kw): if str(l)[-4:] == '.lib': lib = [l] break - # If we use MinGW and create a SharedLibrary, we get two targets: a DLL, + # If we use MinGW or Cygwin and create a SharedLibrary, we get two targets: a DLL, # and the import lib created by the "--out-implib" parameter. We always # want to link against the second one, in order to prevent naming issues # for the linker command line... - if isMingw and len(lib) > 1: + if (isMingw or isCygwin) and len(lib) > 1: lib = lib[1:] # Apply the naming method to be tested and call the specified Builder. @@ -276,8 +278,14 @@ tests = re.findall(r'Prog: (\d+), (\S+), (\S+), (\S+)', test.stdout()) expected = "goo.c\nfoo.c\nprog.c\n" for t in tests: - test.must_exist(t[1]) - test.must_exist(t[2]) + if sys.platform != 'cygwin': + test.must_exist(t[1]) + test.must_exist(t[2]) + else: + # Cygwin turns libFoo.xxx into cygFoo.xxx + for f in t[1:2]: + test.must_exist(re.sub('^lib', 'cyg', f)) + test.must_exist(t[3]) test.run(program = test.workpath(t[3]), stdout=expected) -- cgit v0.12 From 6d7f7a2a743436e65432c6b2ed1037c7c4ad2477 Mon Sep 17 00:00:00 2001 From: David Rothenberger Date: Fri, 23 Aug 2013 13:08:01 -0700 Subject: cyglink: Fix variant-dir --- src/engine/SCons/Tool/cyglink.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/engine/SCons/Tool/cyglink.py b/src/engine/SCons/Tool/cyglink.py index 23c1adf..87716cf 100644 --- a/src/engine/SCons/Tool/cyglink.py +++ b/src/engine/SCons/Tool/cyglink.py @@ -44,10 +44,8 @@ def shlib_emitter(target, source, env): # Remove any "lib" after the prefix pre = env.subst('$SHLIBPREFIX') - dll_name = str(dll) - if dll_name[len(pre):len(pre)+3] == 'lib': - dll_name = pre + dll_name[len(pre)+3:] - dll = env.fs.File(dll_name) + if dll.name[len(pre):len(pre)+3] == 'lib': + dll.name = pre + dll.name[len(pre)+3:] orig_target = target target = [env.fs.File(dll)] -- cgit v0.12