[Boost-commit] svn:boost r52814 - in branches/release: . tools/build/CMake tools/build/CMake/sanity

Subject: [Boost-commit] svn:boost r52814 - in branches/release: . tools/build/CMake tools/build/CMake/sanity
From: dgregor_at_[hidden]
Date: 2009-05-06 19:38:33

Author: dgregor
Date: 2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
New Revision: 52814
URL: http://svn.boost.org/trac/boost/changeset/52814

Log:
Remove remaining traash
Removed:
   branches/release/tools/build/CMake/classify.py.in
   branches/release/tools/build/CMake/finish.py.in
   branches/release/tools/build/CMake/info.py.in
   branches/release/tools/build/CMake/marshal.py.in
   branches/release/tools/build/CMake/passthru.py.in
   branches/release/tools/build/CMake/post.py.in
   branches/release/tools/build/CMake/run_continuous_slave.py.in
   branches/release/tools/build/CMake/sanity/
   branches/release/tools/build/CMake/start.py.in
Text files modified: 
   branches/release/CMakeLists.txt                       |     2 +-                                      
   branches/release/tools/build/CMake/BoostTesting.cmake |    11 -----------                             
   2 files changed, 1 insertions(+), 12 deletions(-)

Modified: branches/release/CMakeLists.txt
==============================================================================
--- branches/release/CMakeLists.txt	(original)
+++ branches/release/CMakeLists.txt	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
@@ -268,7 +268,7 @@
 add_subdirectory(doc)
 
 # Add build rules for all of the Boost libraries
-add_subdirectory(${BOOST_LIBS_DIR})
+add_subdirectory(libs)
 
 # Add build rules for all of the Boost tools
 # TODO: On hold while I work on the modularity code

Modified: branches/release/tools/build/CMake/BoostTesting.cmake
==============================================================================
--- branches/release/tools/build/CMake/BoostTesting.cmake	(original)
+++ branches/release/tools/build/CMake/BoostTesting.cmake	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
@@ -49,17 +49,6 @@
   endif (TEST_INSTALLED_TREE)
 endif (BUILD_TESTING)
 
-option(BOOST_BUILD_SANITY_TEST
-  "Don't build regular boost libraries, build libraries that test the boost cmake build system itself" OFF)
-
-if(BOOST_BUILD_SANITY_TEST)
-  set(BOOST_LIBS_DIR ${CMAKE_SOURCE_DIR}/tools/build/CMake/sanity)
-  configure_file(${CMAKE_SOURCE_DIR}/libs/CMakeLists.txt ${BOOST_LIBS_DIR}/CMakeLists.txt COPYONLY)
-else(BOOST_BUILD_SANITY_TEST)
-  set(BOOST_LIBS_DIR ${CMAKE_SOURCE_DIR}/libs)
-endif(BOOST_BUILD_SANITY_TEST)
-
-
 #-------------------------------------------------------------------------------
 # This macro adds additional include directories based on the dependencies of 
 # the library being tested 'libname' and all of its dependencies.

Deleted: branches/release/tools/build/CMake/classify.py.in
==============================================================================
--- branches/release/tools/build/CMake/classify.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,51 +0,0 @@
-#
-#  Classifies pass/fail/warn for the sake of traash
-#
-
-toolset = '@BOOST_TOOLSET@'
-import os
-
-#  'cxx_compile_object'
-#  'run'
-#  'link_executable'
-#  'create_shared_library'
-#  'create_static_library'
-#  'compile-fail'
-
-def classify(step):
-    print "step=", step
-    if 'errno' in step:
-        if step['errno'] == 666:
-            step['status'] = 'timeout'
-        else:
-            step['status'] = 'not_executed'
-        return
-    
-    if step['returncode'] != 0 and not step['expect_fail']:
-        step['status'] = 'fail'
-        return
-
-    if step['returncode'] == 0 and step['expect_fail']:
-        step['status'] = 'unexpected_pass'
-        return
-
-    #
-    #  if it is an expected failure, don't warn just cause of warnings.
-    #
-    if step['returncode'] != 0 and step['expect_fail']:
-        step['status'] = 'pass'
-        return
-
-
-    if step['op'] != 'run' and len(step['stderr']) != 0 and not step['stderr'].isspace():
-        step['status'] = 'warn'
-        return
-
-    # on windoze, warnings are to be found in stdout... but the compiler always
-    # prints the name of the file first.  So warn if there is more than one line 
-    # in stdout.  For now.
-    if os.name == 'nt' and step['op'] == 'cxx_compile_object' and step['stdout'].count('\n') > 1:
-        step['status'] = 'warn'
-        return
-
-    step['status'] = 'pass'

