Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extended cpp_info model object to new components concept #5242

Closed
wants to merge 52 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
e743bd2
Added tests and first POC component class with recursive libs retrieval
danimtb May 20, 2019
7073291
Removed ordered dict class and moved to component class
danimtb May 21, 2019
66289a7
Propagate lib and exe to cpp_info and maintain current behavior or libs
danimtb May 21, 2019
07f90a7
Removed multilevel components and recursivity
danimtb May 21, 2019
25a2776
implemented inheritance of includedir directory
danimtb May 21, 2019
a100bc2
comment
danimtb May 22, 2019
9643fea
Merge branch 'develop' into feature/5090
danimtb May 28, 2019
e43b442
Directory propagation and integration test
danimtb May 28, 2019
14dc504
Introduced DirList and completed tests
danimtb May 28, 2019
b00a93c
small changes for paths
danimtb May 29, 2019
06e2117
Merge branch 'develop' into feature/5090
danimtb Jun 13, 2019
9b53334
Removed DirList and added system_deps
danimtb Jun 13, 2019
61981a2
fix exes
danimtb Jun 14, 2019
5509638
fixed deprecation warning in tests
danimtb Jun 17, 2019
f6df365
Fixed cpp_info libs value in json output
danimtb Jun 17, 2019
e88b6f1
fix test
danimtb Jun 17, 2019
6c8bd40
Add description to _get_paths()
danimtb Jun 19, 2019
831172c
removed prints
danimtb Jun 19, 2019
058ed4e
Add exes test
danimtb Jun 19, 2019
0d9ba39
Test wrong cpp_info raises on create
danimtb Jun 19, 2019
db8b873
Added system_deps test
danimtb Jun 19, 2019
b098c12
Adds complete test
danimtb Jun 19, 2019
6ab1bdb
Add system_deps global behavior
danimtb Jun 19, 2019
2f82336
Merge branch 'develop' into feature/5090
danimtb Jun 19, 2019
d1d2ffc
Indent text
danimtb Jun 20, 2019
be74c0d
Review and move libs properties. Use function to get components sorted
danimtb Jun 20, 2019
1e6e1fd
Renamed .deps to .components
danimtb Jun 20, 2019
6a2e2f7
simplified get paths
danimtb Jun 20, 2019
b32e3b9
Fix link order and added test
danimtb Jun 20, 2019
4bb2db2
Update conans/test/unittests/model/build_info_test.py
danimtb Jun 20, 2019
4b49026
Update conans/test/unittests/model/build_info_test.py
danimtb Jun 20, 2019
62a9782
Update conans/test/integration/package_info_test.py
danimtb Jun 20, 2019
b756503
Update conans/test/integration/package_info_test.py
danimtb Jun 20, 2019
aef1a51
asserts
danimtb Jun 20, 2019
b085211
fix path repetition
danimtb Jun 20, 2019
ebd80e3
remove endline
danimtb Jun 20, 2019
63f8235
move default values dict
danimtb Jun 20, 2019
2c3e3d7
Use is none
danimtb Jun 20, 2019
c01ba50
Completed test
danimtb Jun 21, 2019
d150060
Added deps_cpp_info.system_deps global
danimtb Jun 21, 2019
f61e2d9
simplified link order property, added test and fixed other ones
danimtb Jun 21, 2019
0dbb943
get paths in order too
danimtb Jun 21, 2019
c3da770
docstring
danimtb Jun 21, 2019
195665c
improve system_deps test
danimtb Jun 21, 2019
ff6fca3
merge methods
danimtb Jun 21, 2019
1c95d9b
Added components to the cpp_info json output
danimtb Jun 21, 2019
6cdda0f
loop check with test
danimtb Jun 24, 2019
93f6c8d
5090 fixes
lasote Jun 25, 2019
5f5f172
Merge pull request #4 from lasote/feature/5090_fixes
danimtb Jun 25, 2019
1036bd8
improved message
danimtb Jun 25, 2019
9696a4a
remove cppflags from component class
danimtb Jun 25, 2019
6fae2f8
Merge branch 'develop' into feature/5090
danimtb Jun 27, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions conans/client/recorder/action_recorder.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,28 @@

def _cpp_info_to_dict(cpp_info):
doc = {}
for it, value in vars(cpp_info).items():
if it.startswith("_") or not value:
items = list(vars(cpp_info).items())
if not cpp_info._components:
items = items + [("libs", cpp_info.libs), ("exes", cpp_info.exes),
("system_deps", cpp_info.system_deps)]
for key, value in items:
if key.startswith("_components") and value:
doc["components"] = {}
for comp_key, comp_value in value.items():
doc["components"][comp_key] = comp_value.as_dict()
continue

if key.startswith("_") or not value:
continue

if it == "configs":
if key == "configs":
configs_data = {}
for cfg_name, cfg_cpp_info in value.items():
configs_data[cfg_name] = _cpp_info_to_dict(cfg_cpp_info)
doc["configs"] = configs_data
continue

doc[it] = value
doc[key] = value
return doc


Expand Down
Loading