mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 18:32:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Format JSON output of x-add-version to minimize diffs (#15664)

Browse Source 
* Fix output json file format

* Add instructions to fix missing versions file
This commit is contained in:
Victor Romero 2021-01-15 00:04:28 -08:00 committed by GitHub
parent 0e46f931b0
commit a8e97d4a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolsrc/src/vcpkg/commands.add-version.cpp
View File

@ -97,7 +97,8 @@ namespace
} }
std::error_code ec; std::error_code ec;
fs.write_contents(output_path, Json::stringify(serialize_baseline(baseline_map), {}), ec); fs.write_contents(
output_path, Json::stringify(serialize_baseline(baseline_map), Json::JsonStyle::with_spaces(2)), ec);
if (ec) if (ec)
{ {
System::printf( System::printf(
@ -127,7 +128,8 @@ namespace
std::error_code ec; std::error_code ec;
fs.create_directories(output_path.parent_path(), VCPKG_LINE_INFO); fs.create_directories(output_path.parent_path(), VCPKG_LINE_INFO);
fs.write_contents(output_path, Json::stringify(serialize_versions(versions), {}), ec); fs.write_contents(
output_path, Json::stringify(serialize_versions(versions), Json::JsonStyle::with_spaces(2)), ec);
if (ec) if (ec)
{ {
System::printf( System::printf(

8
toolsrc/src/vcpkg/commands.civerifyversions.cpp
View File

@ -373,9 +373,13 @@ namespace vcpkg::Commands::CIVerifyVersions
{ {
System::printf(System::Color::error, "FAIL: %s\n", port_name); System::printf(System::Color::error, "FAIL: %s\n", port_name);
errors.emplace(Strings::format("Error: While validating port %s.\n" errors.emplace(Strings::format("Error: While validating port %s.\n"
" Missing expected versions file at: %s", " Missing expected versions file at: %s\n"
" Run:\n\n"
" vcpkg x-add-version %s\n\n"
" to create the versions file.",
port_name, port_name,
fs::u8string(versions_file_path))); fs::u8string(versions_file_path),
port_name));
continue; continue;
} }