aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-09-21 23:54:23 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-09-21 23:54:23 -0700
commit97b79e1f0c2c7e0e9ef2346c5b32b98e42a00155 (patch)
tree8f86b524b9e2aebf8a1d083fa98169b549985464
parentaeab2fee872f38189d069cf60da1e45c4dbf13bd (diff)
downloadvcpkg-97b79e1f0c2c7e0e9ef2346c5b32b98e42a00155.tar.gz
vcpkg-97b79e1f0c2c7e0e9ef2346c5b32b98e42a00155.zip
Place command_list() in a separate cpp file
-rw-r--r--toolsrc/src/commands_list.cpp32
-rw-r--r--toolsrc/src/commands_other.cpp26
-rw-r--r--toolsrc/vcpkg/vcpkg.vcxproj1
-rw-r--r--toolsrc/vcpkg/vcpkg.vcxproj.filters3
4 files changed, 36 insertions, 26 deletions
diff --git a/toolsrc/src/commands_list.cpp b/toolsrc/src/commands_list.cpp
new file mode 100644
index 000000000..2969ea953
--- /dev/null
+++ b/toolsrc/src/commands_list.cpp
@@ -0,0 +1,32 @@
+#include "vcpkg_Commands.h"
+#include "vcpkg.h"
+#include "vcpkg_System.h"
+
+namespace vcpkg
+{
+ void list_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
+ {
+ args.check_max_args(0);
+
+ std::vector<std::string> packages_output;
+ for (auto&& pgh : database_load_check(paths))
+ {
+ if (pgh->state == install_state_t::not_installed && pgh->want == want_t::purge)
+ continue;
+ packages_output.push_back(Strings::format("%-27s %-16s %s",
+ pgh->package.displayname(),
+ pgh->package.version,
+ shorten_description(pgh->package.description)));
+ }
+ std::sort(packages_output.begin(), packages_output.end());
+ for (auto&& package : packages_output)
+ {
+ System::println(package.c_str());
+ }
+ if (packages_output.empty())
+ {
+ System::println("No packages are installed. Did you mean `search`?");
+ }
+ exit(EXIT_SUCCESS);
+ }
+}
diff --git a/toolsrc/src/commands_other.cpp b/toolsrc/src/commands_other.cpp
index a8192691d..a4f644c11 100644
--- a/toolsrc/src/commands_other.cpp
+++ b/toolsrc/src/commands_other.cpp
@@ -95,32 +95,6 @@ namespace vcpkg
exit(System::cmd_execute(cmdline));
}
- void list_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
- {
- args.check_max_args(0);
-
- std::vector<std::string> packages_output;
- for (auto&& pgh : database_load_check(paths))
- {
- if (pgh->state == install_state_t::not_installed && pgh->want == want_t::purge)
- continue;
- packages_output.push_back(Strings::format("%-27s %-16s %s",
- pgh->package.displayname(),
- pgh->package.version,
- shorten_description(pgh->package.description)));
- }
- std::sort(packages_output.begin(), packages_output.end());
- for (auto&& package : packages_output)
- {
- System::println(package.c_str());
- }
- if (packages_output.empty())
- {
- System::println("No packages are installed. Did you mean `search`?");
- }
- exit(EXIT_SUCCESS);
- }
-
void import_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
{
if (args.command_arguments.size() != 3)
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj
index 70c1a96ef..c20d5e7ce 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_list.cpp" />
<ClCompile Include="..\src\commands_remove.cpp" />
<ClCompile Include="..\src\commands_search.cpp" />
<ClCompile Include="..\src\commands_update.cpp" />
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/vcpkg/vcpkg.vcxproj.filters
index 4511c989c..ac0d188a0 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj.filters
+++ b/toolsrc/vcpkg/vcpkg.vcxproj.filters
@@ -51,6 +51,9 @@
<ClCompile Include="..\src\commands_update.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\src\commands_list.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\include\post_build_lint.h">