mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-15 20:46:37 +08:00
cmScanDepFormat: Fix name of our internal tool in parse errors
We parse the scan result `.ddi` files in `-E cmake_ninja_dyndep`, not `-E cmake_ninja_depends`.
This commit is contained in:
@@ -55,9 +55,8 @@ static Json::Value EncodeFilename(std::string const& path)
|
|||||||
#define PARSE_BLOB(val, res) \
|
#define PARSE_BLOB(val, res) \
|
||||||
do { \
|
do { \
|
||||||
if (!ParseFilename(val, res)) { \
|
if (!ParseFilename(val, res)) { \
|
||||||
cmSystemTools::Error( \
|
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ", \
|
||||||
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp, \
|
arg_pp, ": invalid blob")); \
|
||||||
": invalid blob")); \
|
|
||||||
return false; \
|
return false; \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
@@ -65,9 +64,8 @@ static Json::Value EncodeFilename(std::string const& path)
|
|||||||
#define PARSE_FILENAME(val, res) \
|
#define PARSE_FILENAME(val, res) \
|
||||||
do { \
|
do { \
|
||||||
if (!ParseFilename(val, res)) { \
|
if (!ParseFilename(val, res)) { \
|
||||||
cmSystemTools::Error( \
|
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ", \
|
||||||
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp, \
|
arg_pp, ": invalid filename")); \
|
||||||
": invalid filename")); \
|
|
||||||
return false; \
|
return false; \
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
@@ -84,7 +82,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
|
|||||||
{
|
{
|
||||||
Json::Reader reader;
|
Json::Reader reader;
|
||||||
if (!reader.parse(ppf, ppio, false)) {
|
if (!reader.parse(ppf, ppio, false)) {
|
||||||
cmSystemTools::Error(cmStrCat("-E cmake_ninja_depends failed to parse ",
|
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
|
||||||
arg_pp,
|
arg_pp,
|
||||||
reader.getFormattedErrorMessages()));
|
reader.getFormattedErrorMessages()));
|
||||||
return false;
|
return false;
|
||||||
@@ -93,7 +91,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
|
|||||||
|
|
||||||
Json::Value const& version = ppi["version"];
|
Json::Value const& version = ppi["version"];
|
||||||
if (version.asUInt() != 0) {
|
if (version.asUInt() != 0) {
|
||||||
cmSystemTools::Error(cmStrCat("-E cmake_ninja_depends failed to parse ",
|
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
|
||||||
arg_pp, ": version ", version.asString()));
|
arg_pp, ": version ", version.asString()));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -101,7 +99,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
|
|||||||
Json::Value const& rules = ppi["rules"];
|
Json::Value const& rules = ppi["rules"];
|
||||||
if (rules.isArray()) {
|
if (rules.isArray()) {
|
||||||
if (rules.size() != 1) {
|
if (rules.size() != 1) {
|
||||||
cmSystemTools::Error(cmStrCat("-E cmake_ninja_depends failed to parse ",
|
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
|
||||||
arg_pp, ": expected 1 source entry"));
|
arg_pp, ": expected 1 source entry"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -109,9 +107,9 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
|
|||||||
for (auto const& rule : rules) {
|
for (auto const& rule : rules) {
|
||||||
Json::Value const& workdir = rule["work-directory"];
|
Json::Value const& workdir = rule["work-directory"];
|
||||||
if (!workdir.isString()) {
|
if (!workdir.isString()) {
|
||||||
cmSystemTools::Error(
|
cmSystemTools::Error(cmStrCat("-E cmake_ninja_dyndep failed to parse ",
|
||||||
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp,
|
arg_pp,
|
||||||
": work-directory is not a string"));
|
": work-directory is not a string"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
std::string work_directory;
|
std::string work_directory;
|
||||||
@@ -134,7 +132,7 @@ bool cmScanDepFormat_P1689_Parse(std::string const& arg_pp, cmSourceInfo* info)
|
|||||||
if (outputs.isArray()) {
|
if (outputs.isArray()) {
|
||||||
if (outputs.empty()) {
|
if (outputs.empty()) {
|
||||||
cmSystemTools::Error(
|
cmSystemTools::Error(
|
||||||
cmStrCat("-E cmake_ninja_depends failed to parse ", arg_pp,
|
cmStrCat("-E cmake_ninja_dyndep failed to parse ", arg_pp,
|
||||||
": expected at least one 1 output"));
|
": expected at least one 1 output"));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user