Skip to content

Commit d9b4ada

Browse files
BemanBeman
committed
Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41370]
1 parent f5df393 commit d9b4ada

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2762
-1629
lines changed

‎build/Jamfile.v2‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ if ! [ python.configured ] && ! ( --without-python in [ modules.peek : ARGV ] )
2222
}
2323
}
2424

25-
if [ python.configured ] {
26-
2725
project boost/python
28-
: source-location ../src
29-
;
26+
: source-location ../src
27+
;
28+
29+
rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
30+
rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
3031

3132
lib boost_python
3233
: # sources
@@ -58,6 +59,7 @@ lib boost_python
5859
wrapper.cpp
5960
import.cpp
6061
exec.cpp
62+
object/function_doc_signature.cpp
6163
: # requirements
6264
<link>static:<define>BOOST_PYTHON_STATIC_LIB
6365
<define>BOOST_PYTHON_SOURCE
@@ -74,19 +76,19 @@ lib boost_python
7476
# python_for_extensions is a target defined by Boost.Build to
7577
# provide the Python include paths, and on Windows, the Python
7678
# import library, as usage requirements.
77-
<library>/python//python_for_extensions
78-
79+
[ cond [ python.configured ] : <library>/python//python_for_extensions ]
80+
81+
# we prevent building when there is no python available
82+
# as it's not possible anyway, and to cause dependents to
83+
# fail to build
84+
[ unless [ python.configured ] : <build>no ]
85+
7986
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
80-
8187
: # default build
8288
<link>shared
8389
: # usage requirements
8490
<link>static:<define>BOOST_PYTHON_STATIC_LIB
8591
<python-debugging>on:<define>BOOST_DEBUG_PYTHON
8692
;
87-
}
88-
else
89-
{
90-
ECHO "warning: Python location is not configured" ;
91-
ECHO "warning: the Boost.Python library won't be built" ;
92-
}
93+
94+
boost-install boost_python ;

‎doc/building.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ <h1><a class="toc-backref" href="#id42">10&nbsp;&nbsp;&nbsp;Notes for MinGW (and
620620
Windows, the debugging version of Python is generated by
621621
the &quot;Win32 Debug&quot; target of the Visual Studio project in the
622622
PCBuild subdirectory of a full Python source code distribution.
623-
You may also find</td></tr>
623+
</td></tr>
624624
</tbody>
625625
</table>
626626
</div>

‎doc/building.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,4 +678,3 @@ __ http://www.python.org/doc/current/inst/index.html
678678
Windows, the debugging version of Python is generated by
679679
the "Win32 Debug" target of the Visual Studio project in the
680680
PCBuild subdirectory of a full Python source code distribution.
681-
You may also find

‎doc/news.html‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,43 @@ <h2 align="center">News/Change Log</h2>
3232
<hr>
3333

3434
<dl class="page-index">
35-
<dt>Current CVS</dt>
35+
<dt>Current SVN</dt>
36+
37+
<dd>
38+
<ul>
39+
<li>Pythonic signatures are now automatically appended to the
40+
docstrings.
41+
42+
<li>Use <a href="v2/docstring_options.html"
43+
><code>docstring_options.hpp</code></a> header
44+
control the content of docstrings.
45+
46+
<li>This new feature increases the size of the modules by about 14%.
47+
If this is not acceptable it can be turned off by defining the macro
48+
BOOST_PYTHON_NO_PY_SIGNATURES. Modules compiled with and without the macro
49+
defined are compatible.
50+
</li>
51+
<li> If BOOST_PYTHON_NO_PY_SIGNATURES is undefined, this version defines the
52+
macro BOOST_PYTHON_SUPPORTS_PY_SIGNATURES. This allows writing code that will compile
53+
with older version of Boost.Python (see <a href="v2/pytype_function.html#examples">here</a>).
54+
</li>
55+
<li>By defining BOOST_PYTHON_PY_SIGNATURES_PROPER_INIT_SELF_TYPE, and at a cost
56+
of another 14% size increase, proper pythonic type is generated for the "self"
57+
parameter of the __init__ methods.
58+
</li>
59+
60+
<li> To support this new feature changes were made to the
61+
<a href="v2/to_python_converter.html"><code>to_python_converter.hpp</code></a>,
62+
<a href="v2/default_call_policies.html"><code>default_call_policies</code></a>,
63+
<a href="v2/ResultConverter.html"><code>ResultConverter</code></a>,
64+
<a href="v2/CallPolicies.html"><code>CallPolicies</code></a> and some others.
65+
Efforts were made not to have interface breaking changes.
66+
</li>
67+
68+
</ul>
69+
</dd>
70+
71+
<dt>12 May 2007 - 1.34.0 release</dt>
3672

3773
<dd>
3874
<ul>

‎doc/tutorial/doc/Jamfile.v2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ boostbook tutorial
1212
:
1313
<xsl:param>boost.root=../../../../../..
1414
<xsl:param>boost.libraries=../../../../../../libs/libraries.htm
15+
<xsl:param>html.stylesheet=../../../../../../doc/html/boostbook.css
1516
;

0 commit comments

Comments
 (0)