Subject: [Boost-commit] svn:boost r85888 - in trunk: . libs/geometry/index/example libs/numeric/odeint/examples/vexcl libs/parameter/doc libs/parameter/doc/html libs/python/example libs/python/example/quickstart libs/python/example/tutorial libs/signals2/example libs/spirit/example/qi/json/build libs/units/test tools tools/regression/build
From: ghost_at_[hidden]
Date: 2013-09-25 04:32:03
Author: vladimir_prus
Date: 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013)
New Revision: 85888
URL: http://svn.boost.org/trac/boost/changeset/85888
Log:
Undo previous commit, it was meant for another branch
Text files modified:
trunk/Jamroot | 26 +-------------------------
trunk/libs/geometry/index/example/Jamfile.v2 | 2 +-
trunk/libs/numeric/odeint/examples/vexcl/Jamfile.v2 | 2 +-
trunk/libs/parameter/doc/html/index.html | 2 +-
trunk/libs/parameter/doc/index.rst | 2 +-
trunk/libs/python/example/Jamroot | 5 +----
trunk/libs/python/example/quickstart/Jamroot | 2 --
trunk/libs/python/example/tutorial/Jamroot | 5 +----
trunk/libs/signals2/example/Jamfile.v2 | 2 +-
trunk/libs/spirit/example/qi/json/build/Jamfile | 4 ++--
trunk/libs/units/test/Jamfile.v2 | 2 +-
trunk/tools/Jamfile.v2 | 3 ---
trunk/tools/regression/build/Jamroot.jam | 10 +++++-----
13 files changed, 16 insertions(+), 51 deletions(-)
Modified: trunk/Jamroot
==============================================================================
--- trunk/Jamroot Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/Jamroot 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -128,7 +128,6 @@
import xsltproc ;
import set ;
import path ;
-import link ;
path-constant BOOST_ROOT : . ;
constant BOOST_VERSION : 1.55.0 ;
@@ -136,29 +135,6 @@
boostcpp.set-version $(BOOST_VERSION) ;
-
-local all-headers =
- [ MATCH .*libs/(.*)/include/boost : [ glob libs/*/include/boost ] ] ;
-
-for dir in $(all-headers)
-{
- link-directory $(dir)-headers : libs/$(dir)/include/boost : <location>. ;
-}
-
-local numeric-headers =
- [ MATCH .*libs/numeric/(.*)/include/boost : [ glob libs/*/*/include/boost ] ] ;
-
-for dir in $(numeric-headers)
-{
- link-directory numeric-$(dir)-headers : libs/numeric/$(dir)/include/boost : <location>. ;
-}
-
-BOOST_MODULARLAYOUT = $(all-headers) $(numeric-headers) ;
-if $(BOOST_MODULARLAYOUT)
-{
- echo modularized layout build ;
-}
-
project boost
: requirements <include>.
# Disable auto-linking for all targets here, primarily because it caused
@@ -234,7 +210,7 @@
}
}
-alias headers : $(all-headers)-headers numeric-$(numeric-headers)-headers : : : <include>. ;
+alias headers : : : : <include>. ;
explicit headers ;
# Make project ids of all libraries known.
Modified: trunk/libs/geometry/index/example/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/index/example/Jamfile.v2 Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/geometry/index/example/Jamfile.v2 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -18,7 +18,7 @@
project boost-geometry-index-example
: requirements
- <implicit-dependency>/boost//headers
+ <source>/boost//headers
;
local GLUT_ROOT = [ os.environ GLUT_ROOT ] ;
Modified: trunk/libs/numeric/odeint/examples/vexcl/Jamfile.v2
==============================================================================
--- trunk/libs/numeric/odeint/examples/vexcl/Jamfile.v2 Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/numeric/odeint/examples/vexcl/Jamfile.v2 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -21,7 +21,7 @@
lib opencl : : <name>OpenCL ;
project : requirements
- <implicit-dependency>/boost//headers
+ <library>/boost//headers
<include>../../../../..
<include>$(VEXCL_INCLUDE)
<include>$(CUDA_INCLUDE)
Modified: trunk/libs/parameter/doc/html/index.html
==============================================================================
--- trunk/libs/parameter/doc/html/index.html Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/parameter/doc/html/index.html 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -37,7 +37,7 @@
</tbody>
</table>
<!-- @jam_prefix.append('''
-project test : requirements <include>. <implicit-dependency>/boost//headers ;''') -->
+project test : requirements <include>. <source>/boost//headers ;''') -->
<!-- @example.prepend('''
#include <boost/parameter.hpp>
Modified: trunk/libs/parameter/doc/index.rst
==============================================================================
--- trunk/libs/parameter/doc/index.rst Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/parameter/doc/index.rst 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -30,7 +30,7 @@
can be deduced from their types.
.. @jam_prefix.append('''
- project test : requirements <include>. <implicit-dependency>/boost//headers ;''')
+ project test : requirements <include>. <source>/boost//headers ;''')
.. @example.prepend('''
#include <boost/parameter.hpp>
Modified: trunk/libs/python/example/Jamroot
==============================================================================
--- trunk/libs/python/example/Jamroot Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/python/example/Jamroot 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -11,10 +11,7 @@
# boost_python library from the project whose global ID is
# /boost/python.
project
- : requirements <library>/boost/python//boost_python
- <implicit-dependency>/boost//headers
- : usage-requirements <implicit-dependency>/boost//headers
- ;
+ : requirements <library>/boost/python//boost_python ;
# Declare the three extension modules. You can specify multiple
# source files after the colon separated by spaces.
Modified: trunk/libs/python/example/quickstart/Jamroot
==============================================================================
--- trunk/libs/python/example/quickstart/Jamroot Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/python/example/quickstart/Jamroot 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -12,8 +12,6 @@
# /boost/python.
project boost-python-quickstart
: requirements <library>/boost/python//boost_python
- <implicit-dependency>/boost//headers
- : usage-requirements <implicit-dependency>/boost//headers
;
# Make the definition of the python-extension rule available
Modified: trunk/libs/python/example/tutorial/Jamroot
==============================================================================
--- trunk/libs/python/example/tutorial/Jamroot Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/python/example/tutorial/Jamroot 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -20,10 +20,7 @@
# boost_python library from the project whose global ID is
# /boost/python.
project
- : requirements <library>/boost/python//boost_python
- <implicit-dependency>/boost//headers
- : usage-requirements <implicit-dependency>/boost//headers
- ;
+ : requirements <library>/boost/python//boost_python ;
# Declare the three extension modules. You can specify multiple
# source files after the colon separated by spaces.
Modified: trunk/libs/signals2/example/Jamfile.v2
==============================================================================
--- trunk/libs/signals2/example/Jamfile.v2 Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/signals2/example/Jamfile.v2 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -8,7 +8,7 @@
# For more information, see http://www.boost.org
-project : requirements <implicit-dependency>/boost//headers ;
+project : requirements <source>/boost//headers ;
exe hello_world_slot : hello_world_slot.cpp ;
Modified: trunk/libs/spirit/example/qi/json/build/Jamfile
==============================================================================
--- trunk/libs/spirit/example/qi/json/build/Jamfile Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/spirit/example/qi/json/build/Jamfile 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -24,8 +24,8 @@
lib json
- : [ glob ../src/*.cpp ] :
- <implicit-dependency>/boost//headers
+ : [ glob ../src/*.cpp ]
+ /boost//headers
:
:
: <include>..
Modified: trunk/libs/units/test/Jamfile.v2
==============================================================================
--- trunk/libs/units/test/Jamfile.v2 Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/libs/units/test/Jamfile.v2 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -16,7 +16,7 @@
project boost/units/test :
requirements
- <implicit-dependency>/boost//headers
+ <source>/boost//headers
<include>../../..
<toolset>msvc:<asynch-exceptions>on
$(warning-compilers):$(warning-options)
Modified: trunk/tools/Jamfile.v2
==============================================================================
--- trunk/tools/Jamfile.v2 Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/tools/Jamfile.v2 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -12,9 +12,6 @@
:
requirements
<link>static
- <implicit-dependency>/boost//headers
- :
- usage-requirements <implicit-dependency>/boost//headers
;
use-project /boost/regression : regression/build ;
Modified: trunk/tools/regression/build/Jamroot.jam
==============================================================================
--- trunk/tools/regression/build/Jamroot.jam Wed Sep 25 04:26:46 2013 (r85887)
+++ trunk/tools/regression/build/Jamroot.jam 2013-09-25 04:32:03 EDT (Wed, 25 Sep 2013) (r85888)
@@ -37,7 +37,7 @@
:
<define>BOOST_ALL_NO_LIB=1
<define>_CRT_SECURE_NO_WARNINGS
- <implicit-dependency>/boost//headers
+ <use>/boost//headers
:
release
;
@@ -51,7 +51,7 @@
:
<define>BOOST_ALL_NO_LIB=1
<define>_CRT_SECURE_NO_WARNINGS
- <implicit-dependency>/boost//headers
+ <use>/boost//headers
:
release
;
@@ -64,7 +64,7 @@
/boost/filesystem//boost_filesystem/<link>static
:
<define>BOOST_ALL_NO_LIB=1
- <implicit-dependency>/boost//headers
+ <use>/boost//headers
:
release
;
@@ -77,7 +77,7 @@
/boost/filesystem//boost_filesystem/<link>static
:
<define>BOOST_ALL_NO_LIB=1
- <implicit-dependency>/boost//headers
+ <use>/boost//headers
:
release
;
@@ -94,7 +94,7 @@
/boost//iostreams/<link>static
:
<define>BOOST_ALL_NO_LIB=1
- <implicit-dependency>/boost//headers
+ <use>/boost//headers
:
release
;