From d8c3ff199eaca9603f912f75627ff2e43e004cdd Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Mon, 11 Dec 2006 03:35:10 +0000
Subject: [PATCH] Remove BBv1 for good

[SVN r36321]
---
 example/Jamfile         | 82 -----------------------------------------
 example/Jamfile.v2      | 36 ------------------
 example/Jamroot         | 40 ++++++++++++++++++++
 example/Jamrules        | 36 ------------------
 example/README          | 19 +++-------
 example/boost-build.jam |  2 +-
 6 files changed, 47 insertions(+), 168 deletions(-)
 delete mode 100644 example/Jamfile
 delete mode 100644 example/Jamfile.v2
 create mode 100755 example/Jamroot
 delete mode 100755 example/Jamrules

diff --git a/example/Jamfile b/example/Jamfile
deleted file mode 100644
index 24303a6b..00000000
--- a/example/Jamfile
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright David Abrahams 2003-2006. 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)
-
-# This is the top of our own project tree
-project-root ;
-
-# Declares the following targets:
-#    
-#  1. an extension module called "getting_started1", which is
-#     built from "getting_started1.cpp". Built by default
-#
-#  2. A test target called my-test.test which runs
-#     test_getting_started1.py with the extension module above. Built
-#     when out-of date, but only if invoked by name or if the global
-#     "test" target is invoked.
-#
-#  3. A test target called my-test.run wihch runs the above test
-#     unconditionally. Built only when invoked by name.
-#
-# To see verbose test output, add "-sPYTHON_TEST_ARGS=-v" to the bjam
-# command-line before the first target.
-#
-
-# Include definitions needed for Python modules
-import python ;
-
-# ----- getting_started1 -------
-
-# Declare a Python extension called getting_started1
-extension getting_started1
-: # sources
-  getting_started1.cpp
-  
-  # requirements and dependencies for Boost.Python extensions
-  <template>@boost/libs/python/build/extension
-  ;
-
-# Declare a test for the extension module
-boost-python-runtest test1
-    :  # Python test driver
-    test_getting_started1.py
-    # extension modules to use
-    <pyd>getting_started1 ;
-    
-
-    
-# ----- getting_started2 -------
-    
-# Declare a Python extension called getting_started2
-extension getting_started2
-:  # sources
-   getting_started2.cpp
-  
-  # requirements and dependencies for Boost.Python extensions
-  <template>@boost/libs/python/build/extension
-  ;
-
-# Declare a test for the extension module
-boost-python-runtest test2
-    :  # Python test driver
-    test_getting_started2.py
-    # extension modules to use
-    <pyd>getting_started2 ;    
-
-# ----- std_pair -------
-
-# Declare a Python extension called std_pair
-extension std_pair_ext
-: # sources
-  std_pair.cpp
-  
-  # requirements and dependencies for Boost.Python extensions
-  <template>@boost/libs/python/build/extension
-  ;
-
-# Declare a test for the extension module
-boost-python-runtest test3
-    :  # Python test driver
-    test_std_pair.py
-    # extension modules to use
-    <pyd>std_pair_ext ;
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
deleted file mode 100644
index a8e6e966..00000000
--- a/example/Jamfile.v2
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright David Abrahams 2006. 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)
-
-project : requirements <library>/boost/python//boost_python ;
-    
-python-extension getting_started1 : getting_started1.cpp ;
-
-bpl-test test1 
-    :  # Python test driver
-    test_getting_started1.py
-    # extension modules to use
-    getting_started1 ;
-
-
-python-extension getting_started2 : getting_started2.cpp ;
-
-bpl-test test2
-    :  # Python test driver
-    test_getting_started2.py
-    # extension modules to use
-    getting_started2 ;    
-
-python-extension std_pair : std_pair.cpp ;
-
-bpl-test test3
-    :  # Python test driver
-    test_std_pair.py
-    # extension modules to use
-    std_pair_ext ;
-    
-# Don't run tests by default
-explicit test1 test2 test3 ;
-alias test : test1 test2 test3 ;
-explicit test ;
-
diff --git a/example/Jamroot b/example/Jamroot
new file mode 100755
index 00000000..48c6e444
--- /dev/null
+++ b/example/Jamroot
@@ -0,0 +1,40 @@
+# Copyright David Abrahams 2006. 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)
+
+# Specify the path to the Boost project.  If you move this project,
+# adjust this path to refer to the Boost root directory.
+use-project boost 
+  : ../../.. ;
+
+# Set up the project-wide requirements that everything uses the
+# boost_python library from the project whose global ID is
+# /boost/python.
+project
+  : requirements <library>/boost/python//boost_python ;
+
+# Declare the three extension modules.  You can specify multiple
+# source files after the colon separated by spaces.
+python-extension getting_started1 : getting_started1.cpp ;
+python-extension getting_started2 : getting_started2.cpp ;
+python-extension std_pair_ext : std_pair.cpp ;
+
+# A little "rule" (function) to clean up the syntax of declaring tests
+# of these extension modules.
+local rule run-test ( test-name : sources + )
+{
+    import testing ;
+    testing.make-test run-pyd : $(sources) : : $(test-name) ;
+}
+
+# Declare test targets
+run-test test1 : getting_started1 test_getting_started1.py ;
+run-test test2 : getting_started2 test_getting_started2.py ;
+run-test test3 : std_pair_ext test_std_pair.py ;
+
+# A target that runs all the tests
+alias test : test1 test2 test3 ;
+
+# Don't run tests by default
+explicit test test1 test2 test3 ;
+
diff --git a/example/Jamrules b/example/Jamrules
deleted file mode 100755
index f9c1e3c3..00000000
--- a/example/Jamrules
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright David Abrahams 2003. See accompanying LICENSE for terms
-# and conditions of use.
-
-# If you move this example from its place in the Boost tree, edit this
-# path to point at the root directory of your Boost installation (the
-# one containing a subdirectory called "boost/" and a sub-subdirectory
-# "boost/python/" full of .hpp files).  Absolute paths work, too.
-#
-path-global BOOST_ROOT : ../../.. ;
-
-# Boost.Python configuration variables, as described in
-# http://www.boost.org/libs/python/doc/building.html#configuration.
-# Usually you don't need to set these; the defaults will work.  If you
-# do set them, try to change as few of them as possible, starting with
-# the first ones.
-
-  # PYTHON_VERSION = <the two-part Major.Minor version number, e.g. 2.2> ;
-  # PYTHON_ROOT = <root directory of your Python installation, e.g. /usr> ;
-  # PYTHON_INCLUDES = <path to Python #include directories> ;
-  # PYTHON_LIB_PATH = <path to Python library object> ;
-
-# You may need to configure your compiler toolset, especially if you
-# want to build with a compiler that is not the "system default" or if
-# it is installed in a nonstandard place; see
-# http://www.boost.org/more/getting_started.html#Configuring for
-# details.  
-
-# Makes a project id for boost so that other Boost.Build projects can
-# refer to it by name.
-#
-project boost : $(BOOST_ROOT) ;
-
-# Change this setting to have all your built products placed under a
-# single directory:
-#
-# ALL_LOCATE_TARGET = <root directory for all built products>
diff --git a/example/README b/example/README
index a9bd7941..29a94f67 100644
--- a/example/README
+++ b/example/README
@@ -3,21 +3,14 @@
 .. file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 To get started with the Boost Python Library, use the examples
-getting_started1.cpp and getting_started2.cpp.
+getting_started1.cpp and getting_started2.cpp.  Invoking
 
-    bjam -sTOOLS=your-toolset test
+    bjam --toolset=your-toolset test
 
-in this directory will build and run the examples.
-
-Other configuration variables may need to be set as described in
-http://www.boost.org/libs/python/doc/building.html.  These can be
-supplied by the environment, on the command-line with
-
-  -sVARIABLENAME=value
-
-or in the local Jamrules file.
+in this directory will build and run the examples.  See
+http://www.boost.org/more/getting_started.html for details about the
+--toolset= option.
 
 If you move this example from its place in the Boost development tree
-you'll need to edit at least one line in Jamrules and one line in
+you'll need to edit the two lines indicated in Jamroot and
 boost-build.jam.
-
diff --git a/example/boost-build.jam b/example/boost-build.jam
index 2075a00f..07cef684 100755
--- a/example/boost-build.jam
+++ b/example/boost-build.jam
@@ -4,4 +4,4 @@
 
 # Edit this path to point at the tools/build/v1 subdirectory of your
 # Boost installation.  Absolute paths work, too.
-boost-build ../../../tools/build/v1 ;
+boost-build ../../../tools/build/v2 ;