edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;C522961 File: context.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;C522961 (server) 8/8/2008 3:09 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;alpha-3 @@ -165,7 +165,7 @@ Configuration.define do group(:common) { switches :all, 'nologo', 'noconfig', 'nowarn:1591,1701,1702', 'errorreport:prompt', 'warn:4', 'warnaserror-' - switches :debug, 'define:"DEBUG;TRACE;SIGNED;MICROSOFT_SCRIPTING_CORE"', 'debug+', 'debug:full', 'optimize-', 'delaysign+' + switches :debug, 'define:"DEBUG;TRACE;MICROSOFT_SCRIPTING_CORE;SIGNED"', 'debug+', 'debug:full', 'optimize-', 'delaysign+', 'keyfile:c:\dev\merlin\main\languages\ruby\rubytestkey.snk' switches :release, 'define:TRACE', 'optimize+' references 'System.dll' } @@ -484,9 +484,6 @@ args[:resources].each_value { |res| cs_args << "resource:\"#{build_path + res}\"" } end - # Hack path to RubyTestKey.snk - cs_args << 'keyfile:' + $rakefile_path + '\RubyTestKey.snk' - switches = '' cs_args.each { |opt| switches << ' /' + opt } cmd = CS_COMPILER + switches + ' ' + get_compile_path_list.join(" ") @@ -530,6 +527,14 @@ contents.change_tag! 'SccAuxPath' contents.change_tag! 'SccProvider' + contents.change_tag! 'DelaySign', 'false' + contents.change_tag! 'SignAssembly', 'false' + + contents.change_configuration! 'Debug|AnyCPU', 'TRACE;DEBUG' + contents.change_configuration! 'Release|AnyCPU', 'TRACE' + contents.change_configuration! 'Silverlight Debug|AnyCPU', 'TRACE;DEBUG;SILVERLIGHT' + contents.change_configuration! 'Silverlight Release|AnyCPU', 'TRACE;SILVERLIGHT' + if block_given? yield contents else @@ -537,7 +542,6 @@ replace_output_path contents, '..\..\..\Bin\Release\\', '..\..\build\release\\' replace_output_path contents, '..\..\..\Bin\Silverlight Debug\\', '..\..\build\silverlight debug\\' replace_output_path contents, '..\..\..\Bin\Silverlight Release\\', '..\..\build\silverlight release\\' - replace_key_path contents, '..\..\..\MSSharedLibKey.snk', '..\..\RubyTestKey.snk' end else contents.change_tag! 'SccProjectName', 'SAK' @@ -545,6 +549,14 @@ contents.change_tag! 'SccAuxPath', 'SAK' contents.change_tag! 'SccProvider', 'SAK' + contents.change_tag! 'DelaySign', 'true' + contents.change_tag! 'SignAssembly', 'true' + + contents.change_configuration! 'Debug|AnyCPU', 'TRACE;DEBUG;SIGNED' + contents.change_configuration! 'Release|AnyCPU', 'TRACE;SIGNED' + contents.change_configuration! 'Silverlight Debug|AnyCPU', 'TRACE;DEBUG;SILVERLIGHT' + contents.change_configuration! 'Silverlight Release|AnyCPU', 'TRACE;SILVERLIGHT' + if block_given? yield contents else @@ -780,7 +792,7 @@ path = Pathname.new(dir) file_path = path + executable result << file_path.dirname if file_path.exist? - file_path = path + executable + '.exe' + file_path = path + (executable + '.exe') result << file_path.dirname if file_path.exist? end result =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Rakefile;C521915 File: Rakefile =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Rakefile;C521915 (server) 8/8/2008 3:08 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Rakefile;alpha-3 @@ -109,7 +109,13 @@ replace_doc_path contents, '..\..\..\..\..\..\Merlin\Main\Bin\Release\Microsoft.Scripting.Core.xml', '..\..\build\release\Microsoft.Scripting.Core.xml' replace_doc_path contents, '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Debug\Microsoft.Scripting.Core.xml', '..\..\build\silverlight debug\Microsoft.Scripting.Core.xml' replace_doc_path contents, '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Release\Microsoft.Scripting.Core.xml', '..\..\build\silverlight release\Microsoft.Scripting.Core.xml' - replace_key_path contents, '..\..\..\..\..\..\Merlin\Main\MSSharedLibKey.snk', '..\..\RubyTestKey.snk' + + contents.change_configuration! 'FxCop|AnyCPU', 'TRACE;MICROSOFT_SCRIPTING_CORE' + contents.change_configuration! 'SpecSharp|AnyCPU', 'TRACE;DEBUG;MICROSOFT_SCRIPTING_CORE' + contents.change_configuration! 'Debug|AnyCPU', 'TRACE;DEBUG;MICROSOFT_SCRIPTING_CORE' + contents.change_configuration! 'Release|AnyCPU', 'TRACE;MICROSOFT_SCRIPTING_CORE' + contents.change_configuration! 'Silverlight Debug|AnyCPU', 'TRACE;DEBUG;SILVERLIGHT;MICROSOFT_SCRIPTING_CORE' + contents.change_configuration! 'Silverlight Release|AnyCPU', 'TRACE;SILVERLIGHT;MICROSOFT_SCRIPTING_CORE' else replace_output_path contents, '..\..\build\debug\\', '..\..\..\..\..\..\Merlin\Main\Bin\Debug\\' replace_output_path contents, '..\..\build\release\\', '..\..\..\..\..\..\Merlin\Main\Bin\Release\\' @@ -120,7 +126,13 @@ replace_doc_path contents, '..\..\build\release\microsoft.scripting.core.xml', '..\..\..\..\..\..\Merlin\Main\Bin\Release\Microsoft.Scripting.Core.xml' replace_doc_path contents, '..\..\build\silverlight debug\microsoft.scripting.core.xml', '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Debug\Microsoft.Scripting.Core.xml' replace_doc_path contents, '..\..\build\silverlight release\microsoft.scripting.core.xml', '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Release\Microsoft.Scripting.Core.xml' - replace_key_path contents, '..\..\RubyTestKey.snk', '..\..\..\..\..\..\Merlin\Main\MSSharedLibKey.snk' + + contents.change_configuration! 'FxCop|AnyCPU', 'TRACE;MICROSOFT_SCRIPTING_CORE;SIGNED' + contents.change_configuration! 'SpecSharp|AnyCPU', 'TRACE;DEBUG;MICROSOFT_SCRIPTING_CORE;SIGNED' + contents.change_configuration! 'Debug|AnyCPU', 'TRACE;DEBUG;MICROSOFT_SCRIPTING_CORE;SIGNED' + contents.change_configuration! 'Release|AnyCPU', 'TRACE;MICROSOFT_SCRIPTING_CORE;SIGNED' + contents.change_configuration! 'Silverlight Debug|AnyCPU', 'TRACE;DEBUG;SILVERLIGHT;MICROSOFT_SCRIPTING_CORE;SIGNED' + contents.change_configuration! 'Silverlight Release|AnyCPU', 'TRACE;SILVERLIGHT;MICROSOFT_SCRIPTING_CORE;SIGNED' end end transform_project(:dlr_libs, 'microsoft.scripting.csproj') do |contents| @@ -133,7 +145,13 @@ replace_doc_path contents, '..\..\Bin\Release\Microsoft.Scripting.xml', '..\..\build\release\Microsoft.Scripting.xml' replace_doc_path contents, '..\..\Bin\Silverlight Debug\Microsoft.Scripting.xml', '..\..\build\silverlight debug\Microsoft.Scripting.xml' replace_doc_path contents, '..\..\Bin\Silverlight Release\Microsoft.Scripting.xml', '..\..\build\silverlight release\Microsoft.Scripting.xml' - replace_key_path contents, '..\..\MSSharedLibKey.snk', '..\..\RubyTestKey.snk' + + contents.change_configuration! 'FxCop|AnyCPU', 'TRACE' + contents.change_configuration! 'SpecSharp|AnyCPU', 'TRACE;DEBUG' + contents.change_configuration! 'Debug|AnyCPU', 'TRACE;DEBUG' + contents.change_configuration! 'Release|AnyCPU', 'TRACE' + contents.change_configuration! 'Silverlight Debug|AnyCPU', 'TRACE;DEBUG;SILVERLIGHT' + contents.change_configuration! 'Silverlight Release|AnyCPU', 'TRACE;SILVERLIGHT' else replace_output_path contents, '..\..\build\debug\\', '..\..\Bin\Debug\\' replace_output_path contents, '..\..\build\release\\', '..\..\Bin\Release\\' @@ -143,7 +161,13 @@ replace_doc_path contents, '..\..\build\release\Microsoft.Scripting.xml', '..\..\Bin\Release\Microsoft.Scripting.xml' replace_doc_path contents, '..\..\build\silverlight debug\Microsoft.Scripting.xml', '..\..\Bin\Silverlight Debug\Microsoft.Scripting.xml' replace_doc_path contents, '..\..\build\silverlight release\Microsoft.Scripting.xml', '..\..\Bin\Silverlight Release\Microsoft.Scripting.xml' - replace_key_path contents, '..\..\RubyTestKey.snk', '..\..\MSSharedLibKey.snk' + + contents.change_configuration! 'FxCop|AnyCPU', 'TRACE;SIGNED' + contents.change_configuration! 'SpecSharp|AnyCPU', 'TRACE;DEBUG;SIGNED' + contents.change_configuration! 'Debug|AnyCPU', 'TRACE;DEBUG;SIGNED' + contents.change_configuration! 'Release|AnyCPU', 'TRACE;SIGNED' + contents.change_configuration! 'Silverlight Debug|AnyCPU', 'TRACE;DEBUG;SILVERLIGHT' + contents.change_configuration! 'Silverlight Release|AnyCPU', 'TRACE;SILVERLIGHT' end end # TODO: add signing to this project @@ -154,14 +178,12 @@ replace_output_path contents, '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Debug\\', '..\..\build\silverlight debug\\' replace_output_path contents, '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Release\\', '..\..\build\silverlight release\\' replace_import_project contents, '..\..\..\..\..\..\Merlin\Main\SpecSharp.targets', '..\..\SpecSharp.targets' - replace_key_path contents, '..\..\..\..\..\Main\MSSharedLibKey.snk', '..\..\RubyTestKey.snk' else replace_output_path contents, '..\..\build\debug\\', '..\..\..\..\..\..\Merlin\Main\Bin\Debug\\' replace_output_path contents, '..\..\build\release\\', '..\..\..\..\..\..\Merlin\Main\Bin\Release\\' replace_output_path contents, '..\..\build\silverlight debug\\', '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Debug\\' replace_output_path contents, '..\..\build\silverlight release\\', '..\..\..\..\..\..\Merlin\Main\Bin\Silverlight Release\\' replace_import_project contents, '..\..\SpecSharp.targets', '..\..\..\..\..\..\Merlin\Main\SpecSharp.targets' - replace_key_path contents, '..\..\RubyTestKey.snk', '..\..\..\..\..\Main\MSSharedLibKey.snk' end end transform_project :generator, 'classinitgenerator.csproj' =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/runfirst.cmd;C491229 File: runfirst.cmd =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/runfirst.cmd;C491229 (server) 8/8/2008 3:19 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/runfirst.cmd;alpha-3 @@ -1,3 +1,2 @@ -sn -Vr *,31bf3856ad364e35 copy default.irconfig.rb "%USERPROFILE%\.irconfig.rb" copy default.mspec.rb "%USERPROFILE%\dev\default.mspec" ===================================================================