Place import_command() in a separate cpp file

4 files changed, 34 insertions, 26 deletions

diff --git a/toolsrc/src/commands_import.cpp b/toolsrc/src/commands_import.cpp
new file mode 100644
index 000000000..b1eae277c
--- /dev/null
+++ b/toolsrc/src/commands_import.cpp
@@ -0,0 +1,30 @@
+#include "vcpkg_Commands.h"
+#include "vcpkg.h"
+#include "vcpkg_System.h"
+
+namespace vcpkg
+{
+    void import_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
+    {
+        if (args.command_arguments.size() != 3)
+        {
+            System::println(System::color::error, "Error: %s requires 3 parameters", args.command);
+            print_example(Strings::format(R"(%s C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)", args.command).c_str());
+            exit(EXIT_FAILURE);
+        }
+
+        const fs::path control_file_path(args.command_arguments[0]);
+        const fs::path include_directory(args.command_arguments[1]);
+        const fs::path project_directory(args.command_arguments[2]);
+
+        auto pghs = get_paragraphs(control_file_path);
+        Checks::check_throw(pghs.size() == 1, "Invalid control file for package");
+
+        StatusParagraph spgh;
+        spgh.package = BinaryParagraph(pghs[0]);
+        auto& control_file_data = spgh.package;
+
+        vcpkg::binary_import(paths, include_directory, project_directory, control_file_data);
+        exit(EXIT_SUCCESS);
+    }
+}
diff --git a/toolsrc/src/commands_other.cpp b/toolsrc/src/commands_other.cpp
index 0c56e0f79..be89d539f 100644
--- a/toolsrc/src/commands_other.cpp
+++ b/toolsrc/src/commands_other.cpp
@@ -1,8 +1,6 @@
 #include "vcpkg_Commands.h"
 #include <iostream>
 #include "vcpkg.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Files.h"
 
 namespace vcpkg
 {
@@ -49,30 +47,6 @@ namespace vcpkg
             "  vcpkg " << command_and_arguments << "\n";
     }
 
-    void import_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths)
-    {
-        if (args.command_arguments.size() != 3)
-        {
-            System::println(System::color::error, "Error: %s requires 3 parameters", args.command);
-            print_example(Strings::format(R"(%s C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)", args.command).c_str());
-            exit(EXIT_FAILURE);
-        }
-
-        const fs::path control_file_path(args.command_arguments[0]);
-        const fs::path include_directory(args.command_arguments[1]);
-        const fs::path project_directory(args.command_arguments[2]);
-
-        auto pghs = get_paragraphs(control_file_path);
-        Checks::check_throw(pghs.size() == 1, "Invalid control file for package");
-
-        StatusParagraph spgh;
-        spgh.package = BinaryParagraph(pghs[0]);
-        auto& control_file_data = spgh.package;
-
-        vcpkg::binary_import(paths, include_directory, project_directory, control_file_data);
-        exit(EXIT_SUCCESS);
-    }
-
     void internal_test_command(const vcpkg_cmd_arguments& /*args*/, const vcpkg_paths& /*paths*/)
     {
         //        auto data = FormatEventData("test");
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj b/toolsrc/vcpkg/vcpkg.vcxproj
index 899ea2e5e..065d1b9c5 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj
+++ b/toolsrc/vcpkg/vcpkg.vcxproj
@@ -131,6 +131,7 @@
     <ClCompile Include="..\src\commands_cache.cpp" />
     <ClCompile Include="..\src\commands_create.cpp" />
     <ClCompile Include="..\src\commands_edit.cpp" />
+    <ClCompile Include="..\src\commands_import.cpp" />
     <ClCompile Include="..\src\commands_list.cpp" />
     <ClCompile Include="..\src\commands_owns.cpp" />
     <ClCompile Include="..\src\commands_remove.cpp" />
diff --git a/toolsrc/vcpkg/vcpkg.vcxproj.filters b/toolsrc/vcpkg/vcpkg.vcxproj.filters
index e31b53d6c..95aa0ceb7 100644
--- a/toolsrc/vcpkg/vcpkg.vcxproj.filters
+++ b/toolsrc/vcpkg/vcpkg.vcxproj.filters
@@ -63,6 +63,9 @@
     <ClCompile Include="..\src\commands_owns.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\commands_import.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\include\post_build_lint.h">