[zorg] r374740 - Set a default build directory in the LLVMBuildFactory and then properly use it.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Sun Oct 13 14:39:00 2019
New Revision: 374740

URL: http://llvm.org/viewvc/llvm-project?rev=374740&view=rev
Log:
Set a default build directory in the LLVMBuildFactory and then properly use it.

Modified:
    zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py
    zorg/trunk/zorg/buildbot/process/factory.py

Modified: zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py?rev=374740&r1=374739&r2=374740&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/UnifiedTreeBuilder.py Sun Oct 13 14:39:00 2019
@@ -65,6 +65,9 @@ def addCmakeSteps(
     else:
         cmake_args = list()
 
+    if obj_dir is None:
+        obj_dir = f.obj_dir
+
     # This is an incremental build, unless otherwise has been requested.
     # Remove obj and install dirs for a clean build.
     # TODO: Some Windows slaves do not handle RemoveDirectory command well.
@@ -242,7 +245,7 @@ def getCmakeWithNinjaBuildFactory(
 
     addNinjaSteps(
            f,
-           obj_dir=obj_dir,
+           obj_dir=f.obj_dir,
            checks=checks,
            install_dir=f.install_dir,
            env=env,

Modified: zorg/trunk/zorg/buildbot/process/factory.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/process/factory.py?rev=374740&r1=374739&r2=374740&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/process/factory.py (original)
+++ zorg/trunk/zorg/buildbot/process/factory.py Sun Oct 13 14:39:00 2019
@@ -44,6 +44,10 @@ class LLVMBuildFactory(BuildFactory):
         if kwargs.get('llvm_srcdir', None) is None:
             self.llvm_srcdir = "llvm"
 
+        # Default build directory.
+        if kwargs.get('obj_dir', None) is None:
+            self.obj_dir = "build"
+
 
     @staticmethod
     def pathRelativeToBuild(path, buildPath):