Build procedure for lldb project with cmake/ninja

[chying]

Summary

Added new build procedure for lldb project.

Command sequence:
svn to get source
clean build folder
cmake
ninja
ninja check-lldb

[sivachandra]

There are a bunch of style nits that I pointed out. They are optional, but I think definitely good to have. Even if the existing code is haphazardly formatted, it is good to set a precedent for future changes.

zorg/buildbot/builders/LLDBBuilder.py

254

I am not sure if this is relevant for CMake builds.

298

nit: line 287-297 can be better formatted according to PEP8.

313

I do not think that the linux builders (debian, freebsd and ubuntu) are doing it right wrt getting the source. I think the windows builders are dong it right. Look at the function getLLDBSource above. The function getLLDBxcodebuildFactory below is also doing the same as getLLDBSource.

321

nit: Fix indentation of above lines to follow PEP8 rules.

324

As I mentioned above, I do not think this is relevant for CMake builds.

332

nit: Fix indentation of above 4 lines.

338

nit: Fix indentation of above 3 lines.

[sivachandra]

Sorry for revisiting. Just a couple of things which are probably good to be fixed, but not required/important.

zorg/buildbot/builders/LLDBBuilder.py

258

Default args to Python functions should not be empty lists or empty dicts. It does not matter in this case as this function is called only once. So, its up to you if you want to fix.

See: http://stackoverflow.com/questions/9887180/the-value-of-an-empty-list-in-function-parameter-example-here

320

This should probably be in extra_configure_args.

[sivachandra]

zorg/buildbot/builders/LLDBBuilder.py

320

Ying had asked a question about this off-thread. I am answering it here.

If you actually want to get it absolutely right, you should remove the arg extra_configure_args completely. That name suggests the use of "configure" and not cmake. If you do want to go this route, then you should have the following args instead of "extra_configure_args":

1. build_compiler - This can take args like "gcc", "clang", "icc" etc. You should have logic like this:
   
   cmake_args = [] if build_compiler == 'gcc': cmake_args += ["-DCMAKE_C_COMPILER=gcc", "-DCMAKE_CXX_COMPILER=g++"] elif build_compiler == 'clang': ... so on

2. test_compiler - This can take args like "gcc", "clang", "icc", etc. You should have logic like this:
   
   if test_compiler == 'gcc': cmake_args.append("-DLLDB_TEST_COMPILER=gcc") elif test_compiler == 'clang': ... so on

3. build_type - This can be 'Debug' or 'Release'. You should have code like this:
   
   cmake_args.append("-DCMAKE_BUILD_TYPE=%s" % build_type)

[chying]

Create new revision based on code review feedback
http://reviews.llvm.org/D7599

zorg/buildbot/builders/LLDBBuilder.py

f.addStep(LitTestCommand(name="test lldb",
                              command=['nice', '-n', '10',
                                       make],
                              description="test lldb",
                              env=env,
                              workdir='%s/tools/lldb/test' % llvm_objdir))
 
     return f
 
+#Cmake bulids on Ubuntu
+#Build command sequnce - cmake, ninja, ninja check-lldb
+def getLLDBUbuntuCMakeBuildFactory(
+            triple,
+            outOfDir=True,
+            jobs='%(jobs)s',
+            extra_configure_args=[],
+            env={},
+            *args,
+            **kwargs):
+
+    if outOfDir:
+        llvm_srcdir = "llvm"
+        llvm_builddir = "build"
+    else:
+        llvm_srcdir = "llvm"
+        llvm_objdir = "llvm"
+
+    f = buildbot.process.factory.BuildFactory()
+
+    # Determine the build directory.
+    f.addStep(SetProperty(name="get_builddir",
+              command=["pwd"],
+              property="builddir",
+              description="set build dir",
+              workdir="."))
+
+    # Find out what version of llvm and clang are needed to build this version
+    # of lldb. Right now we will assume they use the same version.
+    # XXX - could this be done directly on the master instead of the slave?
+    f.addStep(SetProperty(command='svn cat http://llvm.org/svn/llvm-project/lldb/trunk/scripts/build-llvm.pl | grep ^our.*llvm_revision | cut -d \\" -f 2',
+                          property='llvmrev'))
+
+    # The SVN build step provides no mechanism to check out a specific revision
+    # based on a property, so just run the commands directly here.
+
+    svn_co = ['svn', 'checkout', '--force']
+    svn_co += ['--revision', WithProperties('%(llvmrev)s')]
+
+    # build llvm svn checkout command
+    svn_co_llvm = svn_co + \
+     [WithProperties('http://llvm.org/svn/llvm-project/llvm/trunk@%(llvmrev)s'),
+                     llvm_srcdir]
+    # build clang svn checkout command
+    svn_co_clang = svn_co + \
+     [WithProperties('http://llvm.org/svn/llvm-project/cfe/trunk@%(llvmrev)s'),
+                     '%s/tools/clang' % llvm_srcdir]
+
+    f.addStep(ShellCommand(name='svn-llvm',
+                           command=svn_co_llvm,
+                           haltOnFailure=True,
+                           workdir='.'))
+    f.addStep(ShellCommand(name='svn-clang',
+                           command=svn_co_clang,
+                           haltOnFailure=True,
+                           workdir='.'))
+
+    f.addStep(SVN(name='svn-lldb',
+                  mode='update',
+                  baseURL='http://llvm.org/svn/llvm-project/lldb/',
+                  defaultBranch='trunk',
+                  always_purge=True,
+                  workdir='%s/tools/lldb' % llvm_srcdir))
+
+    # Run configure
+    config_args = ["cmake",
+       "-GNinja",
+       "-DCMAKE_C_COMPILER=clang",
+       "-DCMAKE_CXX_COMPILER=clang++",
+         "-DCMAKE_BUILD_TYPE=Debug",
+                   WithProperties("../%s" %llvm_srcdir),
+                  ]
+    if triple:
+        config_args += ['--build=%s' % triple]
+    config_args += extra_configure_args
+    
+    # Clean Build Folder
+    f.addStep(ShellCommand(name="clean",
+                             command="rm -rf *",
+                             description="clear build folder",
+                             env=env,
+                             workdir='%s' % llvm_builddir))
+    
+    # Configure
+    f.addStep(Configure(name='configure/cmake',
+        command=config_args,
+        env=env,
+        workdir=llvm_builddir))
+    # Compile
+    f.addStep(WarningCountingShellCommand(name="compile/ninja",
+                                          command=['nice', '-n', '10',
+                                                   'ninja', WithProperties("-j%s" % jobs)],
+                                          env=env,
+                                          haltOnFailure=True,
+                                          workdir=llvm_builddir))
+
+    # Test.
+    f.addStep(LitTestCommand(name="test lldb",
+                             command=['nice', '-n', '10',
+                                      'ninja',
+                                      'check-lldb'],
+                             description="test lldb",
+                             env=env,
+                             workdir='%s' % llvm_builddir))
+
+    return f
+
 def getLLDBxcodebuildFactory(use_cc=None):
     f = buildbot.process.factory.BuildFactory()
     f.addStep(SetProperty(name='get_builddir',
                           command=['pwd'],
                           property='builddir',
                           description='set build dir',
                           workdir='.'))
     lldb_srcdir = 'lldb.src'