This commit was manufactured by cvs2svn to create tag

'merged_to_RC_1_34_0'.

[SVN r37938]

example/Jamfile

@@ -1,6 +1,5 @@
-# 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)
+# Copyright David Abrahams 2003. See accompanying LICENSE for terms
+# and conditions of use.
 
 # This is the top of our own project tree
 project-root ;

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 ;
+

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.
-

example/boost-build.jam

@@ -2,6 +2,6 @@
 # Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-# Edit this path to point at the tools/build/v1 subdirectory of your
+# Edit this path to point at the tools/build/v2 subdirectory of your
 # Boost installation.  Absolute paths work, too.
-boost-build ../../../tools/build/v1 ;
+boost-build ../../../tools/build/v2 ;

example/tutorial/Jamroot

@@ -0,0 +1,18 @@
+# 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 a Python extension called hello.
+python-extension hello : hello.cpp ;
+