Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17211/tools/build/v2/tools
Modified Files:
Tag: bbv2python
python.jam gcc.jam darwin.jam builtin.jam
Log Message:
python.jam
----------
* Removed comments about known problems because they make no sense.
* Unified MacOS initialization with NT and *nix
* Updated comment describing init behavior
* Support for passing Python command as first argument
* Removed unused get-python-interpreter and get-python-version rules,
since they can't work with that interface. Working versions of
these will be reinstated for Doug Gregor in the near future.
* When invoking Python to collect configuration info, collect it all at at once.
* When a Cygwin symlink is found by an NT build of bjam, give hints
about where to find the file it points at.
* Lots of refactoring
* Make the logic work plausibly even when no Python executable can be found
darwin.jam
----------
* Simplified logic for setting up FRAMEWORK_PATH
* Corrected logic for setting up -framework option
feature.jam
-----------
* Make feature.defaults, feature.attributes, feature.values, and
feature.get-values resilient to feature names being passed without
grist.
gcc.jam, python.jam, builtin.jam
--------------------------------
* Include some progress volodya has made toward support for
<suppress-import-lib>
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.33.2.1
retrieving revision 1.12.2.33.2.2
diff -u -d -r1.12.2.33.2.1 -r1.12.2.33.2.2
--- python.jam 8 Mar 2007 15:56:58 -0000 1.12.2.33.2.1
+++ python.jam 13 Mar 2007 22:12:04 -0000 1.12.2.33.2.2
@@ -15,12 +15,6 @@
#
# Extensions that use Boost.Python must explicitly link to it.
-# Known problems:
-# - the directory where extension is generated is different from V2
-# - the ext + py -> pyd_run_output generator is declared to take
-# SHARED_LIB, not PYTHON_EXTENSION. That's because we reuse
-# 'lib-target-class', which creates SHARED_LIB explicitly.
-
import type ;
import testing ;
[...989 lines suppressed...]
{
return $(.configured) ;
@@ -770,7 +827,7 @@
rule python-extension ( name : sources * : requirements * : default-build * :
usage-requirements * )
{
- requirements += <use>/python//python_for_extensions ;
+ requirements += <use>/python//python_for_extensions
<suppress-import-lib>true ;
local project = [ project.current ] ;
@@ -865,7 +922,7 @@
}
property-set = [ $(property-set).add-raw <dependency>$(other-pythons)
] ;
-
+
result = [ construct-result $(python) $(extensions) $(new-sources)
: $(project) $(name) : $(property-set) ] ;
}
Index: gcc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/gcc.jam,v
retrieving revision 1.63.2.20.2.3
retrieving revision 1.63.2.20.2.4
diff -u -d -r1.63.2.20.2.3 -r1.63.2.20.2.4
--- gcc.jam 10 Mar 2007 07:01:26 -0000 1.63.2.20.2.3
+++ gcc.jam 13 Mar 2007 22:12:05 -0000 1.63.2.20.2.4
@@ -442,7 +442,14 @@
# the target after the action sees it so that dependent
# targets don't try to link to both the import library and
# the DLL.
- return $(generated-targets[1-2]) ;
+ if [ $(property-set).get <suppress-import-lib> ] = true
+ {
+ return $(generated-targets[0]) $(generated-targets[-1]) ;
+ }
+ else
+ {
+ return $(generated-targets[1-2]) ;
+ }
}
}
}
Index: darwin.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/darwin.jam,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.6.2.1
diff -u -d -r1.18.2.6 -r1.18.2.6.2.1
--- darwin.jam 5 Nov 2006 07:24:37 -0000 1.18.2.6
+++ darwin.jam 13 Mar 2007 22:12:05 -0000 1.18.2.6.2.1
@@ -65,14 +65,7 @@
{
local framework-path = [ on $(target) return $(FRAMEWORK:D) ] ;
- if $(framework-path)
- {
- FRAMEWORK_PATH on $(target) += -F$(framework-path) ;
- }
- else
- {
- FRAMEWORK_PATH on $(target) = ;
- }
+ FRAMEWORK_PATH on $(target) += -F$(framework-path) ;
}
rule link
@@ -82,7 +75,7 @@
actions link bind LIBRARIES
{
- $(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)"
-l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH)
-framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
+ $(CONFIG_COMMAND) -L"$(LINKPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)"
-l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH)
-framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS)
$(NEED_STRIP)strip $(NEED_STRIP)"$(<)"
}
@@ -93,7 +86,7 @@
actions link.dll bind LIBRARIES
{
- $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)"
"$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH)
-framework$(_)$(FRAMEWORK:D=) $(OPTIONS) $(USER_OPTIONS)
+ $(CONFIG_COMMAND) -dynamiclib -L"$(LINKPATH)" -o "$(<)" "$(>)"
"$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST) $(FRAMEWORK_PATH)
-framework$(_)$(FRAMEWORK:D=:S=) $(OPTIONS) $(USER_OPTIONS)
}
actions piecemeal archive
Index: builtin.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/builtin.jam,v
retrieving revision 1.189.2.7.2.1
retrieving revision 1.189.2.7.2.2
diff -u -d -r1.189.2.7.2.1 -r1.189.2.7.2.2
--- builtin.jam 10 Mar 2007 06:46:24 -0000 1.189.2.7.2.1
+++ builtin.jam 13 Mar 2007 22:12:05 -0000 1.189.2.7.2.2
@@ -177,6 +177,8 @@
#provides means to specify def-file for windows dlls.
feature def-file : : free dependency ;
+feature.feature suppress-import-lib : false true : incidental ;
+
# This is internal feature which is used to store the name of
# bjam action to call when building a target.
feature.feature action : : free ;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
