townforge/build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unbreak " lib a ; " syntax.

Browse Source 
Thanks to Craig Rodrigues for the bug report.


[SVN r30309]
This commit is contained in:
Vladimir Prus 2005-07-29 12:00:40 +00:00
parent a02448da4a
commit 24fa408e3f
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/builtin.jam
View File

@ -380,11 +380,13 @@ rule lib ( names + : sources * : requirements * : default-build *
"it's not allowed to specify sources. " ;
}
}
for local name in $(names)
{
local r = $(requirements) ;
if $(names[2])
# Support " lib a ; " and " lib a b c ; " syntaxes.
if ! $(sources) && ! <name> in $(requirements:G)
&& ! <file> in $(requirements:G)
{
r += <name>$(name) ;
}

18
test/searched_lib.py
View File

@ -140,4 +140,22 @@ lib l : : <name>l_f ;
t.run_build_system("-n")
# Make sure that plain "lib foobar ; " works.
t.write("Jamfile", """
exe a : a.cpp foobar ;
lib foobar ;
""")
t.run_build_system("-n -d2")
t.fail_test(string.find(t.stdout(), "foobar") == -1)
# Make sure that plain "lib foo bar ; " works.
t.write("Jamfile", """
exe a : a.cpp foo bar ;
lib foo bar ;
""")
t.run_build_system("-n -d2")
t.fail_test(string.find(t.stdout(), "foo") == -1)
t.fail_test(string.find(t.stdout(), "bar") == -1)
t.cleanup()