Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg] Merge the vcpkg metadata uploader into the vcpkg binary #13421

Merged
merged 11 commits into from
Sep 11, 2020

Conversation

BillyONeal
Copy link
Member

…, so that we need sign only one binary.

@BillyONeal BillyONeal added category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team. labels Sep 9, 2020
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to see the ifdef solution rather than the REMOVE_ITEM solution, because I think it's cleaner.

toolsrc/CMakeLists.txt Outdated Show resolved Hide resolved
toolsrc/src/vcpkg-test/commands.cpp Outdated Show resolved Hide resolved
toolsrc/src/vcpkg/commands.upload-metrics.cpp Show resolved Hide resolved
toolsrc/src/vcpkg/metrics.cpp Outdated Show resolved Hide resolved
@@ -469,6 +469,8 @@ namespace vcpkg
STARTUPINFOW startup_info;
memset(&startup_info, 0, sizeof(STARTUPINFOW));
startup_info.cb = sizeof(STARTUPINFOW);
startup_info.dwFlags = STARTF_USESHOWWINDOW;
startup_info.wShowWindow = SW_HIDE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we always want these flags?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we do but the bits could be renamed to be clearer, will fix.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does my rename resolve your concern?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very much, thanks!

Commands::Version::VersionCommand version{};
}
template<class CommandListT, size_t ExpectedCount>
void check_all_commands(const CommandListT& actual_commands, const char* const (&expected_commands)[ExpectedCount])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: take std::initializer_list<StringLiteral> as the second argument.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that's an improvement: initializer_list exists to be the thing that controls constructor overload resolution; using it for any other purpose just encourages use after free bugs when people treat it like a container instead of a pointer to a temporary array.

@@ -469,6 +469,8 @@ namespace vcpkg
STARTUPINFOW startup_info;
memset(&startup_info, 0, sizeof(STARTUPINFOW));
startup_info.cb = sizeof(STARTUPINFOW);
startup_info.dwFlags = STARTF_USESHOWWINDOW;
startup_info.wShowWindow = SW_HIDE;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very much, thanks!

@BillyONeal BillyONeal merged commit 6b97dbf into microsoft:master Sep 11, 2020
@BillyONeal BillyONeal deleted the burninate_metadata_uploader branch September 11, 2020 20:52
strega-nil pushed a commit to strega-nil/vcpkg that referenced this pull request May 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants