commit 682000952c2737b37a7038c5a10fdf6edb1301bb
author Galina Kistanova <gkistanova@gmail.com> Mon Sep 28 00:02:15 2020 -0700
committer Galina Kistanova <gkistanova@gmail.com> Tue Oct 27 00:25:20 2020 -0700
tree 0d6c77a3009bf0003cfabaaa67239b5739a6189e
parent 563c06235fd025001112eb3fdb45de05d1b8716f

Ported FuchsiaBuilder.

zorg/buildbot/builders/FuchsiaBuilder.py

diff --git a/zorg/buildbot/builders/FuchsiaBuilder.py b/zorg/buildbot/builders/FuchsiaBuilder.py
index 71e1aa5..498ec07 100644
--- a/zorg/buildbot/builders/FuchsiaBuilder.py
+++ b/zorg/buildbot/builders/FuchsiaBuilder.py
@@ -2,7 +2,7 @@
 
 from buildbot.process.properties import WithProperties
 from buildbot.steps.shell import ShellCommand
-from buildbot.steps.slave import RemoveDirectory
+from buildbot.plugins import steps
 
 from zorg.buildbot.builders import UnifiedTreeBuilder
 from zorg.buildbot.commands.CmakeCommand import CmakeCommand
@@ -56,7 +56,7 @@
         sdk_platform=lambda _: sdk_platform,
         sdk_version=lambda _: sdk_version)
 
-    f.addStep(RemoveDirectory(name="clean-sdk",
+    f.addStep(steps.RemoveDirectory(name="clean-sdk",
                               dir=sdk_dir,
                               haltOnFailure=True))
 
@@ -73,12 +73,12 @@
     cleanBuildRequested = lambda step: step.build.getProperty("clean", default=True)
 
     # Clean up llvm build.
-    f.addStep(RemoveDirectory(name="clean-llvm.obj",
+    f.addStep(steps.RemoveDirectory(name="clean-llvm.obj",
                               dir=obj_dir,
                               haltOnFailure=True,
                               doStepIf=cleanBuildRequested))
 
-    f.addStep(RemoveDirectory(name="clean-llvm.install",
+    f.addStep(steps.RemoveDirectory(name="clean-llvm.install",
                               dir=install_dir,
                               haltOnFailure=True,
                               doStepIf=cleanBuildRequested))
@@ -104,11 +104,11 @@
 
     cmake_options.append(
         WithProperties(
-            "-DCMAKE_INSTALL_PREFIX=%(workdir)s/" + install_dir
+            "-DCMAKE_INSTALL_PREFIX=%(builddir)s/" + install_dir
         ))
     cmake_options.append(
         WithProperties(
-            "-DFUCHSIA_SDK=%(workdir)s/" + sdk_dir
+            "-DFUCHSIA_SDK=%(builddir)s/" + sdk_dir
         ))
 
     CmakeCommand.applyRequiredOptions(cmake_options, [