[Boost-commit] svn:boost r7082

From: troy_at_[hidden]
Date: 2007-06-16 19:19:03

Author: troy
Date: 2007-06-16 19:19:02 EDT (Sat, 16 Jun 2007)
New Revision: 7082
URL: http://svn.boost.org/trac/boost/changeset/7082

Log:

Correctly handle multiple projects/urls.

Text files modified: 
   sandbox-branches/boost-cmake/dart-client/client.py |    27 ++++++++++++++-------------             
   1 files changed, 14 insertions(+), 13 deletions(-)

Modified: sandbox-branches/boost-cmake/dart-client/client.py
==============================================================================
--- sandbox-branches/boost-cmake/dart-client/client.py	(original)
+++ sandbox-branches/boost-cmake/dart-client/client.py	2007-06-16 19:19:02 EDT (Sat, 16 Jun 2007)
@@ -49,7 +49,7 @@
 # Get current svn revision number of srcdir
 #
 def svn_status_revision(srcdir):
-    output = subprocess.Popen([svn, "info", "--xml", srcdir], stdout=subprocess.PIPE).communicate()[0]
+    output = subprocess.Popen([svn, "info", "--xml", srcdir], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
     dom = parseString(output)
     rev = dom.getElementsByTagName("commit")[0].getAttribute("revision")
     return rev
@@ -147,18 +147,19 @@
         print "Checking out " + id
         svn_checkout(url, srcdir)
 
-        print "Making build directories..."
-        for build in builds:
-            nextpath = os.path.join(topdir,prefix, build.id, build.build_variant, build.ctest_variant)
-            try:
-                os.makedirs(nextpath)
-                print "  " + nextpath
-            except Exception, e:
-                print "Directory %s exists, not creating (%s)" % (nextpath, e)
-            os.chdir(nextpath)
-            cmd = cmake + " " + " ".join(build_variants[build.build_variant]) + " " + srcdir
-            print cmd
-            os.system(cmd)
+    print "Making build directories..."
+    for build in builds:
+        buildpath = os.path.join(topdir,prefix, build.id, build.build_variant, build.ctest_variant)
+        srcpath = os.path.join(topdir, prefix, build.id, "src")
+        try:
+            os.makedirs(buildpath)
+            print ">>> Initializing " + buildpath
+        except Exception, e:
+            print "Directory %s exists, not creating (%s)" % (buildpath, e)
+        os.chdir(buildpath)
+        cmd = cmake + " " + " ".join(build_variants[build.build_variant]) + " " + srcdir
+        print ">>> Executing " + cmd
+        os.system(cmd)
     
 #
 #  Do the builds in an infinite loop.