[Boost-commit] svn:boost r7077

From: matt_calabrese_at_[hidden]
Date: 2007-06-16 13:10:34

Author: matt_calabrese
Date: 2007-06-16 13:10:33 EDT (Sat, 16 Jun 2007)
New Revision: 7077
URL: http://svn.boost.org/trac/boost/changeset/7077

Log:

Added:
   sandbox/SOC/2006/concurrency/trunk/libs/act/test/project-root.jam
Properties modified: 
   sandbox/SOC/2006/concurrency/trunk/libs/act/test/   (props changed)
Text files modified: 
   sandbox/SOC/2006/concurrency/trunk/libs/act/test/Jamfile.v2 |     5 -----                                   
   1 files changed, 0 insertions(+), 5 deletions(-)

Modified: sandbox/SOC/2006/concurrency/trunk/libs/act/test/Jamfile.v2
==============================================================================
--- sandbox/SOC/2006/concurrency/trunk/libs/act/test/Jamfile.v2	(original)
+++ sandbox/SOC/2006/concurrency/trunk/libs/act/test/Jamfile.v2	2007-06-16 13:10:33 EDT (Sat, 16 Jun 2007)
@@ -7,11 +7,6 @@
 #==============================================================================
 
 import testing ;
-    
-project act
-    : requirements
-        <library>../../thread/build//boost_thread
-    ;
 
 {
     test-suite utility/binary

Added: sandbox/SOC/2006/concurrency/trunk/libs/act/test/project-root.jam
==============================================================================
--- (empty file)
+++ sandbox/SOC/2006/concurrency/trunk/libs/act/test/project-root.jam	2007-06-16 13:10:33 EDT (Sat, 16 Jun 2007)
@@ -0,0 +1,52 @@
+#
+#   Copyright (c) 2007 Matthew Calabrese
+#
+#   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)
+#
+
+##
+##  IMPORTANT NOTE: This file MUST NOT be copied over a boost installation
+##
+
+path-constant top : . ;
+
+import modules ;
+import path ;
+
+local boost-root = [ modules.peek : BOOST_ROOT ] ;
+local act-include = $(top)/../../.. ;
+
+if ! $(boost-root)
+{
+    local boost-search-dirs = [ modules.peek : BOOST_BUILD_PATH ] ;
+
+    for local dir in $(boost-search-dirs)
+    {
+        if [ path.glob $(dir)/../../../ : boost/version.hpp ]
+        {
+            boost-root += $(dir)/../../../ ;
+        }
+    }
+
+    if $(boost-root)
+    {
+        boost-root = [ path.make $(boost-root[1]) ] ;
+    }
+    else
+    {
+        ECHO "Warning: couldn't find BOOST_ROOT in" $(boost-root) ;
+    }
+}
+
+use-project /boost/unit_test : $(boost-root)/libs/test/build ;
+use-project /boost/boost_thread : $(boost-root)/libs/thread/build/ ;
+
+project act
+    : requirements
+        <include>$(boost-root)
+        <include>$(act-include)
+        <library>$(boost-root)/libs/thread/build
+    :   build-dir bin.v2
+    ;