Merged revisions 1826-1882 via svnmerge from

[scons.git] / QMTest / TestSCons.py

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 79e96d70d7c6ebeda4b71c49da372cfb6efe7f12..1b499deda4f4bc92b8673a65a4457e6fbe60a13e 100644 (file)
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -30,7 +30,7 @@ from TestCommon import __all__
 # to what we expect.  (If we derived the version number from the same
 # data driving the build we might miss errors if the logic breaks.)
 
-SConsVersion = '0.96.94'
+SConsVersion = '0.96.96'
 
 __all__.extend([ 'TestSCons',
                  'python',
@@ -443,8 +443,8 @@ env.SharedLibrary( 'myqt', 'my_qobject.cpp' )
 
         self.QT = self.workpath(dir)
         self.QT_LIB = 'myqt'
-        self.QT_MOC = '%s %s' % (python, self.workpath(dir, 'bin', 'mymoc.py'))
-        self.QT_UIC = '%s %s' % (python, self.workpath(dir, 'bin', 'myuic.py'))
+        self.QT_MOC = '%s %s' % (_python_, self.workpath(dir, 'bin', 'mymoc.py'))
+        self.QT_UIC = '%s %s' % (_python_, self.workpath(dir, 'bin', 'myuic.py'))
         self.QT_LIB_DIR = self.workpath(dir, 'lib')
 
     def Qt_create_SConstruct(self, place):
@@ -550,15 +550,31 @@ print "self._msvs_versions =", str(env['MSVS']['VERSIONS'])
         """Returns a full path to the executable (MSDEV or devenv)
         for the specified version of Visual Studio.
         """
-        sub_path = {
-            '6.0' : ['Common', 'MSDev98', 'Bin', 'MSDEV.COM'],
-            '7.0' : ['Common7', 'IDE', 'devenv.com'],
-            '7.1' : ['Common7', 'IDE', 'devenv.com'],
-            '8.0' : ['Common7', 'IDE', 'devenv.com'],
+        common_msdev98_bin_msdev_com = ['Common', 'MSDev98', 'Bin', 'MSDEV.COM']
+        common7_ide_devenv_com       = ['Common7', 'IDE', 'devenv.com']
+        common7_ide_vcexpress_exe    = ['Common7', 'IDE', 'VCExpress.exe']
+        sub_paths = {
+            '6.0' : [
+                common_msdev98_bin_msdev_com,
+            ],
+            '7.0' : [
+                common7_ide_devenv_com,
+            ],
+            '7.1' : [
+                common7_ide_devenv_com,
+            ],
+            '8.0' : [
+                common7_ide_devenv_com,
+                common7_ide_vcexpress_exe,
+            ],
         }
         from SCons.Tool.msvs import get_msvs_install_dirs
         vs_path = get_msvs_install_dirs(version)['VSINSTALLDIR']
-        return apply(os.path.join, [vs_path] + sub_path[version])
+        for sp in sub_paths[version]:
+            p = apply(os.path.join, [vs_path] + sp)
+            if os.path.exists(p):
+                return p
+        return apply(os.path.join, [vs_path] + sub_paths[version][0])
 
 # In some environments, $AR will generate a warning message to stderr
 # if the library doesn't previously exist and is being created.  One