diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index dbb16b09..e01a27b7 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -7,11 +7,28 @@ import modules ; import python ; +if ! [ python.configured ] && ! ( --without-python in [ modules.peek : ARGV ] ) +{ + # Attempt default configuration of python + import toolset : using ; + using python ; + + if ! [ python.configured ] + { + ECHO "WARNING: No python installation configured and autoconfiguration" ; + ECHO " failed. See http://www.boost.org/libs/python/doc/building.html" ; + ECHO " for configuration instructions or pass --without-python to" ; + ECHO " suppress this message and silently skip all Boost.Python targets" ; + } +} project boost/python : source-location ../src ; +rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } +rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } + lib boost_python : # sources numeric.cpp @@ -22,7 +39,6 @@ lib boost_python str.cpp slice.cpp - aix_init_module.cpp converter/from_python.cpp converter/registry.cpp converter/type_id.cpp @@ -60,11 +76,19 @@ lib boost_python # python_for_extensions is a target defined by Boost.Build to # provide the Python include paths, and on Windows, the Python # import library, as usage requirements. - /python//python_for_extensions - + [ cond [ python.configured ] : /python//python_for_extensions ] + + # we prevent building when there is no python available + # as it's not possible anyway, and to cause dependents to + # fail to build + [ unless [ python.configured ] : no ] + + on:BOOST_DEBUG_PYTHON : # default build shared : # usage requirements - static:BOOST_PYTHON_STATIC_LIB - shared:BOOST_PYTHON_DYNAMIC_LIB + static:BOOST_PYTHON_STATIC_LIB + on:BOOST_DEBUG_PYTHON ; + +boost-install boost_python ; diff --git a/doc/PyConDC_2003/bpl.html b/doc/PyConDC_2003/bpl.html old mode 100755 new mode 100644 diff --git a/doc/PyConDC_2003/bpl.pdf b/doc/PyConDC_2003/bpl.pdf old mode 100755 new mode 100644 diff --git a/doc/PyConDC_2003/python_cpp_mix.jpg b/doc/PyConDC_2003/python_cpp_mix.jpg old mode 100755 new mode 100644 diff --git a/doc/PyConDC_2003/python_cpp_mix.png b/doc/PyConDC_2003/python_cpp_mix.png old mode 100755 new mode 100644 diff --git a/doc/building.html b/doc/building.html index 94f39955..9e7e6711 100644 --- a/doc/building.html +++ b/doc/building.html @@ -9,60 +9,63 @@
-

Boost.Python Build and Test HOWTO

+

Boost.Python Build and Test HOWTO

-