[zorg] r228811 - Do not install CLooG and isl in LNT builds

[Tobias Grosser]

Author: grosser
Date: Wed Feb 11 01:18:35 2015
New Revision: 228811

URL: http://llvm.org/viewvc/llvm-project?rev=228811&view=rev
Log:
Do not install CLooG and isl in LNT builds

isl is shipped with Polly and CLooG is not needed any more.

Modified:
    zorg/trunk/zorg/buildbot/builders/PollyBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/PollyBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/PollyBuilder.py?rev=228811&r1=228810&r2=228811&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/PollyBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/PollyBuilder.py Wed Feb 11 01:18:35 2015
@@ -9,48 +9,9 @@ from buildbot.process.properties import
 from zorg.buildbot.builders import LNTBuilder
 from zorg.buildbot.builders import ClangBuilder
 
-def installRequiredLibs(f, polly_src):
-
-    cloog_installdir = "cloog.install"
-
-    # Get Cloog and isl
-    checkout_cloog = polly_src + '/utils/checkout_cloog.sh'
-    cloog_srcdir = WithProperties("%s/cloog.src", "builddir")
-    f.addStep(ShellCommand(name="get-cloog",
-                           command=[checkout_cloog, cloog_srcdir],
-                           description="Get CLooG/isl source code",
-                           workdir="."))
-
-    confargs = []
-    confargs.append(WithProperties("%s/cloog.src/configure", "builddir"))
-    confargs.append(WithProperties("--prefix=%s/cloog.install", "builddir"))
-    f.addStep(Configure(name="cloog-configure",
-                        command=confargs,
-                        workdir=cloog_srcdir,
-                        description=['cloog-configure']))
-    f.addStep(ShellCommand(name="build-cloog",
-                               command=["make"],
-                               haltOnFailure=True,
-                               description=["build cloog"],
-                               workdir=cloog_srcdir))
-    f.addStep(ShellCommand(name="install-cloog",
-                               command=["make", "install"],
-                               haltOnFailure=True,
-                               description=["install cloog"],
-                               workdir=cloog_srcdir))
-
-def checkRequiredLibs(f, polly_src):
-    cloog_srcdir = WithProperties("%s/cloog.src", "builddir")
-    f.addStep(ShellCommand(name="check-cloog-isl",
-                               command=["make", "check"],
-                               haltOnFailure=True,
-                               description=["check cloog and isl"],
-                               workdir=cloog_srcdir))
-
 def getPollyBuildFactory():
     llvm_srcdir = "llvm.src"
     llvm_objdir = "llvm.obj"
-    cloog_installdir = "cloog.install"
     polly_srcdir = '%s/tools/polly' % llvm_srcdir
     clang_srcdir = '%s/tools/clang' % llvm_srcdir
 
@@ -78,18 +39,13 @@ def getPollyBuildFactory():
                   defaultBranch='trunk',
                   workdir=polly_srcdir))
 
-    # Install Prerequisites
-    installRequiredLibs(f, polly_srcdir)
-
     # Create configuration files with cmake
     f.addStep(ShellCommand(name="create-build-dir",
                                command=["mkdir", "-p", llvm_objdir],
                                haltOnFailure=False,
                                description=["create build dir"],
                                workdir="."))
-    cloogpath = WithProperties("-DCMAKE_PREFIX_PATH=%%(builddir)s/%s"
-                                % cloog_installdir)
-    cmakeCommand = ["cmake", "../%s" %llvm_srcdir, cloogpath,
+    cmakeCommand = ["cmake", "../%s" %llvm_srcdir,
 		    "-DCMAKE_COLOR_MAKEFILE=OFF", "-DPOLLY_TEST_DISABLE_BAR=ON"]
     f.addStep(ShellCommand(name="cmake-configure",
                                command=cmakeCommand,
@@ -102,7 +58,6 @@ def getPollyBuildFactory():
                                haltOnFailure=True,
                                description=["build polly"],
                                workdir=llvm_objdir))
-    checkRequiredLibs(f, polly_srcdir)
     # Test Polly
     f.addStep(ShellCommand(name="test_polly",
                                command=["make", "polly-test"],
@@ -118,8 +73,6 @@ def getPollyBuildFactory():
     return f
 
 def AddExternalPollyBuildFactory(f, llvm_installdir):
-    cloog_installdir = 'cloog.install'
-
     polly_srcdir = 'polly.src'
     polly_objdir = 'polly.obj'
     polly_installdir = 'polly.install'
@@ -137,9 +90,6 @@ def AddExternalPollyBuildFactory(f, llvm
                   defaultBranch='trunk',
                   workdir=polly_srcdir))
 
-    # Install Prerequisites
-    installRequiredLibs(f, polly_srcdir)
-
     # Create configuration files with cmake
     f.addStep(ShellCommand(name="create-build-dir",
                                command=["mkdir", "-p", polly_objdir],
@@ -148,8 +98,6 @@ def AddExternalPollyBuildFactory(f, llvm
                                workdir="."))
     cmakeCommand = ["cmake", "../%s" % polly_srcdir]
 
-    cmakeCommand.append(WithProperties("-DCMAKE_PREFIX_PATH=%%(builddir)s/%s"
-                        % cloog_installdir))
     cmakeCommand.append('-DLLVM_INSTALL_ROOT=../' + llvm_installdir)
     cmakeCommand.append('-DCMAKE_BUILD_TYPE=../' + build_type)
     cmakeCommand.append('-DCMAKE_INSTALL_PREFIX=../' + polly_installdir)
@@ -206,9 +154,6 @@ def getPollyLNTFactory(triple, nt_flags,
     nt_flags.append(WithProperties("--cflag=%s/polly.install/lib/LLVMPolly.so",
                                    'builddir'))
 
-    lnt_args['env'] = {'LD_LIBRARY_PATH': WithProperties("%s/cloog.install/lib",
-                                   'builddir')}
-
     # Add an LNT test runner.
     LNTBuilder.AddLNTTestsToFactory(f, nt_flags,
                                     cc_path=(llvm_install_dir+'/bin/clang'),