Skip to content

Commit 9fe6f6a

Browse files
chsiggchsigg
authored
[bazel] Change gentbl_cc_library(tbl_outs) to dicts (#134349)
Follow up from #134271
1 parent 4d1e4ef commit 9fe6f6a

File tree

14 files changed

+1931
-4728
lines changed

14 files changed

+1931
-4728
lines changed

‎utils/bazel/llvm-project-overlay/clang/BUILD.bazel

Lines changed: 105 additions & 368 deletions
Large diffs are not rendered by default.

‎utils/bazel/llvm-project-overlay/lldb/BUILD.bazel

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,10 @@ cc_library(
331331
gentbl_cc_library(
332332
name = "InterpreterProperties",
333333
strip_include_prefix = "source/Interpreter",
334-
tbl_outs = [
335-
(
336-
["-gen-lldb-property-defs"],
337-
"source/Interpreter/InterpreterProperties.inc",
338-
),
339-
(
340-
["-gen-lldb-property-enum-defs"],
341-
"source/Interpreter/InterpreterPropertiesEnum.inc",
342-
),
343-
],
334+
tbl_outs = {
335+
"source/Interpreter/InterpreterProperties.inc": ["-gen-lldb-property-defs"],
336+
"source/Interpreter/InterpreterPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
337+
},
344338
tblgen = ":lldb-tblgen",
345339
td_file = "source/Interpreter/InterpreterProperties.td",
346340
deps = [":CoreTdFiles"],
@@ -406,12 +400,7 @@ td_library(
406400
gentbl_cc_library(
407401
name = "CommandOptions",
408402
strip_include_prefix = "source/Commands",
409-
tbl_outs = [
410-
(
411-
["-gen-lldb-option-defs"],
412-
"source/Commands/CommandOptions.inc",
413-
),
414-
],
403+
tbl_outs = {"source/Commands/CommandOptions.inc": ["-gen-lldb-option-defs"]},
415404
tblgen = ":lldb-tblgen",
416405
td_file = "source/Commands/Options.td",
417406
deps = [":CommandsTdFiles"],
@@ -595,16 +584,10 @@ td_library(
595584
gentbl_cc_library(
596585
name = "CoreProperties",
597586
strip_include_prefix = "source/Core",
598-
tbl_outs = [
599-
(
600-
["-gen-lldb-property-defs"],
601-
"source/Core/CoreProperties.inc",
602-
),
603-
(
604-
["-gen-lldb-property-enum-defs"],
605-
"source/Core/CorePropertiesEnum.inc",
606-
),
607-
],
587+
tbl_outs = {
588+
"source/Core/CoreProperties.inc": ["-gen-lldb-property-defs"],
589+
"source/Core/CorePropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
590+
},
608591
tblgen = ":lldb-tblgen",
609592
td_file = "source/Core/CoreProperties.td",
610593
deps = [":CoreTdFiles"],
@@ -676,16 +659,10 @@ cc_library(
676659
gentbl_cc_library(
677660
name = "TargetProperties",
678661
strip_include_prefix = "source/Target",
679-
tbl_outs = [
680-
(
681-
["-gen-lldb-property-defs"],
682-
"source/Target/TargetProperties.inc",
683-
),
684-
(
685-
["-gen-lldb-property-enum-defs"],
686-
"source/Target/TargetPropertiesEnum.inc",
687-
),
688-
],
662+
tbl_outs = {
663+
"source/Target/TargetProperties.inc": ["-gen-lldb-property-defs"],
664+
"source/Target/TargetPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
665+
},
689666
tblgen = ":lldb-tblgen",
690667
td_file = "source/Target/TargetProperties.td",
691668
deps = [":CoreTdFiles"],
@@ -832,10 +809,7 @@ cc_import(
832809
gentbl_cc_library(
833810
name = "lldb_options_inc_gen",
834811
strip_include_prefix = ".",
835-
tbl_outs = [(
836-
["-gen-opt-parser-defs"],
837-
"Options.inc",
838-
)],
812+
tbl_outs = {"Options.inc": ["-gen-opt-parser-defs"]},
839813
tblgen = "//llvm:llvm-tblgen",
840814
td_file = "tools/driver/Options.td",
841815
deps = ["//llvm:OptParserTdFiles"],
@@ -981,10 +955,7 @@ cc_binary(
981955
gentbl_cc_library(
982956
name = "lldb_server_opts_gen",
983957
strip_include_prefix = ".",
984-
tbl_outs = [(
985-
["-gen-opt-parser-defs"],
986-
"LLGSOptions.inc",
987-
)],
958+
tbl_outs = {"LLGSOptions.inc": ["-gen-opt-parser-defs"]},
988959
tblgen = "//llvm:llvm-tblgen",
989960
td_file = "tools/lldb-server/LLGSOptions.td",
990961
deps = ["//llvm:OptParserTdFiles"],
@@ -1051,10 +1022,7 @@ expand_template(
10511022
gentbl_cc_library(
10521023
name = "lldb_dap_opts_gen",
10531024
strip_include_prefix = "tools/lldb-dap",
1054-
tbl_outs = [(
1055-
["-gen-opt-parser-defs"],
1056-
"tools/lldb-dap/Options.inc",
1057-
)],
1025+
tbl_outs = {"tools/lldb-dap/Options.inc": ["-gen-opt-parser-defs"]},
10581026
tblgen = "//llvm:llvm-tblgen",
10591027
td_file = "tools/lldb-dap/Options.td",
10601028
deps = ["//llvm:OptParserTdFiles"],

‎utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel

Lines changed: 49 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -215,16 +215,10 @@ cc_library(
215215
gentbl_cc_library(
216216
name = "PlatformMacOSXProperties",
217217
strip_include_prefix = "Platform/MacOSX",
218-
tbl_outs = [
219-
(
220-
["-gen-lldb-property-defs"],
221-
"Platform/MacOSX/PlatformMacOSXProperties.inc",
222-
),
223-
(
224-
["-gen-lldb-property-enum-defs"],
225-
"Platform/MacOSX/PlatformMacOSXPropertiesEnum.inc",
226-
),
227-
],
218+
tbl_outs = {
219+
"Platform/MacOSX/PlatformMacOSXProperties.inc": ["-gen-lldb-property-defs"],
220+
"Platform/MacOSX/PlatformMacOSXPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
221+
},
228222
tblgen = "//lldb:lldb-tblgen",
229223
td_file = "Platform/MacOSX/PlatformMacOSXProperties.td",
230224
deps = ["//lldb:CoreTdFiles"],
@@ -301,16 +295,10 @@ cc_library(
301295
gentbl_cc_library(
302296
name = "SymbolFileDWARFProperties",
303297
strip_include_prefix = "SymbolFile/DWARF",
304-
tbl_outs = [
305-
(
306-
["-gen-lldb-property-defs"],
307-
"SymbolFile/DWARF/SymbolFileDWARFProperties.inc",
308-
),
309-
(
310-
["-gen-lldb-property-enum-defs"],
311-
"SymbolFile/DWARF/SymbolFileDWARFPropertiesEnum.inc",
312-
),
313-
],
298+
tbl_outs = {
299+
"SymbolFile/DWARF/SymbolFileDWARFProperties.inc": ["-gen-lldb-property-defs"],
300+
"SymbolFile/DWARF/SymbolFileDWARFPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
301+
},
314302
tblgen = "//lldb:lldb-tblgen",
315303
td_file = "SymbolFile/DWARF/SymbolFileDWARFProperties.td",
316304
deps = ["//lldb:CoreTdFiles"],
@@ -454,16 +442,10 @@ cc_library(
454442
gentbl_cc_library(
455443
name = "ProcessGDBRemoteProperties",
456444
strip_include_prefix = "Process/gdb-remote",
457-
tbl_outs = [
458-
(
459-
["-gen-lldb-property-defs"],
460-
"Process/gdb-remote/ProcessGDBRemoteProperties.inc",
461-
),
462-
(
463-
["-gen-lldb-property-enum-defs"],
464-
"Process/gdb-remote/ProcessGDBRemotePropertiesEnum.inc",
465-
),
466-
],
445+
tbl_outs = {
446+
"Process/gdb-remote/ProcessGDBRemoteProperties.inc": ["-gen-lldb-property-defs"],
447+
"Process/gdb-remote/ProcessGDBRemotePropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
448+
},
467449
tblgen = "//lldb:lldb-tblgen",
468450
td_file = "Process/gdb-remote/ProcessGDBRemoteProperties.td",
469451
deps = ["//lldb:CoreTdFiles"],
@@ -548,16 +530,10 @@ cc_library(
548530
gentbl_cc_library(
549531
name = "StructuredDataDarwinLogProperties",
550532
strip_include_prefix = "StructuredData/DarwinLog",
551-
tbl_outs = [
552-
(
553-
["-gen-lldb-property-defs"],
554-
"StructuredData/DarwinLog/StructuredDataDarwinLogProperties.inc",
555-
),
556-
(
557-
["-gen-lldb-property-enum-defs"],
558-
"StructuredData/DarwinLog/StructuredDataDarwinLogPropertiesEnum.inc",
559-
),
560-
],
533+
tbl_outs = {
534+
"StructuredData/DarwinLog/StructuredDataDarwinLogProperties.inc": ["-gen-lldb-property-defs"],
535+
"StructuredData/DarwinLog/StructuredDataDarwinLogPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
536+
},
561537
tblgen = "//lldb:lldb-tblgen",
562538
td_file = "StructuredData/DarwinLog/StructuredDataDarwinLogProperties.td",
563539
deps = ["//lldb:CoreTdFiles"],
@@ -617,16 +593,10 @@ cc_library(
617593
gentbl_cc_library(
618594
name = "PlatformQemuUserProperties",
619595
strip_include_prefix = "Platform/QemuUser",
620-
tbl_outs = [
621-
(
622-
["-gen-lldb-property-defs"],
623-
"Platform/QemuUser/PlatformQemuUserProperties.inc",
624-
),
625-
(
626-
["-gen-lldb-property-enum-defs"],
627-
"Platform/QemuUser/PlatformQemuUserPropertiesEnum.inc",
628-
),
629-
],
596+
tbl_outs = {
597+
"Platform/QemuUser/PlatformQemuUserProperties.inc": ["-gen-lldb-property-defs"],
598+
"Platform/QemuUser/PlatformQemuUserPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
599+
},
630600
tblgen = "//lldb:lldb-tblgen",
631601
td_file = "Platform/QemuUser/PlatformQemuUserProperties.td",
632602
deps = ["//lldb:CoreTdFiles"],
@@ -690,16 +660,10 @@ cc_library(
690660
gentbl_cc_library(
691661
name = "PlatformAndroidProperties",
692662
strip_include_prefix = "Platform/Android",
693-
tbl_outs = [
694-
(
695-
["-gen-lldb-property-defs"],
696-
"Platform/Android/PlatformAndroidProperties.inc",
697-
),
698-
(
699-
["-gen-lldb-property-enum-defs"],
700-
"Platform/Android/PlatformAndroidPropertiesEnum.inc",
701-
),
702-
],
663+
tbl_outs = {
664+
"Platform/Android/PlatformAndroidProperties.inc": ["-gen-lldb-property-defs"],
665+
"Platform/Android/PlatformAndroidPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
666+
},
703667
tblgen = "//lldb:lldb-tblgen",
704668
td_file = "Platform/Android/PlatformAndroidProperties.td",
705669
deps = ["//lldb:CoreTdFiles"],
@@ -902,10 +866,7 @@ cc_library(
902866
gentbl_cc_library(
903867
name = "TraceExporterCTFOptions",
904868
strip_include_prefix = "TraceExporter/ctf",
905-
tbl_outs = [(
906-
["-gen-lldb-option-defs"],
907-
"TraceExporter/ctf/TraceExporterCTFCommandOptions.inc",
908-
)],
869+
tbl_outs = {"TraceExporter/ctf/TraceExporterCTFCommandOptions.inc": ["-gen-lldb-option-defs"]},
909870
tblgen = "//lldb:lldb-tblgen",
910871
td_file = "TraceExporter/ctf/TraceExporterCTFOptions.td",
911872
deps = [
@@ -1228,16 +1189,10 @@ cc_library(
12281189
gentbl_cc_library(
12291190
name = "DynamicLoaderMacOSXDYLDProperties",
12301191
strip_include_prefix = "DynamicLoader/MacOSX-DYLD",
1231-
tbl_outs = [
1232-
(
1233-
["-gen-lldb-property-defs"],
1234-
"DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.inc",
1235-
),
1236-
(
1237-
["-gen-lldb-property-enum-defs"],
1238-
"DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinPropertiesEnum.inc",
1239-
),
1240-
],
1192+
tbl_outs = {
1193+
"DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.inc": ["-gen-lldb-property-defs"],
1194+
"DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
1195+
},
12411196
tblgen = "//lldb:lldb-tblgen",
12421197
td_file = "DynamicLoader/MacOSX-DYLD/DynamicLoaderDarwinProperties.td",
12431198
deps = ["//lldb:CoreTdFiles"],
@@ -1270,16 +1225,10 @@ cc_library(
12701225
gentbl_cc_library(
12711226
name = "DynamicLoaderDarwinKernelProperties",
12721227
strip_include_prefix = "DynamicLoader/Darwin-Kernel",
1273-
tbl_outs = [
1274-
(
1275-
["-gen-lldb-property-defs"],
1276-
"DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.inc",
1277-
),
1278-
(
1279-
["-gen-lldb-property-enum-defs"],
1280-
"DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelPropertiesEnum.inc",
1281-
),
1282-
],
1228+
tbl_outs = {
1229+
"DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.inc": ["-gen-lldb-property-defs"],
1230+
"DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
1231+
},
12831232
tblgen = "//lldb:lldb-tblgen",
12841233
td_file = "DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.td",
12851234
deps = ["//lldb:CoreTdFiles"],
@@ -1692,16 +1641,10 @@ cc_library(
16921641
gentbl_cc_library(
16931642
name = "JITLoaderGDBProperties",
16941643
strip_include_prefix = "JITLoader/GDB",
1695-
tbl_outs = [
1696-
(
1697-
["-gen-lldb-property-defs"],
1698-
"JITLoader/GDB/JITLoaderGDBProperties.inc",
1699-
),
1700-
(
1701-
["-gen-lldb-property-enum-defs"],
1702-
"JITLoader/GDB/JITLoaderGDBPropertiesEnum.inc",
1703-
),
1704-
],
1644+
tbl_outs = {
1645+
"JITLoader/GDB/JITLoaderGDBProperties.inc": ["-gen-lldb-property-defs"],
1646+
"JITLoader/GDB/JITLoaderGDBPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
1647+
},
17051648
tblgen = "//lldb:lldb-tblgen",
17061649
td_file = "JITLoader/GDB/JITLoaderGDBProperties.td",
17071650
deps = ["//lldb:CoreTdFiles"],
@@ -1748,16 +1691,10 @@ cc_library(
17481691
gentbl_cc_library(
17491692
name = "SymbolLocatorDebuginfodProperties",
17501693
strip_include_prefix = "SymbolLocator/Debuginfod",
1751-
tbl_outs = [
1752-
(
1753-
["-gen-lldb-property-defs"],
1754-
"SymbolLocator/Debuginfod/SymbolLocatorDebuginfodProperties.inc",
1755-
),
1756-
(
1757-
["-gen-lldb-property-enum-defs"],
1758-
"SymbolLocator/Debuginfod/SymbolLocatorDebuginfodPropertiesEnum.inc",
1759-
),
1760-
],
1694+
tbl_outs = {
1695+
"SymbolLocator/Debuginfod/SymbolLocatorDebuginfodProperties.inc": ["-gen-lldb-property-defs"],
1696+
"SymbolLocator/Debuginfod/SymbolLocatorDebuginfodPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
1697+
},
17611698
tblgen = "//lldb:lldb-tblgen",
17621699
td_file = "SymbolLocator/Debuginfod/SymbolLocatorDebuginfodProperties.td",
17631700
deps = ["//lldb:CoreTdFiles"],
@@ -2014,16 +1951,10 @@ cc_library(
20141951
gentbl_cc_library(
20151952
name = "ObjectFilePECOFFProperties",
20161953
strip_include_prefix = "ObjectFile/PECOFF",
2017-
tbl_outs = [
2018-
(
2019-
["-gen-lldb-property-defs"],
2020-
"ObjectFile/PECOFF/ObjectFilePECOFFProperties.inc",
2021-
),
2022-
(
2023-
["-gen-lldb-property-enum-defs"],
2024-
"ObjectFile/PECOFF/ObjectFilePECOFFPropertiesEnum.inc",
2025-
),
2026-
],
1954+
tbl_outs = {
1955+
"ObjectFile/PECOFF/ObjectFilePECOFFProperties.inc": ["-gen-lldb-property-defs"],
1956+
"ObjectFile/PECOFF/ObjectFilePECOFFPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
1957+
},
20271958
tblgen = "//lldb:lldb-tblgen",
20281959
td_file = "ObjectFile/PECOFF/ObjectFilePECOFFProperties.td",
20291960
deps = ["//lldb:CoreTdFiles"],
@@ -2225,16 +2156,10 @@ cc_library(
22252156
gentbl_cc_library(
22262157
name = "ProcessKDPProperties",
22272158
strip_include_prefix = "Process/MacOSX-Kernel",
2228-
tbl_outs = [
2229-
(
2230-
["-gen-lldb-property-defs"],
2231-
"Process/MacOSX-Kernel/ProcessKDPProperties.inc",
2232-
),
2233-
(
2234-
["-gen-lldb-property-enum-defs"],
2235-
"Process/MacOSX-Kernel/ProcessKDPPropertiesEnum.inc",
2236-
),
2237-
],
2159+
tbl_outs = {
2160+
"Process/MacOSX-Kernel/ProcessKDPProperties.inc": ["-gen-lldb-property-defs"],
2161+
"Process/MacOSX-Kernel/ProcessKDPPropertiesEnum.inc": ["-gen-lldb-property-enum-defs"],
2162+
},
22382163
tblgen = "//lldb:lldb-tblgen",
22392164
td_file = "Process/MacOSX-Kernel/ProcessKDPProperties.td",
22402165
deps = ["//lldb:CoreTdFiles"],

0 commit comments

Comments
 (0)