[vcpkg-env] Added internal 'env' command to help diagnose environment issues.

3 files changed, 26 insertions, 1 deletions

diff --git a/toolsrc/src/commands_available_commands.cpp b/toolsrc/src/commands_available_commands.cpp
index 4c7e0df2c..70e528704 100644
--- a/toolsrc/src/commands_available_commands.cpp
+++ b/toolsrc/src/commands_available_commands.cpp
@@ -10,6 +10,7 @@ namespace vcpkg::Commands
             { "ci", &CI::perform_and_exit },
             {"remove", &Remove::perform_and_exit},
             {"build", &Build::perform_and_exit},
+            {"env", &Env::perform_and_exit},
             {"build_external", &BuildExternal::perform_and_exit}
         };
         return t;
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index 8791ef1c1..3c3fbeb66 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -25,6 +25,13 @@ namespace vcpkg::Commands::Build
         std::ofstream(binary_control_file) << bpgh;
     }
 
+    std::wstring make_build_env_cmd(const triplet& target_triplet, const toolset_t& toolset)
+    {
+        return Strings::wformat(LR"("%s" %s >nul 2>&1)",
+            toolset.vcvarsall.native(),
+            Strings::utf8_to_utf16(target_triplet.architecture()));
+    }
+
     BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db)
     {
         Checks::check_exit(VCPKG_LINE_INFO, spec.name() == source_paragraph.name, "inconsistent arguments to build_package()");
@@ -43,7 +50,7 @@ namespace vcpkg::Commands::Build
 
         const fs::path ports_cmake_script_path = paths.ports_cmake;
         const toolset_t& toolset = paths.get_toolset();
-        const std::wstring cmd_set_environment = Strings::wformat(LR"("%s" %s >nul 2>&1)", toolset.vcvarsall.native(), Strings::utf8_to_utf16(target_triplet.architecture()));
+        const auto cmd_set_environment = make_build_env_cmd(target_triplet, toolset);
 
         const std::wstring cmd_launch_cmake = make_cmake_cmd(cmake_exe_path, ports_cmake_script_path,
                                                              {
diff --git a/toolsrc/src/commands_env.cpp b/toolsrc/src/commands_env.cpp
new file mode 100644
index 000000000..314afb779
--- /dev/null
+++ b/toolsrc/src/commands_env.cpp
@@ -0,0 +1,17 @@
+#include "pch.h"
+#include "vcpkg_Commands.h"
+#include "vcpkg_System.h"
+
+namespace vcpkg::Commands::Env
+{
+    void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_triplet)
+    {
+        static const std::string example = Commands::Help::create_example_string(R"(env --triplet x64-windows)");
+        args.check_exact_arg_count(0, example);
+        args.check_and_get_optional_command_arguments({});
+
+        System::cmd_execute_clean(Build::make_build_env_cmd(default_triplet, paths.get_toolset()) + L" && cmd");
+
+        Checks::exit_success(VCPKG_LINE_INFO);
+    }
+}