[zorg] r223377 - Fixed the LLDB builder to build into a sensible

[Sean Callanan]

Author: spyffe
Date: Thu Dec  4 12:59:27 2014
New Revision: 223377

URL: http://llvm.org/viewvc/llvm-project?rev=223377&view=rev
Log:
Fixed the LLDB builder to build into a sensible
location and clean that location before building.

Modified:
    zorg/trunk/zorg/jenkins/build.py

Modified: zorg/trunk/zorg/jenkins/build.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/build.py?rev=223377&r1=223376&r2=223377&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/build.py (original)
+++ zorg/trunk/zorg/jenkins/build.py Thu Dec  4 12:59:27 2014
@@ -29,8 +29,9 @@ class Configuration(object):
         self._args = args
         self.workspace = os.environ.get('WORKSPACE', os.getcwd())    
         self._src_dir = os.environ.get('SRC_DIR', 'llvm')
-        self._lldb_src_dir = os.environ.get('SRC_DIR', 'lldb')
+        self._lldb_src_dir = os.environ.get('LLDB_SRC_DIR', 'lldb')
         self._build_dir = os.environ.get('BUILD_DIR', 'clang-build')
+        self._lldb_build_dir = os.environ.get('LLDB_BUILD_DIR', 'lldb-build')
         self._install_dir = os.environ.get('BUILD_DIR', 'clang-install')
         self.j_level = os.environ.get('J_LEVEL', '4')
         self.host_compiler_url = os.environ.get('HOST_URL',
@@ -51,6 +52,10 @@ class Configuration(object):
         """The derived source directory for this build."""
         return os.path.join(self.workspace, self._src_dir)
 
+    def lldbbuilddir(self):
+        """The derived source directory for this lldb build."""
+        return os.path.join(self.workspace, self._lldb_build_dir)
+
     def lldbsrcdir(self):
         """The derived source directory for this lldb build."""
         return os.path.join(self.workspace, self._lldb_src_dir)
@@ -175,9 +180,20 @@ def clang_builder(target):
 
 def lldb_builder():
     """Do an Xcode build of lldb."""
-    xcodebuild_cmd = ["xcodebuild", "-configuration", "BuildAndIntegration", "-scheme", "lldb-tool"]
 
-    header("Make All")
+    # Wipe the build folder
+
+    header("Clean LLDB build directory")
+    if os.path.exists(conf.lldbbuilddir()):
+        clean_cmd = ["rm", "-rf", conf.lldbbuilddir() + "/*"]
+        run_cmd(conf.workspace, clean_cmd)
+    footer()
+
+    # Build into the build folder
+
+    xcodebuild_cmd = ["xcodebuild", "-configuration", "BuildAndIntegration", "-scheme", "lldb-tool", "-derivedDataPath", conf.lldbbuilddir()]
+
+    header("Make lldb-tool")
     run_cmd("lldb", xcodebuild_cmd)
     footer()