Add PDBs and crashpad_handler to installed files during full service install

1 files changed, 24 insertions, 11 deletions

diff --git a/src/zen/cmds/service_cmd.cpp b/src/zen/cmds/service_cmd.cpp
index f88e39c7f..b3f64e99f 100644
--- a/src/zen/cmds/service_cmd.cpp
+++ b/src/zen/cmds/service_cmd.cpp
@@ -428,7 +428,22 @@ ServiceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 				throw zen::OptionParseException("--full requires --install-path to be specified");
 			}
 
-			std::filesystem::path ExePath				= zen::GetRunningExecutablePath();
+			std::filesystem::path ExePath = zen::GetRunningExecutablePath();
+
+			std::filesystem::path FilesToCopy[] = {
+				ExePath,
+				m_ServerExecutable,
+#if ZEN_PLATFORM_WINDOWS
+				ExePath.replace_extension("pdb"),
+				m_ServerExecutable.replace_extension("pdb"),
+				ExePath
+					.replace_filename("crashpad_handler.exe")
+#endif
+#if ZEN_PLATFORM_MAC
+						ExePath.replace_filename("crashpad_handler")
+#endif
+			};
+
 			std::filesystem::path DestinationExePath	= m_InstallPath / ExePath.filename();
 			std::filesystem::path DestinationServerPath = m_InstallPath / m_ServerExecutable.filename();
 
@@ -438,19 +453,17 @@ ServiceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
 				return 1;
 			}
 
-			if (!CopyFile(ExePath, DestinationExePath, {}))
-			{
-				ZEN_CONSOLE("Unable to copy executable from '{}' to '{}'", ExePath, DestinationExePath);
-				return 1;
-			}
-
-			if (!CopyFile(m_ServerExecutable, DestinationServerPath, {}))
+			for (const std::filesystem::path& File : FilesToCopy)
 			{
-				ZEN_CONSOLE("Unable to copy server executable from '{}' to '{}'", m_ServerExecutable, DestinationServerPath);
-				return 1;
+				std::filesystem::path Destination = m_InstallPath / File.filename();
+				if (!CopyFile(File, Destination, {}))
+				{
+					ZEN_CONSOLE("Failed to copy '{}' to '{}'", File, Destination);
+					return 1;
+				}
 			}
 
-			m_ServerExecutable = DestinationServerPath;
+			m_ServerExecutable = m_InstallPath / m_ServerExecutable.filename();
 		}
 
 		Ec = InstallService(