Merge pull request #134 from OpenVoxProject/fix_windows_openbolt

Fix openbolt-runtime for Windows

Author: nmburgan

configs/components/runtime-openbolt.rb

@@ -3,8 +3,12 @@
   pkg.environment 'PROJECT_SHORTNAME', 'bolt'
 
   if platform.is_windows?
+    # Runtime dependencies of Ruby
     lib_type = platform.architecture == 'x64' ? 'seh' : 'sjlj'
     pkg.install_file "#{settings[:gcc_bindir]}/libgcc_s_#{lib_type}-1.dll",
                      "#{settings[:bindir]}/libgcc_s_#{lib_type}-1.dll"
+    pkg.install_file "#{settings[:gcc_bindir]}/libstdc++-6.dll", "#{settings[:bindir]}/libstdc++-6.dll"
+    pkg.install_file "#{settings[:gcc_bindir]}/libwinpthread-1.dll", "#{settings[:bindir]}/libwinpthread-1.dll"
+    pkg.install_file "#{settings[:tools_root]}/bin/zlib1.dll", "#{settings[:bindir]}/zlib1.dll"
   end
 end

configs/projects/openbolt-runtime.rb

@@ -30,7 +30,7 @@
     end
     # We build for windows not in the final destination, but in the paths that correspond
     # to the directory ids expected by WIX. This will allow for a portable installation (ideally).
-    proj.setting(:prefix, File.join('C:', proj.base_dir, proj.company_id, proj.product_id))
+    proj.setting(:prefix, File.join('C:', proj.base_dir, proj.pl_company_id, proj.pl_product_id))
   else
     proj.setting(:prefix, '/opt/puppetlabs/bolt')
   end