boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix: path features in target requirement were

Browse Source 
not translated.

* test/path_features.py: Fix a bug in test.

* new/targets.jam
    (main-target-requirements): Bugfix.


[SVN r16579]
This commit is contained in:
Vladimir Prus
2002-12-10 07:15:33 +00:00
parent 19a2c1c584
commit 84fa4e2c88
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
new/targets.jam
View File

@@ -569,7 +569,7 @@ rule main-target-requirements (
local loc = [ project.attribute $(project) location ] ;
local requirements = [ property.translate-paths $(specification) : $(loc) ] ;
local project-requirements = [ project.attribute $(project) requirements ] ;
requirements = [ property.refine $(project-requirements) : $(specification) ] ;
requirements = [ property.refine $(project-requirements) : $(requirements) ] ;
if $(requirements[1]) = "@error"
{
errors.error "Conflicting requirements for target:" $(requirements) ;

5
test/path_features.py
View File

@@ -5,7 +5,10 @@ t = Tester()
t.write("project-root.jam", "import gcc ;")
t.write("Jamfile", "lib a : a.cpp : <include>. ;")
t.write("a.cpp", "void foo() {}")
t.write("a.cpp", """
#include <a.h>
void foo() {}
""")
t.write("a.h", "")
t.write("d/Jamfile", "exe b : b.cpp ../a ; ")

2
v2/build/targets.jam
View File

@@ -569,7 +569,7 @@ rule main-target-requirements (
local loc = [ project.attribute $(project) location ] ;
local requirements = [ property.translate-paths $(specification) : $(loc) ] ;
local project-requirements = [ project.attribute $(project) requirements ] ;
requirements = [ property.refine $(project-requirements) : $(specification) ] ;
requirements = [ property.refine $(project-requirements) : $(requirements) ] ;
if $(requirements[1]) = "@error"
{
errors.error "Conflicting requirements for target:" $(requirements) ;

5
v2/test/path_features.py
View File

@@ -5,7 +5,10 @@ t = Tester()
t.write("project-root.jam", "import gcc ;")
t.write("Jamfile", "lib a : a.cpp : <include>. ;")
t.write("a.cpp", "void foo() {}")
t.write("a.cpp", """
#include <a.h>
void foo() {}
""")
t.write("a.h", "")
t.write("d/Jamfile", "exe b : b.cpp ../a ; ")