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

Fix path calculation to work when the invocation dir is set to "."

Browse Source 
Remove some TABS.


[SVN r20062]
This commit is contained in:
Rene Rivera
2003-09-15 05:50:57 +00:00
parent 1d97a8da49
commit 887dbd32f5
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
testing.jam
View File

@@ -78,6 +78,7 @@ rule boost-test ( sources + : target-type : requirements * : test-name ? : defau
local rule dump-test ( )
{
local srcs = [ on $(result) get-var-value source-files ] ;
local pwd = [ PWD ] ;
# locate each source file
local source-files ;
@@ -97,7 +98,7 @@ local rule dump-test ( )
if $(files)
{
# make relative to the project root instead of "."
local file = $(files[1]:R=$(gINVOCATION_SUBDIR_TOKENS:J=/)) ;
local file = $(files[1]:R=$(pwd)) ;
# try to undo absolute paths
source-files += [ relative-path $(file) ] ;
@@ -340,7 +341,7 @@ rule capture-run-output1 ( target : executable )
p = $(gRUN_LD_LIBRARY_PATH($(executable))) ;
if $(NT)
{
RUN_LD_LIBRARY_PATH on $(target) = ;
RUN_LD_LIBRARY_PATH on $(target) = ;
LD_LIBRARY_PATH_VAR on $(target) = ;
if $(gCURRENT_TOOLSET) in $(gcc-compilers)
{
@@ -352,7 +353,7 @@ rule capture-run-output1 ( target : executable )
}
else if $(p)
{
RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
LD_LIBRARY_PATH_VAR on $(target) = LD_LIBRARY_PATH ;
}
execute-test $(target) : $(executable) ;

7
v1/testing.jam
View File

@@ -78,6 +78,7 @@ rule boost-test ( sources + : target-type : requirements * : test-name ? : defau
local rule dump-test ( )
{
local srcs = [ on $(result) get-var-value source-files ] ;
local pwd = [ PWD ] ;
# locate each source file
local source-files ;
@@ -97,7 +98,7 @@ local rule dump-test ( )
if $(files)
{
# make relative to the project root instead of "."
local file = $(files[1]:R=$(gINVOCATION_SUBDIR_TOKENS:J=/)) ;
local file = $(files[1]:R=$(pwd)) ;
# try to undo absolute paths
source-files += [ relative-path $(file) ] ;
@@ -340,7 +341,7 @@ rule capture-run-output1 ( target : executable )
p = $(gRUN_LD_LIBRARY_PATH($(executable))) ;
if $(NT)
{
RUN_LD_LIBRARY_PATH on $(target) = ;
RUN_LD_LIBRARY_PATH on $(target) = ;
LD_LIBRARY_PATH_VAR on $(target) = ;
if $(gCURRENT_TOOLSET) in $(gcc-compilers)
{
@@ -352,7 +353,7 @@ rule capture-run-output1 ( target : executable )
}
else if $(p)
{
RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
RUN_LD_LIBRARY_PATH on $(target) = $(p) $(ENV_LD_LIBRARY_PATH) ;
LD_LIBRARY_PATH_VAR on $(target) = LD_LIBRARY_PATH ;
}
execute-test $(target) : $(executable) ;