summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2012-07-27 01:16:57 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2012-07-27 01:16:57 (GMT)
commite5ed166538a2e12893346f9778cba8037f2dd847 (patch)
tree5ac125a0f38a2596c948c9c2009d2fb1827ec265
parent58f21832fd299541799e2f608162a49eda20d27c (diff)
parent1a8576e9eaf4329247ff522e2e687fd7011185a7 (diff)
downloadSCons-e5ed166538a2e12893346f9778cba8037f2dd847.zip
SCons-e5ed166538a2e12893346f9778cba8037f2dd847.tar.gz
SCons-e5ed166538a2e12893346f9778cba8037f2dd847.tar.bz2
Add recent fixes to src/CHANGES.txt
-rw-r--r--src/CHANGES.txt4
-rw-r--r--src/engine/SCons/Tool/mingw.py8
-rw-r--r--src/engine/SCons/Tool/mslink.xml2
-rw-r--r--test/MinGW/WINDOWS_INSERT_DEF.py62
4 files changed, 71 insertions, 5 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6b8cf5f..dd0cc41 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,10 @@
RELEASE 2.X.X -
+ From Joshua Hughes:
+ - Make Windows not redefine builtin file as un-inheritable (#2857)
+ - Fix WINDOWS_INSERT_DEF on MinGW (Windows) (#2856)
+
From smallbub on Bitbucket:
- Fix LINKCOMSTR, SHLINKCOMSTR, and LDMODULECOMSTR on Windows (#2833).
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index 5827aae..83f8c93 100644
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -100,12 +100,12 @@ def shlib_emitter(target, source, env):
target.append(env.fs.File(targetStrings))
# Append a def file target if there isn't already a def file target
- # or a def file source. There is no option to disable def file
- # target emitting, because I can't figure out why someone would ever
- # want to turn it off.
+ # or a def file source or the user has explicitly asked for the target
+ # to be emitted.
def_source = env.FindIxes(source, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
def_target = env.FindIxes(target, 'WINDOWSDEFPREFIX', 'WINDOWSDEFSUFFIX')
- if not def_source and not def_target:
+ 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',
diff --git a/src/engine/SCons/Tool/mslink.xml b/src/engine/SCons/Tool/mslink.xml
index 35e8b64..80c5530 100644
--- a/src/engine/SCons/Tool/mslink.xml
+++ b/src/engine/SCons/Tool/mslink.xml
@@ -201,7 +201,7 @@ A deprecated synonym for &cv-link-WINDOWSEXPSUFFIX;.
<summary>
When this is set to true,
a library build of a Windows shared library
-(<filename>.dll</filename>file)
+(<filename>.dll</filename> file)
will also build a corresponding <filename>.def</filename> file
at the same time,
if a <filename>.def</filename> file
diff --git a/test/MinGW/WINDOWS_INSERT_DEF.py b/test/MinGW/WINDOWS_INSERT_DEF.py
new file mode 100644
index 0000000..78aa26e
--- /dev/null
+++ b/test/MinGW/WINDOWS_INSERT_DEF.py
@@ -0,0 +1,62 @@
+#!/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__"
+
+"""
+Make sure that WINDOWS_INSERT_DEF isn't ignored when using MinGW.
+"""
+
+import sys
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+if sys.platform not in ('cygwin', 'win32'):
+ test.skip_test(
+ "Skipping mingw test on non-Windows platform: %s" % sys.platform)
+
+test.write('hello.c', r"""
+#include <stdio.h>
+int hello_world(void) { return printf("Orbis, te saluto!\n"); }
+""")
+
+test.write('SConstruct', """
+env = Environment(TOOLS = ['mingw'])
+hello_dll = env.SharedLibrary(WINDOWS_INSERT_DEF = 0,
+ target = 'hello', source = 'hello.c')
+""" % locals())
+
+test.run(arguments = ".")
+
+test.must_not_exist('hello.def')
+test.up_to_date(arguments = ".")
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: