[icinga-checkins] icinga.org: icinga2/feature/choco: Improve support for building the chocolatey package

git at icinga.org git at icinga.org
Wed Aug 31 13:45:50 CEST 2016


Module: icinga2
Branch: feature/choco
Commit: 2df140d52e670aeb12c7ee1371b625af10166cb9
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=2df140d52e670aeb12c7ee1371b625af10166cb9

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Wed Aug 31 13:41:13 2016 +0200

Improve support for building the chocolatey package

---

 CMakeLists.txt |    1 +
 icinga2.nuspec |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 504b0eb..7282d17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,6 +281,7 @@ add_subdirectory(itl)
 add_subdirectory(doc)
 add_subdirectory(agent)
 add_subdirectory(plugins)
+add_subdirectory(choco)
 
 if(MSVC)
   add_subdirectory(icinga-installer)
diff --git a/icinga2.nuspec b/icinga2.nuspec
index 59a274c..0c2d5bb 100755
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -18,7 +18,7 @@
     <iconUrl>https://www.icinga.org/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
   </metadata>
   <files>
-    <file src="tools\chocolateyInstall.ps1" target="tools" />
-    <file src="tools\chocolateyUninstall.ps1" target="tools" />
+    <file src="${CMAKE_CURRENT_BUILD_DIR}/chocolateyInstall.ps1" target="tools" />
+    <file src="${CMAKE_CURRENT_SOURCE_DIR}/chocolateyUninstall.ps1" target="tools" />
   </files>
 </package>



More information about the icinga-checkins mailing list