Modifications to Rakefile to aid build server

Rakefile

@@ -1,22 +1,21 @@
 require 'tmpdir'
-
-begin
-  require 'albacore'
-rescue LoadError
-  warn "Please run 'gem install albacore --pre'"
-  exit 1
-end
+require 'open-uri'
+require 'openssl'
 
 ISCC = ENV['ISCC'] || 'C:\Program Files (x86)\Inno Setup 5\ISCC.exe'
 SZIP = ENV['SZIP'] || 'C:\Program Files\7-Zip\7z.exe'
 SIGNTOOL = ENV['SIGNTOOL'] || 'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe'
+MSBUILD = ENV['MSBUILD'] || %q{C:\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe}
 
 CONFIG = ENV['CONFIG'] || 'Release'
+MSBUILD_LOGGER = ENV['MSBUILD_LOGGER']
 
 SRC_DIR = 'src/SyncTrayzor'
 INSTALLER_DIR = 'installer'
 PORTABLE_DIR = 'portable'
 
+SLN = 'src/SyncTrayzor.sln'
+
 PFX = ENV['PFX'] || File.join(INSTALLER_DIR, 'SyncTrayzorCA.pfx')
 
 PORTABLE_SYNCTHING_VERSION = '0.11'
@@ -31,8 +30,9 @@ class ArchDirConfig
   attr_reader :portable_output_file
   attr_reader :syncthing_binaries
 
-  def initialize(arch)
+  def initialize(arch, github_arch)
     @arch = arch
+    @github_arch = github_arch
     @bin_dir = "bin/#{@arch}/#{CONFIG}"
     @installer_dir = File.join(INSTALLER_DIR, @arch)
     @installer_output = File.join(@installer_dir, "SyncTrayzorSetup-#{@arch}.exe")
@@ -41,21 +41,36 @@ class ArchDirConfig
     @portable_output_file = File.join(PORTABLE_DIR, "SyncTrayzorPortable-#{@arch}.zip")
     @syncthing_binaries = { '0.11' => 'syncthing.exe' }
   end
+
+  def download_uri(version)
+  	return "https://github.com/syncthing/syncthing/releases/download/v#{version}/syncthing-windows-#{@github_arch}-v#{version}.zip"
+  end
 end
 
 SYNCTHING_VERSIONS_TO_UPDATE = ['0.11']
 
-ARCH_CONFIG = [ArchDirConfig.new('x64'), ArchDirConfig.new('x86')]
+ARCH_CONFIG = [ArchDirConfig.new('x64', 'amd64'), ArchDirConfig.new('x86', '386')]
 ASSEMBLY_INFOS = FileList['**/AssemblyInfo.cs']
 
+def ensure_7zip
+  unless File.exist?(SIGNTOOL)
+    warn "You must install the Windows SDK"
+    exit 1
+  end
+end
+
 namespace :build do
   ARCH_CONFIG.each do |arch_config|
     desc "Build the project (#{arch_config.arch})"
-    build arch_config.arch do |b|
-      b.sln = 'src/SyncTrayzor.sln'
-      b.target = [:Clean, :Build]
-      b.prop 'Configuration', CONFIG
-      b.prop 'Platform', arch_config.arch
+    task arch_config.arch do
+      cmd = "\"#{MSBUILD}\" \"#{SLN}\" /t:Clean;Rebuild /p:Configuration=#{CONFIG};Platform=#{arch_config.arch}"
+      if MSBUILD_LOGGER
+        cmd << " /logger:\"#{MSBUILD_LOGGER}\" /verbosity:minimal"
+      else
+        cmd << " /verbosity:quiet"
+      end
+      
+      sh cmd
     end
   end
 end
@@ -66,14 +81,14 @@ task :build => ARCH_CONFIG.map{ |x| :"build:#{x.arch}" }
 namespace :installer do
   ARCH_CONFIG.each do |arch_config|
     desc "Create the installer (#{arch_config.arch})"
-    task arch_config.arch => [:"build:#{arch_config.arch}"] do
+    task arch_config.arch do
       unless File.exist?(ISCC)
         warn "Please install Inno Setup" 
         exit 1
       end
 
       rm arch_config.installer_output if File.exist?(arch_config.installer_output)
-      sh %Q{"#{ISCC}"}, arch_config.installer_iss
+      sh %Q{"#{ISCC}" #{arch_config.installer_iss}}
     end
   end
 end
@@ -85,21 +100,20 @@ namespace :"sign-installer" do
   ARCH_CONFIG.each do |arch_config|
     desc "Sign the installer (#{arch_config.arch}). Specify PASSWORD if required"
     task arch_config.arch do
-      unless File.exist?(SIGNTOOL)
-        warn "You must install the Windows SDK"
-        exit 1
-      end
+      ensure_7zip
 
       unless File.exist?(PFX)
         warn "#{PFX} must exist"
         exit 1
       end
 
-      args = ['sign', "/f #{PFX}", "/t http://timestamp.verisign.com/scripts/timstamp.dll"]
-      args << "/p #{ENV['PASSWORD']}" if ENV['PASSWORD']
-      args << "/v #{arch_config.installer_output}"
+      args = "sign /f #{PFX} /t http://timestamp.verisign.com/scripts/timstamp.dll"
+      args << " /p #{ENV['PASSWORD']}" if ENV['PASSWORD']
+      args << " /v #{arch_config.installer_output}"
 
-      sh %Q{"#{SIGNTOOL}"}, *args
+      # Don't want to print out the pasword!
+      puts "Invoking signtool"
+      system %Q{"#{SIGNTOOL}" #{args}}
     end
   end
 end
@@ -121,11 +135,8 @@ end
 namespace :portable do
   ARCH_CONFIG.each do |arch_config|
     desc "Create the portable package (#{arch_config.arch})"
-    task arch_config.arch => [:"build:#{arch_config.arch}"] do
-      unless File.exist?(SZIP)
-        warn "Please installe 7-Zip"
-        exit 1
-      end
+    task arch_config.arch do
+      ensure_7zip
 
       mkdir_p File.dirname(arch_config.portable_output_file)
       rm arch_config.portable_output_file if File.exist?(arch_config.portable_output_file)
@@ -155,7 +166,7 @@ namespace :portable do
           cp_to_portable(portable_dir, arch_config.syncthing_binaries[PORTABLE_SYNCTHING_VERSION], 'syncthing.exe')
         end
 
-        sh %Q{"#{SZIP}"}, "a -tzip -mx=7 #{arch_config.portable_output_file} #{portable_dir}"
+        sh %Q{"#{SZIP}" a -tzip -mx=7 #{arch_config.portable_output_file} #{portable_dir}}
       end
     end
   end
@@ -199,7 +210,7 @@ task :clean => ARCH_CONFIG.map{ |x| :"clean:#{x.arch}" }
 namespace :package do
   ARCH_CONFIG.each do |arch_config|
     desc "Build installer and portable (#{arch_config.arch})"
-    task arch_config.arch => [:"clean:#{arch_config.arch}", :"update-syncthing:#{arch_config.arch}", :"installer:#{arch_config.arch}", :"sign-installer:#{arch_config.arch}", :"portable:#{arch_config.arch}"]
+    task arch_config.arch => [:"clean:#{arch_config.arch}", :"update-syncthing:#{arch_config.arch}", :"build:#{arch_config.arch}", :"installer:#{arch_config.arch}", :"sign-installer:#{arch_config.arch}", :"portable:#{arch_config.arch}"]
   end
 end
 
@@ -208,10 +219,39 @@ task :package => ARCH_CONFIG.map{ |x| :"package:#{x.arch}" }
 
 desc "Bump version number"
 task :version, [:version] do |t, args|
+  parts = args[:version].split('.')
+  parts << '0' if parts.length == 3
+  version = parts.join('.')
   ASSEMBLY_INFOS.each do |info|
     content = IO.read(info)
-    content[/\[assembly: AssemblyVersion\(\"(.+?).0\"\)\]/, 1] = args[:version]
-    content[/\[assembly: AssemblyFileVersion\(\"(.+?).0\"\)\]/, 1] = args[:version]
+    content[/\[assembly: AssemblyVersion\(\"(.+?)\"\)\]/, 1] = version
+    content[/\[assembly: AssemblyFileVersion\(\"(.+?)\"\)\]/, 1] = version
     File.open(info, 'w'){ |f| f.write(content) }
   end
-end
+end
+
+namespace :"download-syncthing" do
+  ARCH_CONFIG.each do |arch_config|
+    desc "Download syncthing (#{arch_config.arch})"
+    task arch_config.arch, [:version] do |t, args|
+      ensure_7zip
+
+      Dir.mktmpdir do |tmp|
+        File.open(File.join(tmp, 'syncthing.zip'), 'wb') do |outfile|
+          open(arch_config.download_uri(args[:version]), { ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE }) do |infile|
+            outfile.write(infile.read)
+          end
+        end
+
+        Dir.chdir(tmp) do
+          sh %Q{"#{SZIP}" e syncthing.zip}
+        end
+
+        cp File.join(tmp, 'syncthing.exe'), File.join(arch_config.installer_dir, 'syncthing.exe')
+      end
+    end
+  end
+end
+
+desc 'Download syncthing for all architectures'
+task :"download-syncthing", [:version] => ARCH_CONFIG.map{ |x| :"download-syncthing:#{x.arch}" }