diff options
author | Nico Weber <thakis@chromium.org> | 2015-03-24 21:16:07 (GMT) |
---|---|---|
committer | Nico Weber <thakis@chromium.org> | 2015-03-24 22:26:48 (GMT) |
commit | 92b74c340ab6397cb728391995f86dfdb39bb186 (patch) | |
tree | 4c27f44479075415dbc6fcf656cae8ce4727f20a /src/ninja.cc | |
parent | 6bac2fba25df89df748c44de1d9d3b9f546d3aac (diff) | |
download | Ninja-92b74c340ab6397cb728391995f86dfdb39bb186.zip Ninja-92b74c340ab6397cb728391995f86dfdb39bb186.tar.gz Ninja-92b74c340ab6397cb728391995f86dfdb39bb186.tar.bz2 |
Add an opt-in flag to make duplicate edges an error (`-w dupbuild=err`).
This is step 1 on #931. Duplicated edges will become an error by default in
the future.
Diffstat (limited to 'src/ninja.cc')
-rw-r--r-- | src/ninja.cc | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index 4987bb2..1e43137 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -64,6 +64,9 @@ struct Options { /// Tool to run rather than building. const Tool* tool; + + /// Whether duplicate rules for one target should warn or print an error. + bool dupe_edges_should_err; }; /// The Ninja main() loads up a series of data structures; various tools need @@ -199,7 +202,8 @@ void Usage(const BuildConfig& config) { "\n" " -d MODE enable debugging (use -d list to list modes)\n" " -t TOOL run a subtool (use -t list to list subtools)\n" -" terminates toplevel options; further flags are passed to the tool\n", +" terminates toplevel options; further flags are passed to the tool\n" +" -w FLAG adjust warnings (use -w list to list warnings)\n", kNinjaVersion, config.parallelism); } @@ -792,6 +796,32 @@ bool DebugEnable(const string& name) { } } +/// Set a warning flag. Returns false if Ninja should exit instead of +/// continuing. +bool WarningEnable(const string& name, Options* options) { + if (name == "list") { + printf("warning flags:\n" +" dupbuild={err,warn} multiple build lines for one target\n"); + return false; + } else if (name == "dupbuild=err") { + options->dupe_edges_should_err = true; + return true; + } else if (name == "dupbuild=warn") { + options->dupe_edges_should_err = false; + return true; + } else { + const char* suggestion = + SpellcheckString(name.c_str(), "dupbuild=err", "dupbuild=warn", NULL); + if (suggestion) { + Error("unknown warning flag '%s', did you mean '%s'?", + name.c_str(), suggestion); + } else { + Error("unknown warning flag '%s'", name.c_str()); + } + return false; + } +} + bool NinjaMain::OpenBuildLog(bool recompact_only) { string log_path = ".ninja_log"; if (!build_dir_.empty()) @@ -962,7 +992,7 @@ int ReadFlags(int* argc, char*** argv, int opt; while (!options->tool && - (opt = getopt_long(*argc, *argv, "d:f:j:k:l:nt:vC:h", kLongOptions, + (opt = getopt_long(*argc, *argv, "d:f:j:k:l:nt:vw:C:h", kLongOptions, NULL)) != -1) { switch (opt) { case 'd': @@ -1011,6 +1041,10 @@ int ReadFlags(int* argc, char*** argv, case 'v': config->verbosity = BuildConfig::VERBOSE; break; + case 'w': + if (!WarningEnable(optarg, options)) + return 1; + break; case 'C': options->working_dir = optarg; break; @@ -1067,7 +1101,8 @@ int real_main(int argc, char** argv) { NinjaMain ninja(ninja_command, config); RealFileReader file_reader; - ManifestParser parser(&ninja.state_, &file_reader); + ManifestParser parser(&ninja.state_, &file_reader, + options.dupe_edges_should_err); string err; if (!parser.Load(options.input_file, &err)) { Error("%s", err.c_str()); |