[zorg] r259246 - Update LLDB Windows buildbot to use VS2015 and Python 3.5

[Zachary Turner via llvm-commits]

Author: zturner
Date: Fri Jan 29 15:52:38 2016
New Revision: 259246

URL: http://llvm.org/viewvc/llvm-project?rev=259246&view=rev
Log:
Update LLDB Windows buildbot to use VS2015 and Python 3.5

Differential Revision: http://reviews.llvm.org/D16695
Reviewed By: Galina Kistanova

Modified:
    zorg/trunk/buildbot/osuosl/master/config/builders.py
    zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py

Modified: zorg/trunk/buildbot/osuosl/master/config/builders.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/buildbot/osuosl/master/config/builders.py?rev=259246&r1=259245&r2=259246&view=diff
==============================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py (original)
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py Fri Jan 29 15:52:38 2016
@@ -530,7 +530,7 @@ def _get_polly_builders():
 # LLDB builders.
 def _get_lldb_builders():
     return [
-        {'name': "lldb-x86-windows-msvc",
+        {'name': "lldb-x86-windows-msvc2015",
          'slavenames': ["zturner-win2008"],
          'builddir': "lldb-windows-x86",
          'factory': LLDBBuilder.getLLDBWindowsCMakeBuildFactory(config='Debug')},

Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=259246&r1=259245&r2=259246&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri Jan 29 15:52:38 2016
@@ -49,10 +49,10 @@ def getLLDBWindowsCMakeBuildFactory(
             jobs="%(jobs)s",
 
             # Source directory containing a built python
-            python_source_dir=r'C:/src/python',
+            python_source_dir=r'C:/Python35',
 
             # Default values for VS devenv and build configuration
-            vs=r"""%VS120COMNTOOLS%""",
+            vs=r"""%VS140COMNTOOLS%""",
             config='Release',
             target_arch='x86',
 
@@ -91,26 +91,12 @@ def getLLDBWindowsCMakeBuildFactory(
                 doStepIf=cleanBuildRequested
                 ))
 
-    if config.lower() == 'release':
-        python_lib = 'python27.lib'
-        python_exe = 'python.exe'
-    elif config.lower() == 'debug':
-        python_lib = 'python27_d.lib'
-        python_exe = 'python_d.exe'
-
-    python_lib = os.path.join(python_source_dir, 'PCbuild', python_lib)
-    python_exe = os.path.join(python_source_dir, 'PCbuild', python_exe)
-    python_include = os.path.join(python_source_dir, 'Include')
-
     # Use batch files instead of ShellCommand directly, Windows quoting is
     # borked. FIXME: See buildbot ticket #595 and buildbot ticket #377.
     f.addStep(batch_file_download.BatchFileDownload(name='cmakegen',
                                 command=[cmake, "-G", "Ninja", "../llvm",
                                          "-DCMAKE_BUILD_TYPE="+config,
-                                         # Need to use our custom built version of python
-                                         '-DPYTHON_LIBRARY=' + python_lib,
-                                         '-DPYTHON_INCLUDE_DIR=' + python_include,
-                                         '-DPYTHON_EXECUTABLE=' + python_exe,
+                                         '-DPYTHON_HOME=' + python_source_dir,
                                          "-DCMAKE_INSTALL_PREFIX=../install"]
                                          + extra_cmake_args,
                                 workdir=build_dir))