summaryrefslogtreecommitdiff
path: root/engine/SCons/Script
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 20:22:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 20:22:54 +0200
commit665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (patch)
tree811063457777a3e3565d23218321dd35d3435ddc /engine/SCons/Script
parent765fbac29295fb4e462c480d09dbdb2f9718a845 (diff)
Imported Upstream version 2.3.4upstream/2.3.4
Diffstat (limited to 'engine/SCons/Script')
-rw-r--r--engine/SCons/Script/Interactive.py2
-rw-r--r--engine/SCons/Script/Main.py11
-rw-r--r--engine/SCons/Script/SConsOptions.py2
-rw-r--r--engine/SCons/Script/SConscript.py5
-rw-r--r--engine/SCons/Script/__init__.py2
5 files changed, 15 insertions, 7 deletions
diff --git a/engine/SCons/Script/Interactive.py b/engine/SCons/Script/Interactive.py
index a09ef87..4f447a8 100644
--- a/engine/SCons/Script/Interactive.py
+++ b/engine/SCons/Script/Interactive.py
@@ -20,7 +20,7 @@
# 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__ = "src/engine/SCons/Script/Interactive.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Script/Interactive.py 2014/09/27 12:51:43 garyo"
__doc__ = """
SCons interactive mode
diff --git a/engine/SCons/Script/Main.py b/engine/SCons/Script/Main.py
index f0fcace..d7c9f95 100644
--- a/engine/SCons/Script/Main.py
+++ b/engine/SCons/Script/Main.py
@@ -34,7 +34,7 @@ deprecated_python_version = (2, 7, 0)
# 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__ = "src/engine/SCons/Script/Main.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Script/Main.py 2014/09/27 12:51:43 garyo"
import SCons.compat
@@ -953,6 +953,14 @@ def _main(parser):
if options.include_dir:
sys.path = options.include_dir + sys.path
+ # If we're about to start SCons in the interactive mode,
+ # inform the FS about this right here. Else, the release_target_info
+ # method could get called on some nodes, like the used "gcc" compiler,
+ # when using the Configure methods within the SConscripts.
+ # This would then cause subtle bugs, as already happened in #2971.
+ if options.interactive:
+ SCons.Node.interactive = True
+
# That should cover (most of) the options. Next, set up the variables
# that hold command-line arguments, so the SConscript files that we
# read and execute have access to them.
@@ -1082,7 +1090,6 @@ def _main(parser):
platform = SCons.Platform.platform_module()
if options.interactive:
- SCons.Node.interactive = True
SCons.Script.Interactive.interact(fs, OptionsParser, options,
targets, target_top)
diff --git a/engine/SCons/Script/SConsOptions.py b/engine/SCons/Script/SConsOptions.py
index 7a52f6b..4e8fd3f 100644
--- a/engine/SCons/Script/SConsOptions.py
+++ b/engine/SCons/Script/SConsOptions.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Script/SConsOptions.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Script/SConsOptions.py 2014/09/27 12:51:43 garyo"
import optparse
import re
diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py
index 8e1a662..a0f6569 100644
--- a/engine/SCons/Script/SConscript.py
+++ b/engine/SCons/Script/SConscript.py
@@ -28,7 +28,7 @@ files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import division
-__revision__ = "src/engine/SCons/Script/SConscript.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Script/SConscript.py 2014/09/27 12:51:43 garyo"
import SCons
import SCons.Action
@@ -461,7 +461,8 @@ class SConsEnvironment(SCons.Environment.Base):
def EnsureSConsVersion(self, major, minor, revision=0):
"""Exit abnormally if the SCons version is not late enough."""
- if SCons.__version__ == '2.3.3':
+ # split string to avoid replacement during build process
+ if SCons.__version__ == '__' + 'VERSION__':
SCons.Warnings.warn(SCons.Warnings.DevelopmentVersionWarning,
"EnsureSConsVersion is ignored for development version")
return
diff --git a/engine/SCons/Script/__init__.py b/engine/SCons/Script/__init__.py
index ed94b9a..74c6f58 100644
--- a/engine/SCons/Script/__init__.py
+++ b/engine/SCons/Script/__init__.py
@@ -34,7 +34,7 @@ it goes here.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Script/__init__.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Script/__init__.py 2014/09/27 12:51:43 garyo"
import time
start_time = time.time()