Skip to content

Commit 16d975b

Browse files
dabrahamsdabrahams
committed
Bringing forward BBv2/Python support and a few other things that were
obviously more up-to-date on the RC branch. Removed the Boost.Python v1 zip archive. [SVN r37346]
1 parent 4fc5caf commit 16d975b

File tree

6 files changed

+62
-47
lines changed

6 files changed

+62
-47
lines changed

‎build/Attic/python_v1.zip‎

-231 KB
Binary file not shown.

‎doc/building.html‎

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@ <h1 class="title"><a class="reference" href="../index.htm"><img alt="Boost C++ L
1818
<div class="contents sidebar small topic">
1919
<p class="topic-title first"><a id="contents" name="contents">Contents</a></p>
2020
<ul class="auto-toc simple">
21-
<li><a class="reference" href="#requirements" id="id17" name="id17">1&nbsp;&nbsp;&nbsp;Requirements</a></li>
22-
<li><a class="reference" href="#background" id="id18" name="id18">2&nbsp;&nbsp;&nbsp;Background</a></li>
23-
<li><a class="reference" href="#getting-boost-python-binaries" id="id19" name="id19">3&nbsp;&nbsp;&nbsp;Getting Boost.Python Binaries</a></li>
24-
<li><a class="reference" href="#choosing-a-boost-python-library-binary" id="id20" name="id20">4&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a><ul class="auto-toc">
25-
<li><a class="reference" href="#the-dynamic-binary" id="id21" name="id21">4.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></li>
26-
<li><a class="reference" href="#the-static-binary" id="id22" name="id22">4.2&nbsp;&nbsp;&nbsp;The Static Binary</a></li>
21+
<li><a class="reference" href="#requirements" id="id19" name="id19">1&nbsp;&nbsp;&nbsp;Requirements</a></li>
22+
<li><a class="reference" href="#background" id="id20" name="id20">2&nbsp;&nbsp;&nbsp;Background</a></li>
23+
<li><a class="reference" href="#getting-boost-python-binaries" id="id21" name="id21">3&nbsp;&nbsp;&nbsp;Getting Boost.Python Binaries</a></li>
24+
<li><a class="reference" href="#choosing-a-boost-python-library-binary" id="id22" name="id22">4&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a><ul class="auto-toc">
25+
<li><a class="reference" href="#the-dynamic-binary" id="id23" name="id23">4.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></li>
26+
<li><a class="reference" href="#the-static-binary" id="id24" name="id24">4.2&nbsp;&nbsp;&nbsp;The Static Binary</a></li>
2727
</ul>
2828
</li>
29-
<li><a class="reference" href="#configuring-boost-build" id="id23" name="id23">5&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a><ul class="auto-toc">
30-
<li><a class="reference" href="#the-basics" id="id24" name="id24">5.1&nbsp;&nbsp;&nbsp;The Basics</a></li>
31-
<li><a class="reference" href="#advanced-configuration" id="id25" name="id25">5.2&nbsp;&nbsp;&nbsp;Advanced Configuration</a></li>
32-
<li><a class="reference" href="#advanced-configuration-examples" id="id26" name="id26">5.3&nbsp;&nbsp;&nbsp;Advanced Configuration Examples</a></li>
29+
<li><a class="reference" href="#configuring-boost-build" id="id25" name="id25">5&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a><ul class="auto-toc">
30+
<li><a class="reference" href="#the-basics" id="id26" name="id26">5.1&nbsp;&nbsp;&nbsp;The Basics</a></li>
31+
<li><a class="reference" href="#advanced-configuration" id="id27" name="id27">5.2&nbsp;&nbsp;&nbsp;Advanced Configuration</a></li>
32+
<li><a class="reference" href="#advanced-configuration-examples" id="id28" name="id28">5.3&nbsp;&nbsp;&nbsp;Advanced Configuration Examples</a></li>
3333
</ul>
3434
</li>
3535
</ul>
3636
</div>
3737
<div class="section">
38-
<h1><a class="toc-backref" href="#id17" id="requirements" name="requirements">1&nbsp;&nbsp;&nbsp;Requirements</a></h1>
39-
<p>Boost.Python requires <a class="reference" href="http://www.python.org/2.2">Python 2.2</a><a class="footnote-reference" href="#id13" id="id2" name="id2"><sup>1</sup></a> <em>or</em> <a class="reference" href="http://www.python.org"><em>newer</em></a>.</p>
38+
<h1><a class="toc-backref" href="#id19" id="requirements" name="requirements">1&nbsp;&nbsp;&nbsp;Requirements</a></h1>
39+
<p>Boost.Python requires <a class="reference" href="http://www.python.org/2.2">Python 2.2</a><a class="footnote-reference" href="#id15" id="id2" name="id2"><sup>1</sup></a> <em>or</em> <a class="reference" href="http://www.python.org"><em>newer</em></a>.</p>
4040
</div>
4141
<div class="section">
42-
<h1><a class="toc-backref" href="#id18" id="background" name="background">2&nbsp;&nbsp;&nbsp;Background</a></h1>
42+
<h1><a class="toc-backref" href="#id20" id="background" name="background">2&nbsp;&nbsp;&nbsp;Background</a></h1>
4343
<p>There are two basic models for combining C++ and Python:</p>
4444
<ul class="simple">
4545
<li><a class="reference" href="http://www.python.org/doc/current/ext/intro.html">extending</a>, in which the end-user launches the Python interpreter
@@ -65,7 +65,7 @@ <h1><a class="toc-backref" href="#id18" id="background" name="background">2&nbsp
6565
modules or the executable containing <tt class="docutils literal"><span class="pre">main()</span></tt>.</p>
6666
</div>
6767
<div class="section">
68-
<h1><a class="toc-backref" href="#id19" id="getting-boost-python-binaries" name="getting-boost-python-binaries">3&nbsp;&nbsp;&nbsp;Getting Boost.Python Binaries</a></h1>
68+
<h1><a class="toc-backref" href="#id21" id="getting-boost-python-binaries" name="getting-boost-python-binaries">3&nbsp;&nbsp;&nbsp;Getting Boost.Python Binaries</a></h1>
6969
<p>Since Boost.Python is a separately-compiled (as opposed to
7070
<a class="reference" href="../../../more/getting_started/windows.html#header-only-libraries">header-only</a>) library, its user relies on the services of a
7171
Boost.Python library binary. The Boost <a class="reference" href="../../../more/getting_started/index.html">Getting Started Guide</a>
@@ -89,12 +89,12 @@ <h1><a class="toc-backref" href="#id19" id="getting-boost-python-binaries" name=
8989
</div>
9090
</div>
9191
<div class="section">
92-
<h1><a class="toc-backref" href="#id20" id="choosing-a-boost-python-library-binary" name="choosing-a-boost-python-library-binary">4&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a></h1>
92+
<h1><a class="toc-backref" href="#id22" id="choosing-a-boost-python-library-binary" name="choosing-a-boost-python-library-binary">4&nbsp;&nbsp;&nbsp;Choosing a Boost.Python Library Binary</a></h1>
9393
<p>The Boost.Python binary comes in both static and dynamic flavors.
9494
Take care to choose the right flavor for your
9595
application.<a class="footnote-reference" href="#naming" id="id5" name="id5"><sup>2</sup></a></p>
9696
<div class="section">
97-
<h2><a class="toc-backref" href="#id21" id="the-dynamic-binary" name="the-dynamic-binary">4.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></h2>
97+
<h2><a class="toc-backref" href="#id23" id="the-dynamic-binary" name="the-dynamic-binary">4.1&nbsp;&nbsp;&nbsp;The Dynamic Binary</a></h2>
9898
<p>The dynamic library is the safest and most-versatile choice:</p>
9999
<ul class="simple">
100100
<li>A single copy of the library code is used by all extension
@@ -106,7 +106,7 @@ <h2><a class="toc-backref" href="#id21" id="the-dynamic-binary" name="the-dynami
106106
</ul>
107107
</div>
108108
<div class="section">
109-
<h2><a class="toc-backref" href="#id22" id="the-static-binary" name="the-static-binary">4.2&nbsp;&nbsp;&nbsp;The Static Binary</a></h2>
109+
<h2><a class="toc-backref" href="#id24" id="the-static-binary" name="the-static-binary">4.2&nbsp;&nbsp;&nbsp;The Static Binary</a></h2>
110110
<p>It might be appropriate to use the static Boost.Python library in
111111
any of the following cases:</p>
112112
<ul class="simple">
@@ -129,34 +129,34 @@ <h2><a class="toc-backref" href="#id22" id="the-static-binary" name="the-static-
129129
</div>
130130
</div>
131131
<div class="section">
132-
<h1><a class="toc-backref" href="#id23" id="configuring-boost-build" name="configuring-boost-build">5&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a></h1>
132+
<h1><a class="toc-backref" href="#id25" id="configuring-boost-build" name="configuring-boost-build">5&nbsp;&nbsp;&nbsp;Configuring Boost.Build</a></h1>
133133
<p>As described in the <a class="reference" href="http://www.boost.orgdoc/html/bbv2/advanced.html#bbv2.advanced.configuration">Boost.Build reference manual</a>, a file called
134134
<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> in your home
135-
directory (<tt class="docutils literal"><span class="pre">%HOMEDRIVE%%HOMEPATH%</span></tt> on Windows) is used to
135+
directory<a class="footnote-reference" href="#home-dir" id="id7" name="id7"><sup>7</sup></a> is used to
136136
describe the build resources available to the build system. You'll
137137
need to tell it about your Python installation.</p>
138138
<div class="admonition-users-of-unix-variant-oses admonition">
139139
<p class="first admonition-title">Users of Unix-Variant OSes</p>
140140
<p class="last">If you are using a unix-variant OS and you ran Boost's
141141
<tt class="docutils literal"><span class="pre">configure</span></tt> script, it may have generated a
142-
<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> for you.<a class="footnote-reference" href="#overwrite" id="id8" name="id8"><sup>4</sup></a> If your <tt class="docutils literal"><span class="pre">configure</span></tt>/<tt class="docutils literal"><span class="pre">make</span></tt> sequence was successful and Boost.Python binaries
142+
<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> for you.<a class="footnote-reference" href="#overwrite" id="id9" name="id9"><sup>4</sup></a> If your <tt class="docutils literal"><span class="pre">configure</span></tt>/<tt class="docutils literal"><span class="pre">make</span></tt> sequence was successful and Boost.Python binaries
143143
were built, your <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file is probably already
144144
correct.</p>
145145
</div>
146146
<div class="section">
147-
<h2><a class="toc-backref" href="#id24" id="the-basics" name="the-basics">5.1&nbsp;&nbsp;&nbsp;The Basics</a></h2>
147+
<h2><a class="toc-backref" href="#id26" id="the-basics" name="the-basics">5.1&nbsp;&nbsp;&nbsp;The Basics</a></h2>
148148
<p>If you have a fairly “standard” python installation for your
149149
platform, there's very little you need to do to describe it.
150-
Simply adding</p>
150+
Simply having</p>
151151
<pre class="literal-block">
152152
import toolset : using ;
153153
using python ;
154154
</pre>
155-
<p>to a <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file in your home directory<a class="footnote-reference" href="#home-dir" id="id9" name="id9"><sup>6</sup></a>
156-
should be enough.</p>
155+
<p>in a <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file in your home directory<a class="footnote-reference" href="#home-dir" id="id10" name="id10"><sup>7</sup></a>
156+
should be enough.<a class="footnote-reference" href="#user-config-jam" id="id11" name="id11"><sup>6</sup></a></p>
157157
</div>
158158
<div class="section">
159-
<h2><a class="toc-backref" href="#id25" id="advanced-configuration" name="advanced-configuration">5.2&nbsp;&nbsp;&nbsp;Advanced Configuration</a></h2>
159+
<h2><a class="toc-backref" href="#id27" id="advanced-configuration" name="advanced-configuration">5.2&nbsp;&nbsp;&nbsp;Advanced Configuration</a></h2>
160160
<p>On the other hand, if you have several versions of Python
161161
installed, or Python is installed in an unusual way, you may want
162162
to supply any or all of the following optional parameters to
@@ -194,7 +194,7 @@ <h2><a class="toc-backref" href="#id25" id="advanced-configuration" name="advanc
194194
</dl>
195195
</div>
196196
<div class="section">
197-
<h2><a class="toc-backref" href="#id26" id="advanced-configuration-examples" name="advanced-configuration-examples">5.3&nbsp;&nbsp;&nbsp;Advanced Configuration Examples</a></h2>
197+
<h2><a class="toc-backref" href="#id28" id="advanced-configuration-examples" name="advanced-configuration-examples">5.3&nbsp;&nbsp;&nbsp;Advanced Configuration Examples</a></h2>
198198
<p>Note that in the examples below, case and <em>especially whitespace</em> are
199199
significant.</p>
200200
<ul>
@@ -233,7 +233,7 @@ <h2><a class="toc-backref" href="#id26" id="advanced-configuration-examples" nam
233233
</pre>
234234
</li>
235235
<li><p class="first">You can set up your user-config.jam so a bjam built under Windows
236-
can build/test both windows and cygwin python extensions. Just pass
236+
can build/test both Windows and <a class="reference" href="http://cygwin.com">Cygwin</a> python extensions. Just pass
237237
<tt class="docutils literal"><span class="pre">&lt;target-os&gt;cygwin</span></tt> in the <tt class="docutils literal"><span class="pre">condition</span></tt> parameter
238238
for the cygwin python installation:</p>
239239
<pre class="literal-block">
@@ -244,12 +244,12 @@ <h2><a class="toc-backref" href="#id26" id="advanced-configuration-examples" nam
244244
using python : : c:\\cygwin\\bin\\python2.5 : : : &lt;target-os&gt;cygwin ;
245245
</pre>
246246
<p>when you put target-os=cygwin in your build request, it should build
247-
with the cygwin version of python:<a class="footnote-reference" href="#flavor" id="id11" name="id11"><sup>5</sup></a></p>
247+
with the cygwin version of python:<a class="footnote-reference" href="#flavor" id="id13" name="id13"><sup>5</sup></a></p>
248248
<blockquote>
249249
<p>bjam target-os=cygwin toolset=gcc</p>
250250
</blockquote>
251251
<p>This is supposed to work the other way, too (targeting windows
252-
python with a cygwin bjam) but it seems as though the support in
252+
python with a <a class="reference" href="http://cygwin.com">Cygwin</a> bjam) but it seems as though the support in
253253
Boost.Build's toolsets for building that way is broken at the
254254
time of this writing.</p>
255255
</li>
@@ -271,10 +271,10 @@ <h2><a class="toc-backref" href="#id26" id="advanced-configuration-examples" nam
271271
</li>
272272
</ul>
273273
<hr class="docutils" />
274-
<table class="docutils footnote" frame="void" id="id13" rules="none">
274+
<table class="docutils footnote" frame="void" id="id15" rules="none">
275275
<colgroup><col class="label" /><col /></colgroup>
276276
<tbody valign="top">
277-
<tr><td class="label"><a class="fn-backref" href="#id2" name="id13">[1]</a></td><td>Note that although we tested earlier versions of
277+
<tr><td class="label"><a class="fn-backref" href="#id2" name="id15">[1]</a></td><td>Note that although we tested earlier versions of
278278
Boost.Python with Python 2.2, and we don't <em>think</em> we've done
279279
anything to break compatibility, this release of Boost.Python
280280
may not have been tested with versions of Python earlier than
@@ -317,26 +317,32 @@ <h2><a class="toc-backref" href="#id26" id="advanced-configuration-examples" nam
317317
<table class="docutils footnote" frame="void" id="overwrite" rules="none">
318318
<colgroup><col class="label" /><col /></colgroup>
319319
<tbody valign="top">
320-
<tr><td class="label"><a class="fn-backref" href="#id8" name="overwrite">[4]</a></td><td><tt class="docutils literal"><span class="pre">configure</span></tt> overwrites the existing
320+
<tr><td class="label"><a class="fn-backref" href="#id9" name="overwrite">[4]</a></td><td><tt class="docutils literal"><span class="pre">configure</span></tt> overwrites the existing
321321
<tt class="docutils literal"><span class="pre">user-config.jam</span></tt> in your home directory
322322
(if any) after making a backup of the old version.</td></tr>
323323
</tbody>
324324
</table>
325325
<table class="docutils footnote" frame="void" id="flavor" rules="none">
326326
<colgroup><col class="label" /><col /></colgroup>
327327
<tbody valign="top">
328-
<tr><td class="label"><a class="fn-backref" href="#id11" name="flavor">[5]</a></td><td>Note that the <tt class="docutils literal"><span class="pre">&lt;target-os&gt;cygwin</span></tt> feature is
328+
<tr><td class="label"><a class="fn-backref" href="#id13" name="flavor">[5]</a></td><td>Note that the <tt class="docutils literal"><span class="pre">&lt;target-os&gt;cygwin</span></tt> feature is
329329
different from the <tt class="docutils literal"><span class="pre">&lt;flavor&gt;cygwin</span></tt> subfeature of the <tt class="docutils literal"><span class="pre">gcc</span></tt>
330330
toolset, and you might need handle both explicitly if you also
331331
have a MinGW GCC installed.</td></tr>
332332
</tbody>
333333
</table>
334+
<table class="docutils footnote" frame="void" id="user-config-jam" rules="none">
335+
<colgroup><col class="label" /><col /></colgroup>
336+
<tbody valign="top">
337+
<tr><td class="label"><a class="fn-backref" href="#id11" name="user-config-jam">[6]</a></td><td>Create the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file if you don't
338+
already have one.</td></tr>
339+
</tbody>
340+
</table>
334341
<table class="docutils footnote" frame="void" id="home-dir" rules="none">
335342
<colgroup><col class="label" /><col /></colgroup>
336343
<tbody valign="top">
337-
<tr><td class="label"><a class="fn-backref" href="#id9" name="home-dir">[6]</a></td><td><p class="first">Create the <tt class="docutils literal"><span class="pre">user-config.jam</span></tt> file if you don't
338-
already have one. For Windows users, the home directory can
339-
be found by typing:</p>
344+
<tr><td class="label"><a name="home-dir">[7]</a></td><td><em>(<a class="fn-backref" href="#id7">1</a>, <a class="fn-backref" href="#id10">2</a>)</em> <p>Windows users, your home directory can be
345+
found by typing:</p>
340346
<pre class="literal-block">
341347
ECHO %HOMEDRIVE%%HOMEPATH%
342348
</pre>
@@ -350,7 +356,7 @@ <h2><a class="toc-backref" href="#id26" id="advanced-configuration-examples" nam
350356
<div class="footer">
351357
<hr class="footer" />
352358
<a class="reference" href="./building.rst">View document source</a>.
353-
Generated on: 2007-04-02 05:13 UTC.
359+
Generated on: 2007-04-02 16:27 UTC.
354360
Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
355361

356362
</div>

‎doc/building.rst‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Configuring Boost.Build
141141

142142
As described in the `Boost.Build reference manual`__, a file called
143143
``user-config.jam`` in your home
144-
directory (``%HOMEDRIVE%%HOMEPATH%`` on Windows) is used to
144+
directory [#home-dir]_ is used to
145145
describe the build resources available to the build system. You'll
146146
need to tell it about your Python installation.
147147

@@ -161,14 +161,14 @@ The Basics
161161

162162
If you have a fairly “standard” python installation for your
163163
platform, there's very little you need to do to describe it.
164-
Simply adding ::
164+
Simply having ::
165165

166166
167-
import toolset : using ;
167+
import toolset : using ;
168168
using python ;
169169

170-
to a ``user-config.jam`` file in your home directory [#home-dir]_
171-
should be enough.
170+
in a ``user-config.jam`` file in your home directory [#home-dir]_
171+
should be enough. [#user-config.jam]_
172172

173173
Advanced Configuration
174174
----------------------
@@ -254,7 +254,7 @@ significant.
254254
;
255255

256256
- You can set up your user-config.jam so a bjam built under Windows
257-
can build/test both windows and cygwin python extensions. Just pass
257+
can build/test both Windows and Cygwin_ python extensions. Just pass
258258
``<target-os>cygwin`` in the ``condition`` parameter
259259
for the cygwin python installation::
260260

@@ -270,7 +270,7 @@ significant.
270270
bjam target-os=cygwin toolset=gcc
271271

272272
This is supposed to work the other way, too (targeting windows
273-
python with a cygwin bjam) but it seems as though the support in
273+
python with a Cygwin_ bjam) but it seems as though the support in
274274
Boost.Build's toolsets for building that way is broken at the
275275
time of this writing.
276276

@@ -289,6 +289,8 @@ significant.
289289

290290
bjam target-os=cygwin/python=2.4
291291

292+
.. _Cygwin: http://cygwin.com
293+
292294
__ http://zigzag.cs.msu.su/boost.build/wiki/AlternativeSelection
293295

294296
-----------------------------
@@ -335,8 +337,10 @@ __ http://zigzag.cs.msu.su/boost.build/wiki/AlternativeSelection
335337
toolset, and you might need handle both explicitly if you also
336338
have a MinGW GCC installed.
337339
338-
.. [#home-dir] Create the ``user-config.jam`` file if you don't
339-
already have one. Windows users, your home directory can be
340+
.. [#user-config.jam] Create the ``user-config.jam`` file if you don't
341+
already have one.
342+
343+
.. [#home-dir] Windows users, your home directory can be
340344
found by typing::
341345
342346
ECHO %HOMEDRIVE%%HOMEPATH%

‎doc/v2/opaque.html‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
22

3+
<!-- Copyright 2003..2006 Haufe Mediengruppe. Distributed under the Boost -->
4+
<!-- Software License, Version 1.0. (See accompanying -->
5+
<!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -->
6+
37
<html>
48
<head>
59
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

‎example/Jamroot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ run-test test3 : std_pair_ext test_std_pair.py ;
3535
# A target that runs all the tests
3636
alias test : test1 test2 test3 ;
3737

38-
# Don't run tests by default
38+
# Only run tests when explicitly requested
3939
explicit test test1 test2 test3 ;
4040

‎test/callbacks.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <boost/python/reference_existing_object.hpp>
1313
#include <boost/python/call.hpp>
1414
#include <boost/python/object.hpp>
15+
#define BOOST_ENABLE_ASSERT_HANDLER
1516
#include <boost/assert.hpp>
1617

1718
using namespace boost::python;

0 commit comments

Comments
 (0)