edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;C669419 File: context.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;C669419 (server) 12/5/2008 11:27 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;rakefix @@ -506,7 +506,7 @@ if cs_proj_files.length == 1 doc = REXML::Document.new(File.open(cs_proj_files.first)) result = doc.elements.collect("/Project/ItemGroup/Compile") { |c| c.attributes['Include'] } - result.delete_if { |e| e =~ /(Silverlight\\SilverlightVersion.cs|System\\Dynamic\\ComInterop\\Parameterized.System.Dynamic.ComInterop.cs)/ } + result.delete_if { |e| e =~ /(Silverlight\\SilverlightVersion.cs|System\\Dynamic\\Parameterized.System.Dynamic.cs)/ } result.map! { |p| get_case_sensitive_path(p) } if ENV['mono'] result else @@ -515,6 +515,7 @@ end def compile(name, args) + banner name.to_s working_dir = get_source_dir(name) build_dir = build_path @@ -737,7 +738,7 @@ map :gppg, :merlin => 'merlin/main/utilities/gppg', :svn => 'bin', :recurse => false map :dlr_core, :merlin => 'ndp/fx/src/core/microsoft/scripting', :svn => 'src/microsoft.scripting.core' map :dlr_libs, :merlin => 'merlin/main/runtime/microsoft.scripting', :svn => 'src/microsoft.scripting' - map :dlr_com, :merlin => 'ndp/fx/src/dynamiccom', :svn => 'src/dynamiccom' + map :dlr_com, :merlin => 'ndp/fx/src/dynamic', :svn => 'src/dynamic' map :ironruby, :merlin => 'merlin/main/languages/ruby/ruby', :svn => 'src/ironruby' map :libraries, :merlin => 'merlin/main/languages/ruby/libraries.lca_restricted', :svn => 'src/IronRuby.Libraries' map :yaml, :merlin => 'merlin/external/languages/ironruby/yaml/ironruby.libraries.yaml', :svn => 'src/yaml' =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/rake/compile.rake;C666188 File: compile.rake =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/rake/compile.rake;C666188 (server) 12/5/2008 11:27 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/rake/compile.rake;rakefix @@ -35,7 +35,7 @@ compile :dlr_core, :references => ['!System.dll', '!System.Configuration.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'define:MICROSOFT_SCRIPTING_CORE'], :output => 'Microsoft.Scripting.Core.dll', :csproj => 'Microsoft.Scripting.Core.csproj' resources = { Pathname.new('math') + 'MathResources.resx' => Pathname.new('Microsoft.Scripting.Math.MathResources.resources') } compile :dlr_libs, :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', '!System.Configuration.dll', 'Microsoft.Scripting.ExtensionAttribute.dll','!System.Runtime.Remoting.dll'], :switches => ['target:library'], :resources => resources, :output => 'Microsoft.Scripting.dll' - compile :dlr_com, :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'unsafe'], :output => 'Microsoft.Dynamic.ComInterop.dll' + compile :dlr_com, :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'unsafe'], :output => 'Microsoft.Dynamic.dll' end end ===================================================================