Merge branch 'hotfix/0.5.3.5'

kayhayen · kayhayen · commit e26b6a9e11a6 · 2014-07-18T07:28:52.000+02:00
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+nuitka (0.5.3.5+ds-1) unstable; urgency=medium
+
+  * New upstream hotfix release.
+
+ -- Kay Hayen <kay.hayen@gmail.com>  Fri, 18 Jul 2014 07:28:17 +0200
+
 nuitka (0.5.3.4+ds-1) unstable; urgency=medium
 
   * New upstream hotfix release.
diff --git a/nuitka/Options.py b/nuitka/Options.py
@@ -18,7 +18,7 @@
 """ Options module """
 
 version_string = """\
-Nuitka V0.5.3.4
+Nuitka V0.5.3.5
 Copyright (C) 2014 Kay Hayen."""
 
 import logging
diff --git a/nuitka/build/SingleExe.scons b/nuitka/build/SingleExe.scons
@@ -387,10 +387,6 @@ if os.name != "nt" and env["CXX"] is None:
 The g++ compiler '%s' (version %s) doesn't have the sufficient \
 version (>= 4.4).""" % ( orig_cxx, orig_cxx_version ) )
 
-if show_scons_mode:
-    print "Scons compiler: Using",
-    print getExecutablePath( env[ "CXX" ], initial = False )
-
 if env["CXX"] is None or \
    getExecutablePath( env[ "CXX" ], initial = False ) is None:
     if os.name == "nt":
@@ -410,6 +406,10 @@ b) Install MinGW to 'C:\\MinGW' then it is automatically picked up.
     else:
         sys.exit("Error, cannot locate suitable C++ compiler.")
 
+if show_scons_mode:
+    print "Scons compiler: Using",
+    print getExecutablePath( env[ "CXX" ], initial = False )
+
 gcc_mode = "g++" in env[ "CXX" ] or "clang" in env[ "CXX" ]
 msvc_mode = win_target and not gcc_mode
 
diff --git a/tests/CPython26 b/tests/CPython26
@@ -1 +1 @@
-Subproject commit 6122a127ffbd44f0b2a655b84bb65952751bda4c
+Subproject commit 621201b492653ecf4d013a7a4cbe338bc2b428f4
diff --git a/tests/CPython27 b/tests/CPython27
@@ -1 +1 @@
-Subproject commit 639a34c053106b8f465a50c1258d9cd820628baa
+Subproject commit 247c5875592401f76a57fc43a43ab6eab7577d8b
diff --git a/tests/CPython32 b/tests/CPython32
@@ -1 +1 @@
-Subproject commit 1885dafb33dc6228582f069604dec41b24144d0e
+Subproject commit b63256ef1419a3fc359dedbe80527d07962e7653
