[cig-commits] r7007 - cs/buildbot/trunk/buildbot

[leif at geodynamics.org]

Author: leif
Date: 2007-05-30 16:46:37 -0700 (Wed, 30 May 2007)
New Revision: 7007

Modified:
   cs/buildbot/trunk/buildbot/config.py
Log:
Removed obsolete DEPS_PREFIX; don't squash PATH/PYTHONPATH of
BuildConfig.


Modified: cs/buildbot/trunk/buildbot/config.py
===================================================================
--- cs/buildbot/trunk/buildbot/config.py	2007-05-30 23:44:08 UTC (rev 7006)
+++ cs/buildbot/trunk/buildbot/config.py	2007-05-30 23:46:37 UTC (rev 7007)
@@ -32,21 +32,21 @@
         basedir = "%(HOME)s"
         filename = self.configFilename(config)
         prefix = basedir + "/install/" + filename
-        deps_prefix = basedir + "/deps/" + filename
-        petsc_dir = deps_prefix + "/petsc-dev"
+        petsc_dir = prefix + "/opt/petsc-dev"
         builddir = 'build/' + filename + "/" + branch.project.name + "/" + branch.name
         env = {
             "PREFIX": prefix,
-            "DEPS_PREFIX": deps_prefix,
             "PETSC_DIR": petsc_dir,
             "BUILDDIR": builddir,
             }
         env.update(config.env)
         bin = lambda p: p + "/bin"
         sp = lambda p: p + "/lib/" + env['PYTHON'] + "/site-packages"
+        PATH = env.get("PATH", "")
+        PYTHONPATH = env.get("PYTHONPATH", "")
         env.update({
-            "PATH": bin(prefix) + ":" + bin(deps_prefix),
-            "PYTHONPATH": sp(prefix) + ":" + sp(deps_prefix),
+            "PATH": bin(prefix) + ":" + PATH,
+            "PYTHONPATH": sp(prefix) + ":" + PYTHONPATH,
             })
         return env
 
@@ -61,8 +61,8 @@
         args = {
             gnu: [
                 "--prefix=%(PREFIX)s" % env,
-                "LDFLAGS=-L%(PREFIX)s/lib -L%(DEPS_PREFIX)s/lib" % env,
-                "CPPFLAGS=-I%(PREFIX)s/include -I%(DEPS_PREFIX)s/include" % env,
+                "LDFLAGS=-L%(PREFIX)s/lib" % env,
+                "CPPFLAGS=-I%(PREFIX)s/include" % env,
                 ],
             distutils: [
                 "--prefix=%(PREFIX)s" % env,
@@ -129,9 +129,8 @@
                     builder['slavenames'] = [slave.name]
 
                     import os
-                    from os.path import isdir
-                    basedir = "/home/buildbot/master"
-                    builddir = basedir + "/" + env['BUILDDIR']
+                    from os.path import isdir, expanduser
+                    builddir = expanduser("~/master/" + env['BUILDDIR'])
                     if not isdir(builddir):
                         os.makedirs(builddir)