Deleted: branches/release/tools/build/CMake/finish.py.in
==============================================================================
--- branches/release/tools/build/CMake/finish.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,23 +0,0 @@
-#!/usr/bin/python
-#
-#  copyright (C) 2008  troy d. straszheim  <troy_at_[hidden]>
-#  
-#  Distributed under the Boost Software License, Version 1.0.
-#  See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt
-#
-
-#
-#  Start a new build, notify server via xmlrpc
-#
-
-import sys
-sys.path.append("@BOOST_BUILD_SLAVE_PYTHONPATH@")
-from boost_build_slave import *
-
-print '\nFinishing build %d with %s via XML-RPC' % (build_id, xmlrpc_url)
-s = xmlrpclib.Server(xmlrpc_url)
-
-s.traash.finish_build(build_id)
-
-

Deleted: branches/release/tools/build/CMake/info.py.in
==============================================================================
--- branches/release/tools/build/CMake/info.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,26 +0,0 @@
-#!/usr/bin/python
-#
-#  copyright (C) 2008  troy d. straszheim  <troy_at_[hidden]>
-#  
-#  Distributed under the Boost Software License, Version 1.0.
-#  See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt
-#
-
-#
-#  Start a new build, notify server via xmlrpc
-#
-
-import sys
-sys.path.append("@BOOST_BUILD_SLAVE_PYTHONPATH@")
-from boost_build_slave import *
-
-print '      Url:', svn_entry.url, "at rev", svn_entry.revision.number
-print '     FQDN:', fqdn
-print '    Uname:', uname
-print '  Toolset:', toolset
-print ' Build ID:', build_id
-print '  Contact:', contact_info
-pref = '\n           '
-print '  Details: ' + pref.join(details().splitlines()), '\n\n'
-

Deleted: branches/release/tools/build/CMake/marshal.py.in
==============================================================================
--- branches/release/tools/build/CMake/marshal.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,110 +0,0 @@
-#!/usr/bin/python
-#
-#  copyright (C) 2008  troy d. straszheim  <troy_at_[hidden]>
-#  
-#  Distributed under the Boost Software License, Version 1.0.
-#  See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt
-#
-#
-#  Compiler driver.  Takes a few arguments describing what is to be done
-#  (used to mark up the output) and executes compiler in a subshell, checking
-#  for errors and marshalling output to disk.
-#
-import sys, signal, threading, subprocess
-sys.path.append("@BOOST_BUILD_SLAVE_PYTHONPATH@")
-from boost_build_slave import *
-
-import datetime, time, signal
-from subprocess import Popen, PIPE
-from kill_subprocess import kill_subprocess
-from classify import classify
-
-log = os.path.join(sys.argv[1], "Log.marshal")
-op = sys.argv[2]
-target = sys.argv[3]
-argv = sys.argv[4:]
-expect_fail = op.endswith("fail")
-
-if os.name == 'nt':
-    os.environ['PATH'] = r'@CMAKE_LIBRARY_OUTPUT_DIRECTORY@;' + os.environ['PATH']
-
-print "***\n*** Executing op:" + op + "\n*** " + str(argv) + "\n*** log=" + log + "\n***"
-#
-#  execute subprocess, watch for timeout
-#
-class SubprocThread(threading.Thread):
-    def __init__(self):
-        threading.Thread.__init__(self)
-        self.ex = None
-
-    def run(self):
-        try:
-            self.proc = Popen(argv, stdout=PIPE, stderr=PIPE)
-            (self.stdout, self.stderr) = self.proc.communicate()
-        except EnvironmentError, e:
-            self.ex = e
-
-t = SubprocThread()
-starttime = datetime.datetime.now()
-t.start()
-t.join(timeout_seconds)
-
-if t.isAlive():
-    print "*** Killing subprocess after timeout"
-    kill_subprocess(t.proc.pid)
-    e = OSError()
-    e.errno = 666
-    e.message = e.strerror = "TIMEOUT AFTER %d SECONDS" % timeout_seconds
-    e.filename = argv[0]
-    t.ex = e
-
-duration = datetime.datetime.now() - starttime
-
-#
-#  Collect and store subprocess info
-#
-result = { 'expect_fail' : expect_fail,
-           'wallclock_duration' : duration.seconds + duration.microseconds * 10**-6 }
-
-if not t.ex:
-    result['returncode'] = t.proc.returncode
-    result['stdout'] = t.stdout
-    result['stderr'] = t.stderr
-
-    if t.proc.returncode != 0 and not expect_fail:
-        print "*** returncode: %d" % t.proc.returncode
-        print "*** stdout:" + result['stdout']
-        print "*** stderr:" + result['stderr']
-else:
-    result['errno'] = t.ex.errno
-    result['filename'] = t.ex.filename
-    result['message'] = t.ex.message
-    result['strerror'] = t.ex.strerror
-    print "Errno:" + str(t.ex.errno) + ": " + t.ex.strerror
-
-result.update({'op' : op,
-               'target' : target,
-               'cmdline' : argv })
-
-classify(result)
-print "post classification: result=", result
-
-f = open(log, "ab", 0)
-marshal.dump(result, f)
-f.close()
-
-if t.ex:
-    sys.exit(t.ex.errno)
-else:
-    if expect_fail:
-        if t.proc.returncode != 0:
-            sys.exit(0)
-        else: 
-            print "UNEXPECTED SUCCESS"
-            sys.exit(1)  # we need an exit status for 'unexpected success'
-    else:
-        sys.exit(t.proc.returncode)
-
-    
-

