Commit 8e857a7

@@ -1,31 +1,8 @@
 require 'rake/clean'
 require 'fileutils'
 
-class Project
-	attr_reader :name 
-
-	def self.name
-		@name = "mars.rover"
-	end 
-end
-
-class LocalSettings 
-	attr_reader :settings
-	def initialize
-		@settings = {
-			:xunit_report_file_dir => 'artifacts' ,
-			:xunit_report_file_name => 'test_report',
-			:xunit_report_type => 'text',
-			:xunit_show_test_report => true,
-			:debug => true,
-		}
-		@settings[:xunit_report_file_name_with_extension] = "#{@settings[:xunit_report_file_name]}.#{@settings[:xunit_report_type]}"
-	end
-end
-
 class MbUnitRunner
 	def initialize
-		@source_dir ='../product'
 		@mbunit_dir = '../thirdparty/mbunit'
 		@test_results_dir = 'artifacts'
 		@compile_target = 'debug'
@@ -40,37 +17,16 @@ class MbUnitRunner
 	end
 
 	def build_command_line_for(assembly)
-		file = File.expand_path("#{@source_dir}/#{assembly}/bin/#{@compile_target}/#{assembly}.dll")
-		puts "command line: " + file
+		file = File.expand_path("../product/#{assembly}/bin/#{@compile_target}/#{assembly}.dll")
 		"#{@mbunit_dir}/mbunit.cons.exe #{file} /rt:#{@report_type} /rnf:#{assembly}.dll-results /rf:#{@test_results_dir} #{'/sr' if @show_report}"
 	end
 end
 
-class MSBuildRunner
-	def self.compile(attributes)
-		version = attributes.fetch(:clrversion, 'v3.5')
-		compile_target = attributes.fetch(:compile_target, 'debug')
-	    solution_file = attributes[:solution_file]
-		
-		framework_dir = File.join(ENV['windir'].dup, 'Microsoft.NET', 'Framework', 'v3.5')
-		msbuild_file = File.join(framework_dir, 'msbuild.exe')
-		
-		sh "#{msbuild_file} #{solution_file} /property:Configuration=#{compile_target} /t:Rebuild"
-	end
-end
-
-local_settings = LocalSettings.new
-
-COMPILE_TARGET = 'debug'
-
 CLEAN.include('artifacts','**/bin','**/obj')
 
-project_test_dir  = File.join('product',"#{Project.name}.tests",'bin','debug')
-
+project_test_dir  = File.join('product',"mars.rover.tests",'bin','debug')
 deploy_dir = File.join('artifacts','deploy')
 
-output_folders = [project_test_dir]
-
 task :default => [:test]
 
 task :init  => :clean do
@@ -79,7 +35,10 @@ task :init  => :clean do
 end
 
 task :compile => :init do
-  MSBuildRunner.compile :compile_target => COMPILE_TARGET, :solution_file => '../solution.sln'
+	framework_dir = File.join(ENV['windir'].dup, 'Microsoft.NET', 'Framework', 'v3.5')
+	msbuild_file = File.join(framework_dir, 'msbuild.exe')
+	
+	sh "#{msbuild_file} ../solution.sln /property:Configuration=debug /t:Rebuild"
 end
 
 task :test, :needs => [:compile] do |t,args|