mirror of
https://github.com/boostorg/boost.git
synced 2025-05-12 13:41:46 +00:00
Escape or quote special characters
This commit is contained in:
parent
53bbb9d9fa
commit
379ebde1bd
36
boostcpp.jam
36
boostcpp.jam
@ -39,8 +39,8 @@ rule set-version ( version )
|
|||||||
{
|
{
|
||||||
BOOST_VERSION = $(version) ;
|
BOOST_VERSION = $(version) ;
|
||||||
|
|
||||||
local version-tag = [ MATCH ^([^.]+)[.]([^.]+)[.]([^.]+) : $(BOOST_VERSION)
|
local version-tag =
|
||||||
] ;
|
[ MATCH "^([^.]+)[.]([^.]+)[.]([^.]+)" : $(BOOST_VERSION) ] ;
|
||||||
if $(version-tag[3]) = 0
|
if $(version-tag[3]) = 0
|
||||||
{
|
{
|
||||||
version-tag = $(version-tag[1-2]) ;
|
version-tag = $(version-tag[1-2]) ;
|
||||||
@ -78,12 +78,12 @@ layout-$(layout) = true ;
|
|||||||
|
|
||||||
if $(layout) = system && $(build-type) = complete
|
if $(layout) = system && $(build-type) = complete
|
||||||
{
|
{
|
||||||
ECHO error: Cannot use --layout=system with --build-type complete. ;
|
ECHO error\: Cannot use --layout=system with --build-type complete. ;
|
||||||
ECHO error: Please use either --layout=versioned or --layout=tagged ;
|
ECHO error\: Please use either --layout=versioned or --layout=tagged ;
|
||||||
ECHO error: if you wish to build multiple variants. ;
|
ECHO error\: if you wish to build multiple variants. ;
|
||||||
if [ os.name ] != NT
|
if [ os.name ] != NT
|
||||||
{
|
{
|
||||||
ECHO error: Note that --layout=system is used by default on Unix
|
ECHO error\: Note that --layout=system is used by default on Unix
|
||||||
starting with Boost 1.40. ;
|
starting with Boost 1.40. ;
|
||||||
}
|
}
|
||||||
EXIT ;
|
EXIT ;
|
||||||
@ -105,7 +105,7 @@ if $(build-id)
|
|||||||
python-id = [ option.get "python-buildid" ] ;
|
python-id = [ option.get "python-buildid" ] ;
|
||||||
if $(python-id)
|
if $(python-id)
|
||||||
{
|
{
|
||||||
PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
|
PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -144,7 +144,7 @@ rule tag ( name : type ? : property-set )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
EXIT error: invalid layout '$(layout:E=)' ;
|
EXIT error\: invalid layout '$(layout:E=)' ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Optionally add version suffix. On NT, library with version suffix will
|
# Optionally add version suffix. On NT, library with version suffix will
|
||||||
@ -198,20 +198,20 @@ rule make-unversioned-links ( project name ? : property-set : sources * )
|
|||||||
local filter ;
|
local filter ;
|
||||||
if [ modules.peek : NT ]
|
if [ modules.peek : NT ]
|
||||||
{
|
{
|
||||||
filter = (.*[.]lib) ;
|
filter = "(.*[.]lib)" ;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
filter =
|
filter =
|
||||||
(.*[.]so)[.0-9]*
|
"(.*[.]so)[.0-9]*"
|
||||||
(.*[.]dylib)
|
"(.*[.]dylib)"
|
||||||
(.*[.]a) ;
|
"(.*[.]a)" ;
|
||||||
}
|
}
|
||||||
|
|
||||||
local result ;
|
local result ;
|
||||||
for local s in $(sources)
|
for local s in $(sources)
|
||||||
{
|
{
|
||||||
local m = [ MATCH ^(.*)-[0-9_]+$(filter)$ : [ $(s).name ] ] ;
|
local m = [ MATCH "^(.*)-[0-9_]+$(filter)$" : [ $(s).name ] ] ;
|
||||||
if $(m)
|
if $(m)
|
||||||
{
|
{
|
||||||
local ea = [ $(s).action ] ;
|
local ea = [ $(s).action ] ;
|
||||||
@ -226,7 +226,7 @@ rule make-unversioned-links ( project name ? : property-set : sources * )
|
|||||||
|
|
||||||
rule filtered-target ( name : message + : sources + : requirements * )
|
rule filtered-target ( name : message + : sources + : requirements * )
|
||||||
{
|
{
|
||||||
message $(name)-message : warning: $(message) ;
|
message $(name)-message : warning\: $(message) ;
|
||||||
alias $(name) : $(sources) : $(requirements) ;
|
alias $(name) : $(sources) : $(requirements) ;
|
||||||
alias $(name) : $(name)-message ;
|
alias $(name) : $(name)-message ;
|
||||||
|
|
||||||
@ -617,19 +617,19 @@ rule libraries-to-install ( existing-libs * )
|
|||||||
# Do some checks.
|
# Do some checks.
|
||||||
if $(with-parameter) && $(without-parameter)
|
if $(with-parameter) && $(without-parameter)
|
||||||
{
|
{
|
||||||
EXIT error: both --with-<library> and --without-<library> specified ;
|
EXIT error\: both --with-<library> and --without-<library> specified ;
|
||||||
}
|
}
|
||||||
|
|
||||||
local wrong = [ set.difference $(with-parameter) : $(existing-libs) ] ;
|
local wrong = [ set.difference $(with-parameter) : $(existing-libs) ] ;
|
||||||
if $(wrong)
|
if $(wrong)
|
||||||
{
|
{
|
||||||
EXIT error: wrong library name '$(wrong[1])' in the --with-<library>
|
EXIT error\: wrong library name '$(wrong[1])' in the --with-<library>
|
||||||
option. ;
|
option. ;
|
||||||
}
|
}
|
||||||
local wrong = [ set.difference $(without-parameter) : $(existing-libs) ] ;
|
local wrong = [ set.difference $(without-parameter) : $(existing-libs) ] ;
|
||||||
if $(wrong)
|
if $(wrong)
|
||||||
{
|
{
|
||||||
EXIT error: wrong library name '$(wrong[1])' in the --without-<library>
|
EXIT error\: wrong library name '$(wrong[1])' in the --without-<library>
|
||||||
option. ;
|
option. ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -653,7 +653,7 @@ rule declare-targets ( all-libraries * : headers * : modular-headers * )
|
|||||||
|
|
||||||
if [ option.get "show-libraries" : : true ]
|
if [ option.get "show-libraries" : : true ]
|
||||||
{
|
{
|
||||||
ECHO The following libraries require building: ;
|
ECHO The following libraries require building\: ;
|
||||||
for local l in $(libraries)
|
for local l in $(libraries)
|
||||||
{
|
{
|
||||||
ECHO " - $(l)" ;
|
ECHO " - $(l)" ;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user