dev 1.0.166 → 1.0.167

data/lib/dev/MsBuild.rb

@@ -1,4 +1,17 @@
 #
 # C:\WINDOWS\Microsoft.NET\Framework\v3.5\MSBuild.exe vc9/mci.sln /toolsversion:3.5 /property:Configuration=Release /property:Platform=Win32 /l:FileLogger,Microsoft.Build.Engine;logfile=.\log\mci.sln-Release-Build.log
 # C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
-#
+#
+
+module Dev
+class MsBuild
+
+  def self.extract_platforms(filename)
+    results = Array::new
+    text=File.read(filename)
+    text.scan(/(\w+)<\/Platform/).each{ | var_match | results << var_match[0].to_s if !results.include?(var_match[0].to_s)}
+    results
+  end
+
+end # class MsBuild
+end # moduleDev

data/lib/dev/Scm.rb

@@ -31,6 +31,7 @@ class Scm
   def add_file_glob(glob)
     Dir.glob(glob).each { |f|
 	  if(!f.include?("/obj/") && 
+	     !f.include?("@") &&
 	     !f.include?("/bin/") &&
 		 f.index("obj/") != 0 &&
 		 f.index("bin/") != 0 )

data/lib/dev/cmd/Compile.rb

@@ -16,7 +16,7 @@ class Compile < Array
 	csbuild="<paths,msbuild>"
 	csbuild="xbuild" if !RUBY_PLATFORM.include?("w32")
 	Dir.glob('**/*.csproj').each { |csproj| 
-	  platforms=Dev::Cmd::Compile.extract_platforms(csproj)
+	  platforms=Dev::MsBuild.extract_platforms(csproj)
 	  platforms.each { |platform|
 	    skip=(!RUBY_PLATFORM.include?("w32") && platform=="x64")
 	    self << "{:cmd=> '#{csbuild} #{csproj} /property:Configuration=Release /property:Platform=\"#{platform}\" /p:OutputPath=./bin/#{platform}/Release', :auto=>true}" if !skip
@@ -27,12 +27,6 @@ class Compile < Array
     Dir.glob("*.gemspec").each { |gs| self << "{:cmd=> 'gem build #{gs}', :capture_output=> false, :auto=> true}" }
   end
 
-  def self.extract_platforms(filename)
-    results = Array::new
-    text=File.read(filename)
-    text.scan(/(\w+)<\/Platform/).each{ | var_match | results << var_match[0].to_s if !results.include?(var_match[0].to_s)}
-    results
-  end
 end	# class Compile
 end # module Cmd
 end # module Dev

data/lib/dev/cmd/Test.rb

@@ -14,9 +14,12 @@ class Test < Array
     } 
 
     Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|
-        dll_name="#{DEV[:directory]}/bin/x86/Release/#{File.basename(cs,'.csproj')}.dll"
+	  platforms=Dev::MsBuild.extract_platforms(cs)
+	  platforms.each { |platform|
+	    dll_name="#{DEV[:directory]}/bin/#{platform}/Release/#{File.basename(cs,'.csproj')}.dll"
         self << "{:cmd=> '<paths,nunit> /xml:#{dll_name}.nunit-results.xml #{dll_name}', :auto=>true, :capture_output=>true, :capture_error=>true}" if RUBY_PLATFORM.include?("w32")
 		self << "{:cmd-> 'mono <paths,nunit> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")
+	  }  
     }
 
   end

data/lib/dev.rb

@@ -39,7 +39,7 @@ end
 
 puts_debug "read " + __FILE__.foreground(:green)
 
-["Environment","Array","Hash","SystemCall","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
+["Environment","Array","Hash","SystemCall","MsBuild","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
 Dir["#{File.dirname(__FILE__)}/dev/**/*.rb"].each{ |f| require f }
 
 DEV_ROOT=Dev::Environment.dev_root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.166
+  version: 1.0.167
   prerelease: 
 platform: ruby
 authors: