Update of /cvsroot/boost/boost/tools/build/v2/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16771/tools/build/v2/tools
Modified Files:
Tag: RC_1_34_0
msvc.jam python.jam testing.jam
Log Message:
tools/build/v2/tools/python.jam:
* add ".lib" to the target name for libpython. *** This is a kluge!
I don't know why it should be necessary ***, but when I was
inserting debugging code that did
ECHO [ $(target).name ] ;
it would always drop the 2nd digit, e.g. python-2.4 would come out
as "python-2". This change prevented it.
* Fixed spelling and grammar in comments
* Fix the incorrect assumption in capture-output that only one Python
extension will participate (also in tools/build/v2/testing.jam).
Index: msvc.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/msvc.jam,v
retrieving revision 1.76.2.17
retrieving revision 1.76.2.18
diff -u -d -r1.76.2.17 -r1.76.2.18
--- msvc.jam 15 Mar 2007 04:02:23 -0000 1.76.2.17
+++ msvc.jam 17 Mar 2007 20:25:03 -0000 1.76.2.18
@@ -855,7 +855,7 @@
# Windows Manifests is a new way to specify dependencies
# on managed DotNet assemblies and Windows native DLLs. The
-# manifests are embedded as resourses and are useful in
+# manifests are embedded as resources and are useful in
# any PE targets (both DLL and EXE)
if [ os.name ] in NT
Index: python.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/python.jam,v
retrieving revision 1.12.2.38
retrieving revision 1.12.2.39
diff -u -d -r1.12.2.38 -r1.12.2.39
--- python.jam 16 Mar 2007 23:26:35 -0000 1.12.2.38
+++ python.jam 17 Mar 2007 20:25:03 -0000 1.12.2.39
@@ -633,7 +633,7 @@
# Compute the name of the target to declare
local libpython-target-name = python $(version) $(sys.platform) ;
- libpython-target-name = $(libpython-target-name:J=-) ;
+ libpython-target-name = $(libpython-target-name:J=-).lib ;
# Declare and return it
lib $(libpython-target-name) : : <name>python$(lib-version)
$(requirements) ;
@@ -884,10 +884,10 @@
type.register PYTHON_EXTENSION : : SHARED_LIB ;
-# We can't give "dll" suffix to PYTHON_EXTENSION, because
-# we would not know what "a.dll" is: python extenstion or
-# ordinary library. Therefore, we specify only suffixes
-# used for generation of targets.
+# We can't simply assign the "dll" or "so" suffix to PYTHON_EXTENSION,
+# because then we wouldn't know whether "x.dll" is a python extension
+# or an ordinary library. Therefore, we specify only the suffixes used
+# for target generation.
type.set-generated-target-suffix PYTHON_EXTENSION : : so ;
type.set-generated-target-suffix PYTHON_EXTENSION : <target-os>windows : pyd ;
type.set-generated-target-suffix PYTHON_EXTENSION : <target-os>cygwin : dll ;
@@ -982,12 +982,15 @@
local extension = [ generators.construct $(project) $(name) :
PYTHON_EXTENSION : $(property-set) : $(s) $(libs) ] ;
- # The important part of usage requirements returned from
- # PYTHON_EXTENSION genrator are xdll-path properties that
- # will allow to find python extension at runtime.
+ # The important part of usage requirements returned
+ # from PYTHON_EXTENSION generator are xdll-path
+ # properties that will allow us to find the python
+ # extension at runtime.
property-set = [ $(property-set).add $(extension[1]) ] ;
- # Ignore usage requirements. We're top-level generator and
- # nobody is going to use us.
+
+ # Ignore usage requirements. We're a top-level
+ # generator and nobody is going to use what we
+ # generate.
new-sources += $(extension[2-]) ;
}
}
@@ -1030,13 +1033,14 @@
# DLL. Only $(sources[1]) is passed to testing.capture-output,
# so RUN_PATH variable on $(sources[2]) is not consulted. Move it
# over explicitly.
- RUN_PATH on $(sources[1]) = [ on $(sources[2]) return $(RUN_PATH) ] ;
+ RUN_PATH on $(sources[1]) = [ on $(sources[2-]) return $(RUN_PATH) ] ;
+
+ PYTHONPATH = [ on $(sources[2-]) return $(LOCATE) $(SEARCH) ] ;
- PYTHONPATH = [ on $(sources[2]) return $(LOCATE) ] ;
# After test is run, we remove the Python module, but not the Python
# script.
testing.capture-output $(target) : $(sources[1]) : $(properties)
- : $(sources[2]) ;
+ : $(sources[2-]) ;
# PYTHONPATH is different; it will be interpreted by whichever
# Python is invoked and so must follow path rules for the target
Index: testing.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/tools/testing.jam,v
retrieving revision 1.44.2.10
retrieving revision 1.44.2.11
diff -u -d -r1.44.2.10 -r1.44.2.11
--- testing.jam 23 Jan 2007 20:51:39 -0000 1.44.2.10
+++ testing.jam 17 Mar 2007 20:25:04 -0000 1.44.2.11
@@ -354,7 +354,7 @@
# - if 'none', does not remove anything, ever
# - if empty, removes 'source'
# - if non-empty and not 'none', contains a list of sources to remove.
-rule capture-output ( target : source : properties * : targets-to-remove ? )
+rule capture-output ( target : source : properties * : targets-to-remove * )
{
output-file on $(target) = $(target:S=.output) ;
LOCATE on $(target:S=.output) = [ on $(target) return $(LOCATE) ] ;
-------------------------------------------------------------------------
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
