Skip to content

Commit 53c69e7

Browse files
dabrahamsdabrahams
committed
Merged from RC_1_28_0
[SVN r13944]
1 parent 3ff935d commit 53c69e7

File tree

16 files changed

+295
-906
lines changed

16 files changed

+295
-906
lines changed

‎build/Jamfile‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,12 @@ local CPP_SOURCES =
8989
;
9090

9191
lib boost_python_static : ../src/$(CPP_SOURCES).cpp
92-
# requirements
93-
: $(BOOST_PYTHON_INCLUDES)
92+
# requirements
93+
: $(BOOST_PYTHON_INCLUDES)
9494
<shared-linkable>true
95-
<define>BOOST_PYTHON_STATIC_LIB=1
96-
[ difference $(PYTHON_PROPERTIES) : <define>BOOST_PYTHON_DYNAMIC_LIB ]
95+
<define>BOOST_PYTHON_STATIC_LIB=1
96+
[ difference $(PYTHON_PROPERTIES) : <define>BOOST_PYTHON_DYNAMIC_LIB ]
97+
: <suppress>true # don't build this unless the user asks for it by name
9798
;
9899

99100
dll boost_python
@@ -106,6 +107,14 @@ dll boost_python
106107
$(PYTHON_PROPERTIES)
107108
;
108109

110+
stage bin-stage : <dll>boost_python
111+
:
112+
<tag><debug>"_debug"
113+
<tag><debug-python>"_pydebug"
114+
:
115+
debug release
116+
;
117+
109118
############# comprehensive module and test ###########
110119
bpl-test boost_python_test
111120
: ../test/comprehensive.cpp ;

‎build/__init__.py‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,20 @@
33

44
if ! $(gNO_PYTHON_INSTALL)
55
{
6-
ECHO "Couldn't find Python $(PYTHON_VERSION) installation in $(PYTHON_ROOT)" ;
6+
ECHO "---------------------------------------------------------------------" ;
77
ECHO skipping Boost.Python library build ;
88
ECHO You can configure the location of your python installation, by setting: ;
9-
ECHO PYTHON_ROOT - currently \"$(PYTHON_ROOT)\" ;
10-
ECHO PYTHON_VERSION - currently \"$(PYTHON_VERSION)\" ;
9+
ECHO "PYTHON_ROOT - currently" \"$(PYTHON_ROOT:J=" ")\" ;
10+
ECHO "PYTHON_VERSION - The 2-part python Major.Minor version number (e.g." ;
11+
ECHO " \"2.2\", NOT \"2.2.1\") - currently" \"$(PYTHON_VERSION)\" ;
1112
ECHO ;
12-
ECHO "The following are automatically configured from PYTHON_ROOT if not otherwise set" ;
13-
ECHO " PYTHON_INCLUDES - path to Python #include directories; currently" \"$(PYTHON_INCLUDES)\" ;
14-
ECHO " PYTHON_LIB_PATH - path to Python library; currently" \"$(PYTHON_LIB_PATH)\" ;
15-
ECHO " PYTHON_STDLIB_PATH - path to Python standard library modules; currently" \"$(PYTHON_STDLIB_PATH)\" ;
13+
ECHO "The following are automatically configured from PYTHON_ROOT if not" ;
14+
ECHO "otherwise set:" ;
15+
ECHO " PYTHON_INCLUDES - path to Python #include directories; currently" \"$(PYTHON_INCLUDES:J=" ")\" ;
16+
ECHO " PYTHON_LIB_PATH - path to Python library; currently" ;
17+
ECHO " " \"$(PYTHON_LIB_PATH:J=" ")\" ;
18+
ECHO " PYTHON_STDLIB_PATH - path to Python standard library modules; currently" ;
19+
ECHO " " \"$(PYTHON_STDLIB_PATH:J=" ")\" ;
20+
ECHO "---------------------------------------------------------------------" ;
1621
}
1722
gNO_PYTHON_INSTALL ?= true ;

‎build/example1/example1.dsp‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎build/getting_started1/getting_started1.dsp‎

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)