From 042fcb5a5a93eec208a3a6e7e8232fcafbc8eebf Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 10 Nov 2001 22:16:01 +0000 Subject: [PATCH] Modified Files: index.htm - fixed reference to CVS repository libs/python/build/Jamfile - first stab at metrowerks Pro7 support status/Jamfile - added RUN_ALL_TESTS variables to force tests to run tools/build/boost-build.jam - fix BOOST_BUILD_INSTALLATION setting tools/build/metrowerks-tools.jam - command file support tools/build/msvc-tools.jam - permanent command file support tools/build/intel-win32-tools.jam - made it an extension of msvc-tools.jam tools/build/gcc-tools.jam - made FINDLIBS change submitted by Toon Knapen tools/build/jam_src/variable.c - changed command-line/env. variable interpretation so that surrounding them with quotes causes no breaking at spaces. These files were converted from tabs to spaces: boost/python/conversions.hpp boost/python/reference.hpp boost/python/detail/base_object.hpp boost/python/detail/functions.hpp boost/python/detail/wrap_python.hpp libs/python/test/comprehensive.cpp tools/build/boost-base.jam tools/build/como-tools.jam [SVN r11652] --- boost-build.jam | 1 + src/engine/variable.c | 48 ++++++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/boost-build.jam b/boost-build.jam index 51a5d4813..e41c9c538 100644 --- a/boost-build.jam +++ b/boost-build.jam @@ -3,5 +3,6 @@ # all copies. This software is provided "as is" without express or implied # warranty, and with no claim as to its suitability for any purpose. +BOOST_BUILD_INSTALLATION ?= $(BOOST_ROOT)/tools/build ; SEARCH on allyourbase.jam = $(BOOST_BUILD_PATH) ; include allyourbase.jam ; diff --git a/src/engine/variable.c b/src/engine/variable.c index 9dccea7fd..b6ba95fdf 100644 --- a/src/engine/variable.c +++ b/src/engine/variable.c @@ -94,28 +94,38 @@ var_defines( char **e ) # ifdef OS_MAC char split = ','; # else - char split = ' '; + char split = ' '; # endif - /* Split *PATH at :'s, not spaces */ - - if( val - 4 >= *e ) - { - if( !strncmp( val - 4, "PATH", 4 ) || - !strncmp( val - 4, "Path", 4 ) || - !strncmp( val - 4, "path", 4 ) ) - split = SPLITPATH; - } - - /* Do the split */ - - for( pp = val + 1; p = strchr( pp, split ); pp = p + 1 ) - { - string_append_range( buf, pp, p ); - l = list_new( l, newstr( buf->value ) ); + size_t len = strlen(val + 1); + if ( val[1] == '"' && val[len] == '"') + { + string_append_range( buf, val + 2, val + len ); + l = list_new( l, newstr( buf->value ) ); string_truncate( buf, 0 ); - } + } + else + { + /* Split *PATH at :'s, not spaces */ - l = list_new( l, newstr( pp ) ); + if( val - 4 >= *e ) + { + if( !strncmp( val - 4, "PATH", 4 ) || + !strncmp( val - 4, "Path", 4 ) || + !strncmp( val - 4, "path", 4 ) ) + split = SPLITPATH; + } + + /* Do the split */ + + for( pp = val + 1; p = strchr( pp, split ); pp = p + 1 ) + { + string_append_range( buf, pp, p ); + l = list_new( l, newstr( buf->value ) ); + string_truncate( buf, 0 ); + } + + l = list_new( l, newstr( pp ) ); + } /* Get name */ string_append_range( buf, *e, val );