Deleted: branches/release/tools/build/CMake/passthru.py.in
==============================================================================
--- branches/release/tools/build/CMake/passthru.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,73 +0,0 @@
-#!/usr/bin/python
-#
-#  copyright (C) 2008  troy d. straszheim  <troy_at_[hidden]>
-#  
-#  Distributed under the Boost Software License, Version 1.0.
-#  See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt
-#
-
-#
-#  "Passthru" driver, only responsible for 'flipping' exit status of
-#  tests that are expected to fail.  See driver.py for the version
-#  that is run when BOOST_BUILD_SLAVE is on, which does xmlizaton
-#  and the like
-#
-import sys, os, os.path
-from subprocess import Popen, PIPE
-
-def verbose(what):
-    if @BOOST_DRIVER_VERBOSE@:
-        print what
-
-# ignored
-# log = os.path.join(sys.argv[1], "Log.xml")
-op = sys.argv[2]
-# target = sys.argv[3]
-argv = sys.argv[4:]
-expect_fail = op.endswith("fail")
-
-#
-#  execute subprocess
-#
-subproc = None
-returncode = None
-ex = None
-stdout = None
-stderr = None
-try:
-    subproc = Popen(argv, stdout=PIPE, stderr=PIPE)
-    (stdout, stderr) = subproc.communicate()
-except EnvironmentError, e:
-    ex = e
-
-returncode = subproc.returncode
-
-if stdout:
-    print stdout
-if stderr:
-    print stderr
-
-if not ex: 
-    # possibly flip the return code
-    if not expect_fail:
-        if not returncode:
-            verbose("ok.")
-        else:
-            verbose("error.")
-        sys.exit(returncode)
-    else:
-        if returncode != 0:
-            verbose("ok.")
-            sys.exit(0)
-        else: 
-            verbose("*** UNEXPECTED SUCCESS ***")
-            sys.exit(1)  # we need an exit status for 'unexpected success'
-else:
-    # if there is an os error 'above' the actual exit status of the subprocess,
-    # use the errno
-    print "Error in build system: " + str(ex.strerror)
-    sys.exit(ex.errno)
-
-    
-

Deleted: branches/release/tools/build/CMake/post.py.in
==============================================================================
--- branches/release/tools/build/CMake/post.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-#
-#  copyright (C) 2008  troy d. straszheim  <troy_at_[hidden]>
-#  
-#  Distributed under the Boost Software License, Version 1.0.
-#  See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt
-#
-
-#
-#  Send the build log via XML-RPC
-#
-
-import sys
-sys.path.append("@BOOST_BUILD_SLAVE_PYTHONPATH@")
-from boost_build_slave import *
-
-s = xmlrpclib.Server(xmlrpc_url, allow_none=True)
-
-project_name = sys.argv[1]
-parent_target = sys.argv[2]
-build_or_test = sys.argv[3]
-logdir = sys.argv[4]
-
-# print "\n>>>\n>>> Project " + project_name \
-#       + "\n>>> POST build log for " + parent_target \
-#       + "\n>>> from log dir" + logdir \
-#       + "\n>>> to " + xmlrpc_url \
-#       + "\n>>> Server build ID: %d" % build_id \
-#       + "\n>>>"
-
-p = os.path.join(logdir, "Log.marshal")
-
-if not os.path.exists(p):
-    print "No results to submit"
-    sys.exit(0)
-
-f = open(p, "rb")
-
-i = 0
-while True:
-    try:
-        r = marshal.load(f)
-        r.update({ 'build_id' : build_id,
-                   'project' : project_name,
-                   'parent_target' : parent_target,
-                   'build_or_test' : build_or_test })
-        s.traash.step(r)
-        i += 1
-    except EOFError, e:
-        break
-
-print "Submitted ", i, " steps."
-f.close()
-os.remove(p)
-

