dev 1.0.23 → 1.0.24

data/lib/dev/Dep.rb

@@ -48,7 +48,7 @@ class Dep < Hash
   def get_export_command(local_dir)
     unless self[:uri].nil?
       uri=Dev::Environment.expand_string_variables(self.get_value("uri"))
-      return "<%Dev::Scm::export('#{uri}','#{local_dir}') unless File.exists?('#{local_dir}')%>"
+      return "<%Dev::Scm::export('#{uri}','#{local_dir}','svn') unless File.exists?('#{local_dir}')%>"
     end # unless    
   end
   

data/lib/dev/MsBuild.rb

@@ -0,0 +1,4 @@
+#
+# 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
+#

data/lib/dev/Project.rb

@@ -252,11 +252,12 @@ class Project < Hash
     hash=Hash.new
     
     if(key=="paths")
-      if(self[:type]=="C#")
+      #if(self[:type]=="C#")
+        hash.set_value("msbuild_vs9","C:/WINDOWS/Microsoft.NET/Framework/v3.5/MSBuild.exe")
         hash.set_value("msbuild","C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe")
         nunit_version="2.5.10.11092"
         hash.set_value("nunit","#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/#{nunit_version}/bin/net-2.0/nunit-console-x86.exe")
-      end
+      #end
     end
     value=hash if hash.length > 0
     
@@ -304,6 +305,21 @@ class Project < Hash
         end
       end
       Dir.glob("*.csproj").each{|cs|array<<"<paths,msbuild> #{cs} <x86_release_compile_flags>"}
+      
+      if self[:type]=="c++"
+        if(!has_key?(:win32_release_compile_flags))
+          self[:win32_release_compile_flags]="/property:Configuration=Release /property:Platform=\"win32\""
+        end
+        Dir.glob("*.sln").each{|sln|
+          slntext=File.read(sln)
+          if(slntext.include?("Format Version 10.00"))
+            array<<"<paths,msbuild_vs9> #{sln} <win32_release_compile_flags>"
+          else
+            array<<"<paths,msbuild> #{sln} <win32_release_compile_flags>"
+          end
+        }
+      end
+      
     end
     if(key=="test")
 
@@ -319,6 +335,8 @@ class Project < Hash
           array << "<paths,nunit> /nologo #{dll_name} /xml:#{dll_name}.nunit-results.xml"
         }
       end
+      
+      
     end
     if(key=="features")
       array << "cucumber features" if File.exists?("features") && Dir.glob("features/**/*.rb").length > 0

data/lib/dev/Scm.rb

@@ -3,7 +3,7 @@ class Scm
   attr_accessor :scm_type
   
   def initialize
-    @scm_type="?"
+    @scm_type="svn"
     @scm_type="svn" if File.exists?(".svn")
     @scm_type="git" if File.exists?(".git")
   end
@@ -16,9 +16,9 @@ class Scm
     false
   end
   
-  def self.export(remote,local)
-    puts_debug "Scm.export, scm_type=#{@scm_type}"
-    if remote.include?("svn:")
+  def self.export(remote,local,scm)
+    puts_debug "Scm.export, scm=#{scm}"
+    if remote.include?("svn:") || scm=="svn"
       local_tmp=local.gsub('@','-')
       call=Dev::SystemCall.new("svn export #{remote} #{local_tmp}")
       File.rename(local_tmp,local) if File.exist?(local_tmp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.23
+  version: 1.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &25438476 !ruby/object:Gem::Requirement
+  requirement: &27218292 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25438476
+  version_requirements: *27218292
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &25438068 !ruby/object:Gem::Requirement
+  requirement: &27217740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25438068
+  version_requirements: *27217740
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &25437708 !ruby/object:Gem::Requirement
+  requirement: &27217380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25437708
+  version_requirements: *27217380
 description: development tasks
 email: lou.parslow@gmail.com
 executables:
@@ -56,6 +56,7 @@ files:
 - lib/dev/Dep.rb
 - lib/dev/Environment.rb
 - lib/dev/Hash.rb
+- lib/dev/MsBuild.rb
 - lib/dev/Project.rb
 - lib/dev/Scm.rb
 - lib/dev/Svn.rb