From: jmoeller_at_[hidden]
Date: 2007-06-29 21:25:08
Author: jmoeller
Date: 2007-06-29 21:25:08 EDT (Fri, 29 Jun 2007)
New Revision: 7318
URL: http://svn.boost.org/trac/boost/changeset/7318
Log:
Got project-root.jam working for module build
Added requirements to build.jam
Had to disable auto-linking for now; module build doesn't annotate lib names
Added:
sandbox/langbinding/project-root.jam (contents, props changed)
Removed:
sandbox/langbinding/libs/langbinding/build/Jamfile
sandbox/langbinding/libs/langbinding/build/Jamfile.v2
Text files modified:
sandbox/langbinding/boost/langbinding/aux_/config.hpp | 22 +++++++++++-----------
sandbox/langbinding/build.jam | 19 +++++++++++++++++++
2 files changed, 30 insertions(+), 11 deletions(-)
Modified: sandbox/langbinding/boost/langbinding/aux_/config.hpp
==============================================================================
--- sandbox/langbinding/boost/langbinding/aux_/config.hpp (original)
+++ sandbox/langbinding/boost/langbinding/aux_/config.hpp 2007-06-29 21:25:08 EDT (Fri, 29 Jun 2007)
@@ -32,27 +32,27 @@
//
// Automatically link to the correct build variant where possible.
//
-#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_LANGBINDING_NO_LIB) && !defined(BOOST_WHATEVER_SOURCE)
+//#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_LANGBINDING_NO_LIB) && !defined(BOOST_WHATEVER_SOURCE)
//
// Tell the autolink to link dynamically, this will get undef'ed by auto_link.hpp
// once it's done with it:
//
-#if defined(BOOST_LANGBINDING_DYNAMIC_LIB)
-# define BOOST_DYN_LINK
-#endif
+//#if defined(BOOST_LANGBINDING_DYNAMIC_LIB)
+//# define BOOST_DYN_LINK
+//#endif
//
// Set the name of our library, this will get undef'ed by auto_link.hpp
// once it's done with it:
//
-#if defined(BOOST_LANGBINDING_LIB_NAME)
-# define BOOST_LIB_NAME BOOST_LANGBINDING_LIB_NAME
-#else
-# define BOOST_LIB_NAME boost_langbinding
-#endif
+//#if defined(BOOST_LANGBINDING_LIB_NAME)
+//# define BOOST_LIB_NAME BOOST_LANGBINDING_LIB_NAME
+//#else
+//# define BOOST_LIB_NAME boost_langbinding
+//#endif
//
// And include the header that does the work:
//
-#include <boost/config/auto_link.hpp>
-#endif // auto-linking disabled
+//#include <boost/config/auto_link.hpp>
+//#endif // auto-linking disabled
#endif // CONFIG_DWA2004918_HPP
Modified: sandbox/langbinding/build.jam
==============================================================================
--- sandbox/langbinding/build.jam (original)
+++ sandbox/langbinding/build.jam 2007-06-29 21:25:08 EDT (Fri, 29 Jun 2007)
@@ -26,3 +26,22 @@
{
use-project /boost : $(BOOST) ;
}
+
+SOURCES =
+ backend/plugin
+ backend/call_xxx_data
+ classes/inheritance
+ converter/registry
+ module/id
+ ;
+
+lib boost_langbinding
+ : $(SOURCES).cpp
+ : <define>BOOST_LANGBINDING_SOURCE
+ <link>shared:<define>BOOST_LANGBINDING_DYNAMIC_LIB=1
+ <link>static:<define>BOOST_LANGBINDING_STATIC_LIB=1
+ <include>$(boost-root)
+ <include>.
+
+ : debug release <link>static <link>shared
+ ;
Deleted: sandbox/langbinding/libs/langbinding/build/Jamfile
==============================================================================
--- sandbox/langbinding/libs/langbinding/build/Jamfile 2007-06-29 21:25:08 EDT (Fri, 29 Jun 2007)
+++ (empty file)
@@ -1,20 +0,0 @@
-# declare the location of this subproject relative to the root
-subproject libs/langbinding/build ;
-
-sources =
- ../src/backend/plugin.cpp
- ../src/backend/call_xxx_data.cpp
- ../src/classes/inheritance.cpp
- ../src/converter/registry.cpp
- ../src/module/id.cpp
- ;
-
-dll langbinding
- : $(sources)
- : <sysinclude>$(BOOST_ROOT)
- ;
-
-lib langbinding
- : $(sources)
- : <sysinclude>$(BOOST_ROOT)
- ;
Deleted: sandbox/langbinding/libs/langbinding/build/Jamfile.v2
==============================================================================
--- sandbox/langbinding/libs/langbinding/build/Jamfile.v2 2007-06-29 21:25:08 EDT (Fri, 29 Jun 2007)
+++ (empty file)
@@ -1,28 +0,0 @@
-# (C) Copyright John H. Moeller 2007
-# Use, modification and distribution are subject to the
-# Boost Software License, Version 1.0. (See accompanying file
-# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-project boost/langbinding
- : source-location ../src
- : requirements
- <define>BOOST_LANGBINDING_SOURCE
- <link>shared:<define>BOOST_LANGBINDING_DYNAMIC_LIB=1
- <link>static:<define>BOOST_LANGBINDING_STATIC_LIB=1
- : # default build
- : usage-requirements
- <link>shared:<define>BOOST_LANGBINDING_DYNAMIC_LIB=1
- <link>static:<define>BOOST_LANGBINDING_STATIC_LIB=1
- ;
-
-SOURCES =
- backend/plugin
- backend/call_xxx_data
- classes/inheritance
- converter/registry
- module/id
- ;
-
-lib boost_langbinding
- : $(SOURCES).cpp
- ;
Added: sandbox/langbinding/project-root.jam
==============================================================================
--- (empty file)
+++ sandbox/langbinding/project-root.jam 2007-06-29 21:25:08 EDT (Fri, 29 Jun 2007)
@@ -0,0 +1,59 @@
+#
+# Copyright (c) 2006 João Abecasis
+#
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#
+
+##
+## IMPORTANT NOTE: This file MUST NOT be copied over a boost installation
+##
+
+path-constant top : . ;
+
+import modules ;
+import path ;
+
+local boost-root = [ modules.peek : BOOST_ROOT ] ;
+
+if ! $(boost-root)
+{
+ local boost-search-dirs = [ modules.peek : BOOST_BUILD_PATH ] ;
+
+ for local dir in $(boost-search-dirs)
+ {
+ if [ path.glob $(dir)/../../../ : boost/version.hpp ]
+ {
+ boost-root += $(dir)/../../../ ;
+ }
+ }
+
+ if $(boost-root)
+ {
+ boost-root = [ path.make $(boost-root[1]) ] ;
+ }
+ else
+ {
+ ECHO "Warning: couldn't find BOOST_ROOT in" $(boost-root) ;
+ }
+}
+
+#use-project /boost/unit_test : $(boost-root)/libs/test/build ;
+
+project langbinding
+ : source-location libs/langbinding/src
+ :
+ : build-dir bin.v2
+ : usage-requirements
+ <link>shared:<define>BOOST_LANGBINDING_DYNAMIC_LIB=1
+ <link>static:<define>BOOST_LANGBINDING_STATIC_LIB=1
+ ;
+
+
+
+
+
+
+
+