Deleted: branches/release/tools/build/CMake/run_continuous_slave.py.in
==============================================================================
--- branches/release/tools/build/CMake/run_continuous_slave.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,82 +0,0 @@
-#!/usr/bin/python
-#
-#  Build slave script.
-#
-
-import pysvn, os, time
-from optparse import OptionParser
-
-parser = OptionParser()
-
-parser.add_option("-b", "--build-first",
-                  action="store_true", dest="build_first", default=False,
-                  help="Build on startup")
-
-parser.add_option("-c", "--clean-first",
-                  action="store_true", dest="clean_first", default=False,
-                  help="Clean on startup")
-
-parser.add_option("-C", "--clean-every-time",
-                  action="store_true", dest="clean_every_time", default=False,
-                  help="Clean before every build")
-
-parser.add_option("-k", "--keep-rebuilding",
-                  action="store_true", dest="keep_rebuilding", default=False,
-                  help="Rebuild even if there are no updates to svn")
-
-(options, args) = parser.parse_args()
-
-
-client = pysvn.Client()
-
-wc_path = r'@CMAKE_SOURCE_DIR@'
-
-def do_build(clean_):
-    if clean_:
-        clean = 'clean'
-    else:
-        clean = ''
-    if os.name == 'nt':
-        cmd = 'nmake /I ' + clean + ' slave-start test slave-finish'
-    else:
-        cmd = 'make -i ' + clean + ' slave-start test slave-finish'
-    print "Starting build:\n>>> ", cmd
-    os.system(cmd)
-    
-
-if options.build_first:
-    do_build(options.clean_first)
-
-while True:
-    try:
-        svn_entry = client.info(wc_path)
-
-        print "Wc has url %s rev %d.\nChecking for updates." \
-            % (svn_entry.url, svn_entry.revision.number)
-
-        ds = client.diff_summarize(url_or_path1=svn_entry.url,
-                                   revision1=pysvn.Revision(pysvn.opt_revision_kind.number, 
-                                                            svn_entry.revision.number),
-                                   url_or_path2=svn_entry.url,
-                                   revision2=pysvn.Revision(pysvn.opt_revision_kind.head)
-                                   )
-
-        if len(ds):
-            print "There are %d changesets:" % len(ds)
-            for j in ds:
-                print ">>>", j.path
-            print "Updating."
-            client.update(wc_path)
-        if len(ds) or options.keep_rebuilding:
-            do_build(options.clean_every_time)
-        else:
-            print "No updates."
-    except Exception, e:
-        print e
-        print "Error.  Will retry."
-    
-    print "Sleeping %d seconds" % @BOOST_BUILD_SLAVE_SLEEP_DURATION@
-    time.sleep(@BOOST_BUILD_SLAVE_SLEEP_DURATION@)
-
-        
-

Deleted: branches/release/tools/build/CMake/start.py.in
==============================================================================
--- branches/release/tools/build/CMake/start.py.in	2009-05-06 19:38:31 EDT (Wed, 06 May 2009)
+++ (empty file)
@@ -1,38 +0,0 @@
-#!/usr/bin/python
-#
-#  copyright (C) 2008  troy d. straszheim  <troy_at_[hidden]>
-#  
-#  Distributed under the Boost Software License, Version 1.0.
-#  See accompanying file LICENSE_1_0.txt or copy at
-#  http://www.boost.org/LICENSE_1_0.txt
-#
-
-#
-#  Start a new build, notify server via xmlrpc
-#
-
-import sys
-sys.path.append("@BOOST_BUILD_SLAVE_PYTHONPATH@")
-from boost_build_slave import *
-
-print 'Url:', svn_entry.url, "at rev", svn_entry.revision.number
-print 'FQDN:', fqdn
-print 'Uname:', uname
-print 'Toolset:', toolset
-
-print '\nNotifying %s of new build via XML-RPC' % xmlrpc_url
-s = xmlrpclib.Server(xmlrpc_url)
-
-build_id  = s.traash.start_build({ 'svn_url' : svn_entry.url,
-                                   'svn_rev' : svn_entry.revision.number,
-                                   'sysname' : uname[0],
-                                   'nodename' : uname[1],
-                                   'sys_release' : uname[2],
-                                   'sys_version' : uname[3],
-                                   'sys_machine' : uname[4],
-                                   'fqdn' : fqdn,
-                                   'toolset' : toolset,
-                                   'contact' : contact_info,
-                                   'details' : details() })
-
-set_build_id(build_id)