commit 07ae8be56e68c55572879539e8c415404f5d103a
author Galina Kistanova <gkistanova@gmail.com> Mon Sep 28 00:06:43 2020 -0700
committer Galina Kistanova <gkistanova@gmail.com> Tue Oct 27 00:25:20 2020 -0700
tree ea7c879d704cdd7389c3732089c66d963d49665a
parent d53473be1d1d53c2f4dc43257137cc41d17ea30f

Ported LLDBBuilder.

zorg/buildbot/builders/LLDBBuilder.py

diff --git a/zorg/buildbot/builders/LLDBBuilder.py b/zorg/buildbot/builders/LLDBBuilder.py
index c35a084..b0f30e6 100644
--- a/zorg/buildbot/builders/LLDBBuilder.py
+++ b/zorg/buildbot/builders/LLDBBuilder.py
@@ -1,11 +1,11 @@
 from buildbot.steps.shell import SetProperty
 from buildbot.steps.shell import ShellCommand, WarningCountingShellCommand
-from buildbot.steps.slave import RemoveDirectory
 from buildbot.process.properties import WithProperties, Property
+from buildbot.plugins import steps
 
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
 from zorg.buildbot.builders.Util import getVisualStudioEnvironment
-from zorg.buildbot.builders.Util import extractSlaveEnvironment
+from zorg.buildbot.builders.Util import extractVSEnvironment
 from zorg.buildbot.process.factory import LLVMBuildFactory
 
 # CMake builds
@@ -35,11 +35,13 @@
             depends_on_projects=["llvm", "clang", "lldb", "lld"],
             obj_dir=build_dir)
 
+    env = {}
     # Determine Slave Environment and Set MSVC environment.
-    if vs:
+    if vs and vs != 'manual':
         f.addStep(SetProperty(
             command=getVisualStudioEnvironment(vs, target_arch),
-            extract_fn=extractSlaveEnvironment))
+            extract_fn=extractVSEnvironment))
+        env = Property('vs_env')
 
     f.addGetSourcecodeSteps()
 
@@ -54,7 +56,7 @@
 
     ############# CLEANING
     cleanBuildRequested = lambda step: clean or step.build.getProperty("clean", default=step.build.getProperty("clean_obj"))
-    f.addStep(RemoveDirectory(name='clean '+build_dir,
+    f.addStep(steps.RemoveDirectory(name='clean '+build_dir,
                 dir=build_dir,
                 haltOnFailure=False,
                 flunkOnFailure=False,
@@ -78,7 +80,7 @@
                            haltOnFailure=True,
                            options=cmake_options,
                            path=rel_src_dir,
-                           env=Property('slave_env'),
+                           env=env,
                            workdir=build_dir))
 
     f.addStep(WarningCountingShellCommand(name='build',
@@ -86,7 +88,7 @@
                           haltOnFailure=True,
                           description='ninja build',
                           workdir=build_dir,
-                          env=Property('slave_env')))
+                          env=env))
 
     ignoreInstallFail = bool(install != 'ignoreFail')
     f.addStep(ShellCommand(name='install',
@@ -95,7 +97,7 @@
                           description='ninja install',
                           workdir=build_dir,
                           doStepIf=bool(install),
-                          env=Property('slave_env')))
+                          env=env))
 
     ignoreTestFail = bool(test != 'ignoreFail')
     f.addStep(ShellCommand(name='test',
@@ -105,6 +107,6 @@
                           description='ninja test',
                           workdir=build_dir,
                           doStepIf=bool(test),
-                          env=Property('slave_env')))
+                          env=env))
 
     return f