The following changelog and patch do three things:
1. Change to common naming scheme for libs
2. Common subdir for compiled libs
3. Test and date_time dll's suppressed for NT builds.
Would appreciate any and all feedback on this patch. Thanks.
Dale Hirt
Changelog:
----------
2003-08-14 17:40 pm Dale Hirt
# Common rules for libs rule boost-stage-tag ( toolset variant : properties * ) { local lib-debug-opt = "" ; if [ MATCH .*(debug).* : $(variant) ] { lib-debug-opt = d ; }
local lib-pydebug-opt = "" ; if [ MATCH .*(debug-python).* : $(variant) ] { lib-pydebug-opt = _pydebug ; lib-debug-opt = "" ; }
return $(properties) <tag><$(variant)>$(lib-debug-opt)$(lib-pydebug-opt) ; }
Index: libs/date_time/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/date_time/build/Jamfile,v retrieving revision 1.9 diff -r1.9 Jamfile 24d23 < 29c28,29 < dll boost_date_time : ../src/gregorian/$(CPP_SOURCES).cpp ---
lib boost_date_time : ../src/gregorian/$(CPP_SOURCES).cpp
34c34,37 < lib boost_date_time : ../src/gregorian/$(CPP_SOURCES).cpp ---
if ! ${NT} {
dll boost_date_time : ../src/gregorian/$(CPP_SOURCES).cpp 38a42,55 stage ../../../lib : <lib>boost_date_time <dll>boost_date_time : boost-stage-tag : debug release ; } else { stage ../../../lib : <lib>boost_date_time : boost-stage-tag : debug release ; } Index: libs/filesystem/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/filesystem/build/Jamfile,v retrieving revision 1.5 diff -r1.5 Jamfile 17c17,24 < ; \ No newline at end of file
;
stage ../../../lib : <lib>boost_filesystem : boost-stage-tag : debug release ;
Index: libs/python/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/python/build/Jamfile,v retrieving revision 1.29 diff -r1.29 Jamfile 78,83c78,81 < stage bin-stage : <dll>boost_python <lib>boost_python < : <tag><debug>"_debug" < <tag><debug-python>"_pydebug" < : < debug release < ; ---
stage ../../../lib : <dll>boost_python <lib>boost_python : boost-stage-tag : debug release ; Index: libs/regex/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/regex/build/Jamfile,v retrieving revision 1.17 diff -r1.17 Jamfile 131c131 < stage bin-stage : <lib>boost_regex <dll>boost_regex
stage ../../../lib : <lib>boost_regex <dll>boost_regex Index: libs/signals/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/signals/build/Jamfile,v retrieving revision 1.6 diff -r1.6 Jamfile 27,28c27,28 < : <dll>boost_signals < : <tag><debug>"d"
: <dll>boost_signals <lib>boost_signals : boost-stage-tag
Index: libs/test/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/test/build/Jamfile,v retrieving revision 1.8 diff -r1.8 Jamfile 67a68,92
stage ../../../lib : <lib>boost_prg_exec_monitor <lib>boost_test_exec_monitor <lib>boost_unit_test_framework <dll>boost_prg_exec_monitor <dll>boost_test_exec_monitor <dll>boost_unit_test_framework : boost-stage-tag : debug release ; } else { stage ../../../lib : <lib>boost_prg_exec_monitor <lib>boost_test_exec_monitor <lib>boost_unit_test_framework : boost-stage-tag : debug release ;
Index: libs/thread/build/Jamfile =================================================================== RCS file: /cvsroot/boost/boost/libs/thread/build/Jamfile,v retrieving revision 1.20 diff -r1.20 Jamfile 47c47 < stage bin-stage ---
stage ../../../lib
50c50 < <tag><debug>"d" ---
boost-stage-tag
On Thu, 14 Aug 2003 17:42:05 -0700, Administrator wrote
The following changelog and patch do three things:
1. Change to common naming scheme for libs 2. Common subdir for compiled libs 3. Test and date_time dll's suppressed for NT builds.
Would appreciate any and all feedback on this patch. Thanks.
I personally like the idea of a common directory where the libs get built or copied, but you have to convince the boost developers and this is really the wrong list for that discussion. As for the date_time change I'd rather see something like: if ! ${WINDOWS} { because NT is just one variant. Perhaps even simplier is to just remove the <dll> rule for all platforms, or fix it so the dll is useful ;-) Jeff
In article <20030815032646.M24701@crystalclearsoftware.com>,
"Jeff Garland"
On Thu, 14 Aug 2003 17:42:05 -0700, Administrator wrote
The following changelog and patch do three things:
1. Change to common naming scheme for libs 2. Common subdir for compiled libs 3. Test and date_time dll's suppressed for NT builds.
Would appreciate any and all feedback on this patch. Thanks.
As it turns out, changes like that have been discussed in the past :-) And I happen to have put some effort into doing similar changes into the Boost build files. Almost all the changes you mention, and a few more are currently incorporated into the CVS files: boost-root/Jamfile, and boost-root/tools/build/boost-base.jam. If you want to try them out you can get them here respectively: http://tinyurl.com/k34f and http://tinyurl.com/k34j (the first file is on a branch) -- Or you can get them directly from SF-CVS. The one change I don't have is the tagging with respect to the debug-python builds (re, _pydebug). I'll add that also, soon.
I personally like the idea of a common directory where the libs get built or copied, but you have to convince the boost developers and this is really the wrong list for that discussion.
This is the wrong list ;-) Try the Boost.Build list, see: http://tinyurl.com/k34w
As for the date_time change I'd rather see something like:
if ! ${WINDOWS} {
because NT is just one variant.
For bjam, NT is equivalent to WINDOWS. First, there's no WINDOWS defined in bjam. Second, regardless of what Windows OS version you build bjam on, we define the NT variable.
Perhaps even simplier is to just remove the <dll> rule for all platforms, or fix it so the dll is useful ;-)
Fixing it so the DLL is usefull would be wonderfull ;-] -- -- grafik -- Don't Assume Anything
participants (3)
-
Administrator -
Jeff Garland -
Rene Rivera