Merge pull request #150 from sensu/feature/windows-winsw

Update Windows MSI build WinSW
sensu · Mar 4, 2016 · 0bd2a43 · 0bd2a43
2 parents 4247ab1 + 7147de3
commit 0bd2a43
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/assets/msi/files/assets/LICENSE.rtf b/assets/msi/files/assets/LICENSE.rtf
diff --git a/assets/msi/files/sensu-client.exe.config b/assets/msi/files/sensu-client.exe.config
@@ -0,0 +1,6 @@
+<configuration>
+  <startup>
+    <supportedRuntime version="v3.5" />
+    <supportedRuntime version="v4.0" />
+  </startup>
+</configuration>
diff --git a/recipes/sensu.rake b/recipes/sensu.rake
@@ -16,6 +16,8 @@ Bunchr::Software.new do |t|
     install_prefix = "#{Bunchr.install_dir}\\embedded"
 
     compile_options << " --with-ssl-dir=#{install_prefix}\\bin"
+    compile_options << " --with-ssl-lib=#{install_prefix}\\lib"
+    compile_options << " --with-ssl-include=#{install_prefix}\\include"
     compile_options << " --with-opt-include=#{install_prefix}\\include"
   end
 

diff --git a/recipes/winsw.rake b/recipes/winsw.rake
@@ -1,7 +1,7 @@
 Bunchr::Software.new do |t|
   t.name = 'winsw'
 
-  t.version = '1.12'
+  t.version = '1.16'
 
   install_prefix = Bunchr.install_dir
 
@@ -12,8 +12,11 @@ Bunchr::Software.new do |t|
   build_cmd << " /target:Clean;Build /p:Configuration=Release /p:PostBuildEvent="
   t.build_commands << build_cmd
 
+  files_dir = "#{Dir.pwd}\\assets\\msi\\files".gsub("/", '\\')
+
   t.install_commands << "mkdir #{install_prefix}\\bin"
   t.install_commands << "copy bin\\Release\\winsw.exe #{install_prefix}\\bin\\sensu-client.exe"
+  t.install_commands << "copy #{files_dir}\\sensu-client.exe.config #{install_prefix}\\bin\\sensu-client.exe.config"
 
   CLEAN << install_prefix
 end