Merge branch 'master' of git://github.com/caen1/buildbot

master/buildbot/steps/vstudio.py

@@ -353,12 +353,18 @@ class VC9(VC8):
 
 VS2008 = VC9
 
-# VC10 doesn't looks like it needs extra stuff.
+# VC10 doesn't look like it needs extra stuff.
 class VC10(VC9):
     default_installdir = 'C:\\Program Files\\Microsoft Visual Studio 10.0'
 
 VS2010 = VC10
 
+# VC11 doesn't look like it needs extra stuff.
+class VC11(VC10):
+    default_installdir = 'C:\\Program Files\\Microsoft Visual Studio 11.0'
+
+VS2012 = VC11
+
 class MsBuild(VisualStudio):
     platform = None
 

master/buildbot/test/unit/test_steps_vstudio.py

@@ -744,6 +744,30 @@ def test_installdir(self):
         return self.runStep()
 
 
+class TestVC11(VC8ExpectedEnvMixin, steps.BuildStepMixin, unittest.TestCase):
+
+    def setUp(self):
+        return self.setUpBuildStep()
+
+    def tearDown(self):
+        return self.tearDownBuildStep()
+
+    def test_installdir(self):
+        self.setupStep(vstudio.VC11(projectfile='pf', config='cfg',
+                                   project='pj'))
+        self.expectCommands(
+            ExpectShell(workdir='wkdir', usePTY='slave-config',
+                        command=['devenv.com', 'pf', '/Rebuild',
+                                 'cfg', '/Project', 'pj' ],
+                        env=self.getExpectedEnv(
+                            r'C:\Program Files\Microsoft Visual Studio 11.0'))
+            + 0
+        )
+        self.expectOutcome(result=SUCCESS,
+                status_text=["compile", "0 projects", "0 files"])
+        return self.runStep()
+
+
 class TestMsBuild(steps.BuildStepMixin, unittest.TestCase):
 
     def setUp(self):
@@ -796,3 +820,5 @@ def test_vs2008(self):
     def test_vs2010(self):
         self.assertIdentical(vstudio.VS2010, vstudio.VC10)
 
+    def test_vs2012(self):
+        self.assertIdentical(vstudio.VS2012, vstudio.VC11)

master/docs/manual/cfg-buildsteps.rst

@@ -1724,17 +1724,22 @@ source code filenames involved).
 .. bb:step:: VC6
 .. bb:step:: VC7
 .. bb:step:: VC8
-.. bb:step:: VC2003
-.. bb:step:: VC2005
-.. bb:step:: VC2008
+.. bb:step:: VC9
+.. bb:step:: VC10
+.. bb:step:: VC11
+.. bb:step:: VS2003
+.. bb:step:: VS2005
+.. bb:step:: VS2008
+.. bb:step:: VS2010
+.. bb:step:: VS2012
 .. bb:step:: VCExpress9
 .. bb:step:: MsBuild
 
 Visual C++
 ++++++++++
 
 These steps are meant to handle compilation using Microsoft compilers.
-VC++ 6-10 (aka Visual Studio 2003-2010 and VCExpress9) are supported via calling
+VC++ 6-11 (aka Visual Studio 2003-2012 and VCExpress9) are supported via calling
 ``devenv``. VS2012 as well as Windows Driver Kit 8 are supported via the new
 ``MsBuild`` step. These steps will take care of setting up a clean compilation
 environment, parsing the generated
@@ -1747,10 +1752,13 @@ All of the classes are in :mod:`buildbot.steps.vstudio`.  The available classes
  * ``VC7``
  * ``VC8``
  * ``VC9``
+ * ``VC10``
+ * ``VC11``
  * ``VS2003``
  * ``VS2005``
  * ``VS2008``
  * ``VS2010``
+ * ``VS2012``
  * ``VCExpress9``
  * ``MsBuild``