[Lldb-commits] [PATCH] D69341: [zorg] Port LLDB cmake build factory to git

[Pavel Labath via Phabricator via lldb-commits]

labath updated this revision to Diff 226183.
labath added a comment.

s/self.monorepo_dir/f.monorepo_dir


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D69341/new/

https://reviews.llvm.org/D69341

Files:
  zorg/buildbot/builders/LLDBBuilder.py


Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -66,7 +66,9 @@
             install=False):
 
     ############# PREPARING
-    f = buildbot.process.factory.BuildFactory()
+    f = LLVMBuildFactory(
+            is_legacy_mode=False,
+            depends_on_projects=["llvm", "clang", "lldb", "lld"])
 
     # Determine Slave Environment and Set MSVC environment.
     if vs:
@@ -74,7 +76,7 @@
             command=getVisualStudioEnvironment(vs, target_arch),
             extract_fn=extractSlaveEnvironment))
 
-    f = getLLDBSource(f,'llvm')
+    f.addGetSourcecodeSteps()
 
     build_cmd=['ninja']
     install_cmd = ['ninja','install']
@@ -105,7 +107,7 @@
                 ))
 
     cmake_cmd = [
-        "cmake", "-G", "Ninja", "../llvm",
+        "cmake", "-G", "Ninja", "../" + f.monorepo_dir,
         "-DCMAKE_BUILD_TYPE=" + config,
         "-DCMAKE_INSTALL_PREFIX=../install"
         ]



Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -66,7 +66,9 @@
             install=False):
 
     ############# PREPARING
-    f = buildbot.process.factory.BuildFactory()
+    f = LLVMBuildFactory(
+            is_legacy_mode=False,
+            depends_on_projects=["llvm", "clang", "lldb", "lld"])
 
     # Determine Slave Environment and Set MSVC environment.
     if vs:
@@ -74,7 +76,7 @@
             command=getVisualStudioEnvironment(vs, target_arch),
             extract_fn=extractSlaveEnvironment))
 
-    f = getLLDBSource(f,'llvm')
+    f.addGetSourcecodeSteps()
 
     build_cmd=['ninja']
     install_cmd = ['ninja','install']
@@ -105,7 +107,7 @@
                 ))
 
     cmake_cmd = [
-        "cmake", "-G", "Ninja", "../llvm",
+        "cmake", "-G", "Ninja", "../" + f.monorepo_dir,
         "-DCMAKE_BUILD_TYPE=" + config,
         "-DCMAKE_INSTALL_PREFIX=../install"
         ]

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits