[llvm-commits] [zorg] r162621 - in /zorg/trunk/zorg/buildbot/builders: ClangBuilder.py LLDBBuilder.py LNTBuilder.py PollyBuilder.py

[David Blaikie]

Hi Daniel,

On Fri, Aug 24, 2012 at 4:14 PM, David Blaikie <dblaikie at gmail.com> wrote:
> Author: dblaikie
> Date: Fri Aug 24 18:14:06 2012
> New Revision: 162621
>
> URL: http://llvm.org/viewvc/llvm-project?rev=162621&view=rev
> Log:
> Stop using (& remove) always_install since it's broken.
>
> always_install fails for inDir builds because the build is cleaned before it is
> installed. For non-inDir builds always_install is unused anyway because they're
> implicitly installed. So just use non-inDir instead & remove the trap I got
> caught in.

Turns out I got this wrong - always_install does (or might) work (I'm
tracking down my actual problem which seems to be related to 'strip'
on OSX 10.6) but it isn't used by any in-tree builder (the one builder
config that was setting it wasn't getting any benefit from it because
it was an outOfDir build anyway). Do you have a use for this flag
out-of-tree? If so I'll add it back in.

(I'd consider adding it back in & using it for the builder I'm
experimenting with now, but honestly we should probably always be
doing out-of-dir builds anyway (that's the supported scenario for the
build system) - though /that/ being said, we could still support the
separation of configuring whether-or-not to install from the fact that
it's an out-of-dir build)

- David

>
> Modified:
>     zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
>     zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
>     zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
>     zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
>
> Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=162621&r1=162620&r2=162621&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Fri Aug 24 18:14:06 2012
> @@ -26,7 +26,6 @@
>              outOfDir=False,
>              useTwoStage=False,
>              completely_clean=False,
> -            always_install=False,
>              make='make',
>              jobs="%(jobs)s",
>              stage1_config='Debug+Asserts',
> @@ -49,17 +48,14 @@
>          merged_env.update(env)
>
>      if run_gdb or run_gcc:
> -        always_install = True
> +        outOfDir = True
>
>      # Don't use in-dir builds with a two stage build process.
>      inDir = not outOfDir and not useTwoStage
>      if inDir:
>          llvm_srcdir = "llvm"
>          llvm_1_objdir = "llvm"
> -        if always_install:
> -            llvm_1_installdir = "llvm.install"
> -        else:
> -            llvm_1_installdir = None
> +        llvm_1_installdir = None
>      else:
>          llvm_srcdir = "llvm.src"
>          llvm_1_objdir = "llvm.obj"
>
> Modified: zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py?rev=162621&r1=162620&r2=162621&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/LLDBBuilder.py Fri Aug 24 18:14:06 2012
> @@ -8,8 +8,7 @@
>  from buildbot.process.properties import WithProperties
>
>  def getLLDBBuildFactory(triple, outOfDir=False, useTwoStage=False, jobs='%(jobs)s',
> -                        always_install=False, extra_configure_args=[],
> -                        env={}, *args, **kwargs):
> +                        extra_configure_args=[], env={}, *args, **kwargs):
>
>      inDir = not outOfDir and not useTwoStage
>      if inDir:
>
> Modified: zorg/trunk/zorg/buildbot/builders/LNTBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/LNTBuilder.py?rev=162621&r1=162620&r2=162621&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/LNTBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/LNTBuilder.py Fri Aug 24 18:14:06 2012
> @@ -23,7 +23,7 @@
>      # Build compiler to test.
>      f = ClangBuilder.getClangBuildFactory(
>          triple, outOfDir=True, clean=clean, test=test,
> -        always_install=True, stage1_config='Release+Asserts', **kwargs)
> +        stage1_config='Release+Asserts', **kwargs)
>
>      # Add an LNT test runner.
>      AddLNTTestsToFactory(f, nt_flags,
>
> Modified: zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
> URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/PollyBuilder.py?rev=162621&r1=162620&r2=162621&view=diff
> ==============================================================================
> --- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
> +++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Fri Aug 24 18:14:06 2012
> @@ -168,7 +168,7 @@
>
>      f = ClangBuilder.getClangBuildFactory(
>          triple, outOfDir=True, clean=clean, test=test,
> -        always_install=False, stage1_config='Release+Asserts', **kwargs)
> +        stage1_config='Release+Asserts', **kwargs)
>
>      f.addStep(ShellCommand(name="install-llvm-and-clang",
>                             command=["make", "install"],
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits