Allow 'ninja -t compdb' accept targets #2319

csmoe · 2023-08-30T15:51:52Z

Fix #1544

Cherry-picked #1546 and addressed the comments.
May I have your code review @jhasse ? Thanks

src/ninja.cc

Test: ./ninja -t compdb --target wrong_target (fail) ./ninja -t compdb --target test_target (empty due to lack of rules) ./ninja -t compdb --target ninja,ninja_test cc cxx (ok) ./ninja -t compdb --target test_target cc cxx (ok) ./ninja -t compdb cxx (ok, regression test) ./ninja ninja_test && ./ninja_test (passed) Co-authored-by: Linkun Chen <[email protected]> Co-authored-by: csmoe <[email protected]>

csmoe · 2024-01-28T13:16:54Z

@digit-google thanks for your comments, they're addressed.

digit-google · 2024-02-13T12:59:25Z

This looks good to me, but will require @jhasse 's approval.

Can I ask you to add some regression test in misc/output_test.py for this feature though?

jhasse

Thanks for having another go at this :)

jhasse · 2024-02-13T13:07:00Z

src/ninja.cc

- for (vector<Edge*>::iterator e = state_.edges_.begin();
- e != state_.edges_.end(); ++e) {
- if ((*e)->inputs_.empty())
+ for (Edge* e: edges_to_process) {


Please add a space before : (or does our .clang-format suggest otherwise?).

jhasse · 2024-02-13T13:07:54Z

src/ninja.cc

+ return 1;
+ }
+ }
+ if (user_interested_edges.size() > 0) {


Please use !user_interested_edges.empty() instead.

jhasse · 2024-02-13T13:08:42Z

src/ninja.cc

@@ -920,19 +949,51 @@ int NinjaMain::ToolCompilationDatabase(const Options* options, int argc,

 optind = 1;
 int opt;
- while ((opt = getopt(argc, argv, const_cast<char*>("hx"))) != -1) {
+ const option long_options[] = {
+ {"target", required_argument, NULL, 't'},


Please use nullptr instead of NULL.

jhasse · 2024-02-13T13:10:39Z

src/ninja.cc

+ };
+
+ std::vector<Edge*> edges_to_process = state_.edges_;
+ while ((opt = getopt_long(argc, argv, "x:", long_options, NULL)) != -1) {


Why "x:" instead of "hx"?

jhasse · 2024-02-13T13:11:28Z

src/ninja.cc

@@ -17,6 +17,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sstream>
+#include <set>
+#include <assert.h>


Please use #include <cassert> instead.

csmoe force-pushed the compdb-target branch 6 times, most recently from 3eb2357 to 96ebb17 Compare August 30, 2023 16:13

jhasse reviewed Sep 4, 2023

View reviewed changes