boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-18 01:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix: now search-lib targets can be used in requirements and

Browse Source 
usage-requirements.

* new/builtin.jam
    (link-action.adjust-properties): Rework.

* test/searched_lib.py: New test.


[SVN r17104]
This commit is contained in:
Vladimir Prus
2003-01-31 09:26:25 +00:00
parent 686ad5a7d2
commit 4c346e6599
6 changed files with 168 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
new/builtin.jam
View File

@@ -405,61 +405,84 @@ rule link-action ( targets + : sources * : action-name : properties * )
{
action.__init__ $(targets) : $(sources) : $(action-name) : $(properties) ;
# For all sources which are instances searched-lib-targets, add
# appropriate <find-shared-library> or <find-static-library> propertry
# For all library sources, add <library> property with that source.
# Find all libraries in sources, and <library> properties
# For each source/property-value, which is instance of searched-lib-target,
# add appropriate <find-shared-library> or <find-static-library> property.
# (replacing the origianal <library> is needed)
# Convert library sources into <library> properties.
# If <hardcode-dll-paths>true is in properties, for each library source
# add <dll-path> property with the absolute path to that library.
rule adjust-properties ( properties * )
{
# Identify all library sources and all <library> properties
# Remove that latter from 'properties'
local libraries ;
for local s in $(self.sources)
{
if [ type.is-derived [ $(s).type ] LIB ]
{
libraries += $(s) ;
}
}
local properties2 ;
for local p in $(properties)
{
if $(p:G) = <library>
{
libraries += $(p:G=) ;
}
else
{
properties2 += $(p) ;
}
}
local hardcore-rpath ;
local rpaths ;
if <hardcode-dll-paths>true in $(properties)
{
hardcore-rpath = true ;
}
# Add needed properties
local pwd = [ path.pwd ] ;
local extra ;
for local s in $(self.sources)
local rpaths ;
for local s in $(libraries)
{
if [ class.is-a $(s) : searched-lib-target ]
{
local name = [ $(s).real-name ] ;
if [ $(s).shared ]
{
extra += <find-shared-library>$(name) ;
properties2 += <find-shared-library>$(name) ;
}
else
{
extra += <find-static-library>$(name) ;
properties2 += <find-static-library>$(name) ;
}
local search = [ $(s).search ] ;
extra += <library-path>$(search) ;
if $(hardcore-rpath)
{
rpaths += $(search) ;
}
properties2 += <library-path>$(search) ;
}
# We also move orginary libs form sources to
# "library" property. This allows us to
# easily repeat all the list of libs on
# command line, when it's needed.
else if [ type.is-derived [ $(s).type ] LIB ]
else
{
extra += <library>$(s) ;
if $(hardcore-rpath)
{
rpaths += [ path.root [ $(s).path ] $(pwd) ] ;
}
properties2 += <library>$(s) ;
}
}
properties += $(extra) ;
if $(hardcore-rpath)
{
for local p in $(properties)
{
if $(p:G) = <library>
{
rpaths += [ path.root [ $(p:G=).path ] $(pwd) ] ;
}
}
rpaths = [ sequence.unique $(rpaths) ] ;
properties += <dll-path>$(rpaths) ;
properties2 += <dll-path>$(rpaths) ;
}
return $(properties) ;
return $(properties2) ;
}
# Filters out all sources which are of LIB type and actualizes the remaining

35
test/searched_lib.py Normal file
View File

@@ -0,0 +1,35 @@
#!/usr/bin/python
# Test usage of searched-libs: one which are found via -l
# switch to the linker/compiler
from BoostBuild import Tester, exe_suffix
t = Tester()
# A regression test: <library>property referring to
# searched-lib was mishandled. As the result, we were
# putting target name to the command line!
# Note that
# g++ ...... <.>z
# works nicely in some cases, sending output from compiler
# to file 'z'.
# This problem shows up when searched libs are in usage
# requirements.
t.write('project-root.jam', 'import gcc ;')
t.write('Jamfile', 'exe main : main.cpp d/d2/a ;')
t.write("main.cpp", """
int main() {}
""")
t.write('d/d2/Jamfile', """
lib z : : <name>z ;
lib a : a.cpp : : : <library>z ;
""")
t.write('d/d2/a.cpp', """
""")
t.run_build_system()
t.cleanup()

1
test/test_all.py
View File

@@ -37,4 +37,5 @@ import project_dependencies
import build_dir
if os.name == 'posix':
import symlink
import searched_lib

35
v2/test/searched_lib.py Normal file
View File

@@ -0,0 +1,35 @@
#!/usr/bin/python
# Test usage of searched-libs: one which are found via -l
# switch to the linker/compiler
from BoostBuild import Tester, exe_suffix
t = Tester()
# A regression test: <library>property referring to
# searched-lib was mishandled. As the result, we were
# putting target name to the command line!
# Note that
# g++ ...... <.>z
# works nicely in some cases, sending output from compiler
# to file 'z'.
# This problem shows up when searched libs are in usage
# requirements.
t.write('project-root.jam', 'import gcc ;')
t.write('Jamfile', 'exe main : main.cpp d/d2/a ;')
t.write("main.cpp", """
int main() {}
""")
t.write('d/d2/Jamfile', """
lib z : : <name>z ;
lib a : a.cpp : : : <library>z ;
""")
t.write('d/d2/a.cpp', """
""")
t.run_build_system()
t.cleanup()

1
v2/test/test_all.py
View File

@@ -37,4 +37,5 @@ import project_dependencies
import build_dir
if os.name == 'posix':
import symlink
import searched_lib

73
v2/tools/builtin.jam
View File

@@ -405,61 +405,84 @@ rule link-action ( targets + : sources * : action-name : properties * )
{
action.__init__ $(targets) : $(sources) : $(action-name) : $(properties) ;
# For all sources which are instances searched-lib-targets, add
# appropriate <find-shared-library> or <find-static-library> propertry
# For all library sources, add <library> property with that source.
# Find all libraries in sources, and <library> properties
# For each source/property-value, which is instance of searched-lib-target,
# add appropriate <find-shared-library> or <find-static-library> property.
# (replacing the origianal <library> is needed)
# Convert library sources into <library> properties.
# If <hardcode-dll-paths>true is in properties, for each library source
# add <dll-path> property with the absolute path to that library.
rule adjust-properties ( properties * )
{
# Identify all library sources and all <library> properties
# Remove that latter from 'properties'
local libraries ;
for local s in $(self.sources)
{
if [ type.is-derived [ $(s).type ] LIB ]
{
libraries += $(s) ;
}
}
local properties2 ;
for local p in $(properties)
{
if $(p:G) = <library>
{
libraries += $(p:G=) ;
}
else
{
properties2 += $(p) ;
}
}
local hardcore-rpath ;
local rpaths ;
if <hardcode-dll-paths>true in $(properties)
{
hardcore-rpath = true ;
}
# Add needed properties
local pwd = [ path.pwd ] ;
local extra ;
for local s in $(self.sources)
local rpaths ;
for local s in $(libraries)
{
if [ class.is-a $(s) : searched-lib-target ]
{
local name = [ $(s).real-name ] ;
if [ $(s).shared ]
{
extra += <find-shared-library>$(name) ;
properties2 += <find-shared-library>$(name) ;
}
else
{
extra += <find-static-library>$(name) ;
properties2 += <find-static-library>$(name) ;
}
local search = [ $(s).search ] ;
extra += <library-path>$(search) ;
if $(hardcore-rpath)
{
rpaths += $(search) ;
}
properties2 += <library-path>$(search) ;
}
# We also move orginary libs form sources to
# "library" property. This allows us to
# easily repeat all the list of libs on
# command line, when it's needed.
else if [ type.is-derived [ $(s).type ] LIB ]
else
{
extra += <library>$(s) ;
if $(hardcore-rpath)
{
rpaths += [ path.root [ $(s).path ] $(pwd) ] ;
}
properties2 += <library>$(s) ;
}
}
properties += $(extra) ;
if $(hardcore-rpath)
{
for local p in $(properties)
{
if $(p:G) = <library>
{
rpaths += [ path.root [ $(p:G=).path ] $(pwd) ] ;
}
}
rpaths = [ sequence.unique $(rpaths) ] ;
properties += <dll-path>$(rpaths) ;
properties2 += <dll-path>$(rpaths) ;
}
return $(properties) ;
return $(properties2) ;
}
# Filters out all sources which are of LIB type and actualizes the remaining