diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-22 00:00:38 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-22 00:00:38 -0700 |
| commit | e3a9d3524b33c75b6a97081fc2b71b3e84e249b5 (patch) | |
| tree | aa9768dbdb9747021f1736ce9f99a981cd7da77b | |
| parent | 97b79e1f0c2c7e0e9ef2346c5b32b98e42a00155 (diff) | |
| download | vcpkg-e3a9d3524b33c75b6a97081fc2b71b3e84e249b5.tar.gz vcpkg-e3a9d3524b33c75b6a97081fc2b71b3e84e249b5.zip | |
Place list_command() in a separate cpp file
| -rw-r--r-- | toolsrc/src/commands_edit.cpp | 21 | ||||
| -rw-r--r-- | toolsrc/src/commands_other.cpp | 16 | ||||
| -rw-r--r-- | toolsrc/vcpkg/vcpkg.vcxproj | 1 | ||||
| -rw-r--r-- | toolsrc/vcpkg/vcpkg.vcxproj.filters | 3 |
4 files changed, 25 insertions, 16 deletions
diff --git a/toolsrc/src/commands_edit.cpp b/toolsrc/src/commands_edit.cpp new file mode 100644 index 000000000..71ae8b2c8 --- /dev/null +++ b/toolsrc/src/commands_edit.cpp @@ -0,0 +1,21 @@ +#include "vcpkg_Commands.h" +#include "vcpkg_System.h" + +namespace vcpkg +{ + void edit_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) + { + static auto example = "edit zlib"; + args.check_max_args(1, example); + package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet, example).at(0); + + // Find editor + std::wstring env_EDITOR = System::wdupenv_str(L"EDITOR"); + if (env_EDITOR.empty()) + env_EDITOR = LR"(C:\Program Files (x86)\Microsoft VS Code\Code.exe)"; + + auto portpath = paths.ports / spec.name; + std::wstring cmdLine = Strings::format(LR"("%s" "%s" "%s")", env_EDITOR, portpath.native(), (portpath / "portfile.cmake").native()); + exit(System::cmd_execute(cmdLine)); + } +} diff --git a/toolsrc/src/commands_other.cpp b/toolsrc/src/commands_other.cpp index a4f644c11..444eff1c0 100644 --- a/toolsrc/src/commands_other.cpp +++ b/toolsrc/src/commands_other.cpp @@ -50,22 +50,6 @@ namespace vcpkg " vcpkg " << command_and_arguments << "\n"; } - void edit_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) - { - static auto example = "edit zlib"; - args.check_max_args(1, example); - package_spec spec = args.parse_all_arguments_as_package_specs(default_target_triplet, example).at(0); - - // Find editor - std::wstring env_EDITOR = System::wdupenv_str(L"EDITOR"); - if (env_EDITOR.empty()) - env_EDITOR = LR"(C:\Program Files (x86)\Microsoft VS Code\Code.exe)"; - - auto portpath = paths.ports / spec.name; - std::wstring cmdLine = Strings::format(LR"("%s" "%s" "%s")", env_EDITOR, portpath.native(), (portpath / "portfile.cmake").native()); - exit(System::cmd_execute(cmdLine)); - } - void create_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet) { args.check_max_args(3); diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj index c20d5e7ce..0a69df78f 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj +++ b/toolsrc/vcpkg/vcpkg.vcxproj @@ -129,6 +129,7 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\src\commands_cache.cpp" /> + <ClCompile Include="..\src\commands_edit.cpp" /> <ClCompile Include="..\src\commands_list.cpp" /> <ClCompile Include="..\src\commands_remove.cpp" /> <ClCompile Include="..\src\commands_search.cpp" /> diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/vcpkg/vcpkg.vcxproj.filters index ac0d188a0..6601935da 100644 --- a/toolsrc/vcpkg/vcpkg.vcxproj.filters +++ b/toolsrc/vcpkg/vcpkg.vcxproj.filters @@ -54,6 +54,9 @@ <ClCompile Include="..\src\commands_list.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\commands_edit.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\include\post_build_lint.h"> |