From 6b97dbfce2159e40d71fb69b1fe05c822c43aa90 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 11 Sep 2020 13:52:18 -0700 Subject: [vcpkg] Merge the vcpkg metadata uploader into the vcpkg binary (#13421) --- toolsrc/include/vcpkg/base/system.process.h | 2 +- toolsrc/include/vcpkg/commands.upload-metrics.h | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 toolsrc/include/vcpkg/commands.upload-metrics.h (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg/base/system.process.h b/toolsrc/include/vcpkg/base/system.process.h index 4bbcba717..e81bcfed7 100644 --- a/toolsrc/include/vcpkg/base/system.process.h +++ b/toolsrc/include/vcpkg/base/system.process.h @@ -66,7 +66,7 @@ namespace vcpkg::System #if defined(_WIN32) Environment cmd_execute_modify_env(const ZStringView cmd_line, const Environment& env = {}); - void cmd_execute_no_wait(const StringView cmd_line); + void cmd_execute_background(const StringView cmd_line); #endif ExitCodeAndOutput cmd_execute_and_capture_output(const ZStringView cmd_line, const Environment& env = {}); diff --git a/toolsrc/include/vcpkg/commands.upload-metrics.h b/toolsrc/include/vcpkg/commands.upload-metrics.h new file mode 100644 index 000000000..dcd855ffb --- /dev/null +++ b/toolsrc/include/vcpkg/commands.upload-metrics.h @@ -0,0 +1,22 @@ +#pragma once + +#if !VCPKG_DISABLE_METRICS && defined(_WIN32) +#define VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND 1 +#else +#define VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND 0 +#endif // !VCPKG_DISABLE_METRICS && defined(_WIN32) + +#if VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND + +#include + +namespace vcpkg::Commands::UploadMetrics +{ + extern const CommandStructure COMMAND_STRUCTURE; + struct UploadMetricsCommand : BasicCommand + { + virtual void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem& fs) const override; + }; +} + +#endif // VCPKG_ENABLE_X_UPLOAD_METRICS_COMMAND -- cgit v1.2.3