Skip to content

Commit 023e4ad

Browse files
committed
Using Manager interface file to add new APIs
Currently there are two interface files defined for VPD Manager service. APIs from FRU.Manager interface are moved to Manager interface. Single yaml file is maintained for VPD.Manager service. Change-Id: Iea6d6bf86aae1b25303e2e2f4f5641ef0915e99a Signed-off-by: Rekha Aparna <[email protected]>
1 parent fd382fe commit 023e4ad

File tree

4 files changed

+118
-262
lines changed

4 files changed

+118
-262
lines changed

gen/com/ibm/VPD/FRUManager/meson.build

Lines changed: 0 additions & 38 deletions
This file was deleted.

gen/com/ibm/VPD/meson.build

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
# Generated file; do not modify.
2-
subdir('Collection')
3-
subdir('FRUManager')
4-
subdir('Manager')
5-
6-
sdbusplus_current_path = 'com/ibm/VPD'
7-
82
generated_sources += custom_target(
93
'com/ibm/VPD__cpp'.underscorify(),
104
input: ['../../../../yaml/com/ibm/VPD.errors.yaml'],
@@ -22,12 +16,10 @@ generated_sources += custom_target(
2216
meson.current_source_dir() / '../../../../yaml',
2317
'com/ibm/VPD',
2418
],
25-
install: should_generate_cpp,
26-
install_dir: [false, get_option('includedir') / sdbusplus_current_path],
27-
build_by_default: should_generate_cpp,
2819
)
2920

30-
generated_markdown += custom_target(
21+
subdir('Collection')
22+
generated_others += custom_target(
3123
'com/ibm/VPD/Collection__markdown'.underscorify(),
3224
input: ['../../../../yaml/com/ibm/VPD/Collection.interface.yaml'],
3325
output: ['Collection.md'],
@@ -44,34 +36,10 @@ generated_markdown += custom_target(
4436
meson.current_source_dir() / '../../../../yaml',
4537
'com/ibm/VPD/Collection',
4638
],
47-
install: should_generate_markdown,
48-
install_dir: [inst_markdown_dir / sdbusplus_current_path],
49-
build_by_default: should_generate_markdown,
50-
)
51-
52-
generated_markdown += custom_target(
53-
'com/ibm/VPD/FRUManager__markdown'.underscorify(),
54-
input: ['../../../../yaml/com/ibm/VPD/FRUManager.interface.yaml'],
55-
output: ['FRUManager.md'],
56-
depend_files: sdbusplusplus_depfiles,
57-
command: [
58-
sdbuspp_gen_meson_prog,
59-
'--command',
60-
'markdown',
61-
'--output',
62-
meson.current_build_dir(),
63-
'--tool',
64-
sdbusplusplus_prog,
65-
'--directory',
66-
meson.current_source_dir() / '../../../../yaml',
67-
'com/ibm/VPD/FRUManager',
68-
],
69-
install: should_generate_markdown,
70-
install_dir: [inst_markdown_dir / sdbusplus_current_path],
71-
build_by_default: should_generate_markdown,
7239
)
7340

74-
generated_markdown += custom_target(
41+
subdir('Manager')
42+
generated_others += custom_target(
7543
'com/ibm/VPD/Manager__markdown'.underscorify(),
7644
input: ['../../../../yaml/com/ibm/VPD/Manager.interface.yaml'],
7745
output: ['Manager.md'],
@@ -88,8 +56,5 @@ generated_markdown += custom_target(
8856
meson.current_source_dir() / '../../../../yaml',
8957
'com/ibm/VPD/Manager',
9058
],
91-
install: should_generate_markdown,
92-
install_dir: [inst_markdown_dir / sdbusplus_current_path],
93-
build_by_default: should_generate_markdown,
9459
)
9560

yaml/com/ibm/VPD/FRUManager.interface.yaml

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)