From 954debf2358a63dec582cba9da3259238e8a8905 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 19 Sep 2014 10:10:45 +0200 Subject: [PATCH] Build fix for Linux --- agent/CMakeLists.txt | 4 ++-- .../.gitignore | 0 .../AgentWizard.Designer.cs | 0 .../AgentWizard.cs | 0 .../AgentWizard.resx | 0 .../App.config | 0 .../Icinga2SetupAgent.csproj | 0 .../Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../app.manifest | 0 .../icinga-banner.png | Bin .../icinga.ico | Bin .../tar-cs/COPYING | 0 .../tar-cs/ITarHeader.cs | 0 .../tar-cs/TarException.cs | 0 .../tar-cs/TarHeader.cs | 0 .../tar-cs/TarReader.cs | 0 .../tar-cs/UsTarHeader.cs | 0 22 files changed, 2 insertions(+), 2 deletions(-) rename agent/{icinga2-setup-agent => windows-setup-agent}/.gitignore (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/AgentWizard.Designer.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/AgentWizard.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/AgentWizard.resx (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/App.config (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Icinga2SetupAgent.csproj (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Program.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Properties/AssemblyInfo.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Properties/Resources.Designer.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Properties/Resources.resx (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Properties/Settings.Designer.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/Properties/Settings.settings (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/app.manifest (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/icinga-banner.png (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/icinga.ico (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/tar-cs/COPYING (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/tar-cs/ITarHeader.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/tar-cs/TarException.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/tar-cs/TarHeader.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/tar-cs/TarReader.cs (100%) rename agent/{icinga2-setup-agent => windows-setup-agent}/tar-cs/UsTarHeader.cs (100%) diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt index b60318da4..23a37fdb3 100644 --- a/agent/CMakeLists.txt +++ b/agent/CMakeLists.txt @@ -32,12 +32,12 @@ endif() if(MSVC) include_external_msproject( icinga2setupagent - ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/Icinga2SetupAgent.csproj + ${CMAKE_CURRENT_SOURCE_DIR}/windows-setup-agent/Icinga2SetupAgent.csproj TYPE FAE04EC0-301F-11D3-BF4B-00C04F79EFBC ) install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/icinga2-setup-agent/bin/\${CMAKE_INSTALL_CONFIG_NAME}/Icinga2SetupAgent.exe + FILES ${CMAKE_CURRENT_SOURCE_DIR}/windows-setup-agent/bin/\${CMAKE_INSTALL_CONFIG_NAME}/Icinga2SetupAgent.exe DESTINATION ${CMAKE_INSTALL_SBINDIR} ) endif() diff --git a/agent/icinga2-setup-agent/.gitignore b/agent/windows-setup-agent/.gitignore similarity index 100% rename from agent/icinga2-setup-agent/.gitignore rename to agent/windows-setup-agent/.gitignore diff --git a/agent/icinga2-setup-agent/AgentWizard.Designer.cs b/agent/windows-setup-agent/AgentWizard.Designer.cs similarity index 100% rename from agent/icinga2-setup-agent/AgentWizard.Designer.cs rename to agent/windows-setup-agent/AgentWizard.Designer.cs diff --git a/agent/icinga2-setup-agent/AgentWizard.cs b/agent/windows-setup-agent/AgentWizard.cs similarity index 100% rename from agent/icinga2-setup-agent/AgentWizard.cs rename to agent/windows-setup-agent/AgentWizard.cs diff --git a/agent/icinga2-setup-agent/AgentWizard.resx b/agent/windows-setup-agent/AgentWizard.resx similarity index 100% rename from agent/icinga2-setup-agent/AgentWizard.resx rename to agent/windows-setup-agent/AgentWizard.resx diff --git a/agent/icinga2-setup-agent/App.config b/agent/windows-setup-agent/App.config similarity index 100% rename from agent/icinga2-setup-agent/App.config rename to agent/windows-setup-agent/App.config diff --git a/agent/icinga2-setup-agent/Icinga2SetupAgent.csproj b/agent/windows-setup-agent/Icinga2SetupAgent.csproj similarity index 100% rename from agent/icinga2-setup-agent/Icinga2SetupAgent.csproj rename to agent/windows-setup-agent/Icinga2SetupAgent.csproj diff --git a/agent/icinga2-setup-agent/Program.cs b/agent/windows-setup-agent/Program.cs similarity index 100% rename from agent/icinga2-setup-agent/Program.cs rename to agent/windows-setup-agent/Program.cs diff --git a/agent/icinga2-setup-agent/Properties/AssemblyInfo.cs b/agent/windows-setup-agent/Properties/AssemblyInfo.cs similarity index 100% rename from agent/icinga2-setup-agent/Properties/AssemblyInfo.cs rename to agent/windows-setup-agent/Properties/AssemblyInfo.cs diff --git a/agent/icinga2-setup-agent/Properties/Resources.Designer.cs b/agent/windows-setup-agent/Properties/Resources.Designer.cs similarity index 100% rename from agent/icinga2-setup-agent/Properties/Resources.Designer.cs rename to agent/windows-setup-agent/Properties/Resources.Designer.cs diff --git a/agent/icinga2-setup-agent/Properties/Resources.resx b/agent/windows-setup-agent/Properties/Resources.resx similarity index 100% rename from agent/icinga2-setup-agent/Properties/Resources.resx rename to agent/windows-setup-agent/Properties/Resources.resx diff --git a/agent/icinga2-setup-agent/Properties/Settings.Designer.cs b/agent/windows-setup-agent/Properties/Settings.Designer.cs similarity index 100% rename from agent/icinga2-setup-agent/Properties/Settings.Designer.cs rename to agent/windows-setup-agent/Properties/Settings.Designer.cs diff --git a/agent/icinga2-setup-agent/Properties/Settings.settings b/agent/windows-setup-agent/Properties/Settings.settings similarity index 100% rename from agent/icinga2-setup-agent/Properties/Settings.settings rename to agent/windows-setup-agent/Properties/Settings.settings diff --git a/agent/icinga2-setup-agent/app.manifest b/agent/windows-setup-agent/app.manifest similarity index 100% rename from agent/icinga2-setup-agent/app.manifest rename to agent/windows-setup-agent/app.manifest diff --git a/agent/icinga2-setup-agent/icinga-banner.png b/agent/windows-setup-agent/icinga-banner.png similarity index 100% rename from agent/icinga2-setup-agent/icinga-banner.png rename to agent/windows-setup-agent/icinga-banner.png diff --git a/agent/icinga2-setup-agent/icinga.ico b/agent/windows-setup-agent/icinga.ico similarity index 100% rename from agent/icinga2-setup-agent/icinga.ico rename to agent/windows-setup-agent/icinga.ico diff --git a/agent/icinga2-setup-agent/tar-cs/COPYING b/agent/windows-setup-agent/tar-cs/COPYING similarity index 100% rename from agent/icinga2-setup-agent/tar-cs/COPYING rename to agent/windows-setup-agent/tar-cs/COPYING diff --git a/agent/icinga2-setup-agent/tar-cs/ITarHeader.cs b/agent/windows-setup-agent/tar-cs/ITarHeader.cs similarity index 100% rename from agent/icinga2-setup-agent/tar-cs/ITarHeader.cs rename to agent/windows-setup-agent/tar-cs/ITarHeader.cs diff --git a/agent/icinga2-setup-agent/tar-cs/TarException.cs b/agent/windows-setup-agent/tar-cs/TarException.cs similarity index 100% rename from agent/icinga2-setup-agent/tar-cs/TarException.cs rename to agent/windows-setup-agent/tar-cs/TarException.cs diff --git a/agent/icinga2-setup-agent/tar-cs/TarHeader.cs b/agent/windows-setup-agent/tar-cs/TarHeader.cs similarity index 100% rename from agent/icinga2-setup-agent/tar-cs/TarHeader.cs rename to agent/windows-setup-agent/tar-cs/TarHeader.cs diff --git a/agent/icinga2-setup-agent/tar-cs/TarReader.cs b/agent/windows-setup-agent/tar-cs/TarReader.cs similarity index 100% rename from agent/icinga2-setup-agent/tar-cs/TarReader.cs rename to agent/windows-setup-agent/tar-cs/TarReader.cs diff --git a/agent/icinga2-setup-agent/tar-cs/UsTarHeader.cs b/agent/windows-setup-agent/tar-cs/UsTarHeader.cs similarity index 100% rename from agent/icinga2-setup-agent/tar-cs/UsTarHeader.cs rename to agent/windows-setup-agent/tar-cs/UsTarHeader.cs