@@ -374,9 +374,9 @@ class CSProjCompiler transform_config source_path, target_build_path, layout[configuration][:LibraryPaths] end - def move_config(name = "ir.exe.config") + def move_config(name = "ir") source = project_root + "Config/Unsigned/app.config" - config_file = build_path + name + config_file = build_path + (name + ".exe.config") transform_config_file('Merlin', source, config_file) end @@ -409,7 +409,7 @@ IronRubyCompiler = CSProjCompiler.new do :csproj => 'Microsoft.Scripting.csproj', :dir => '../../Runtime/Microsoft.Scripting' - dlr_com :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], + dlr_dynamic :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'unsafe', 'define:MICROSOFT_DYNAMIC;CLR2'], :output => 'Microsoft.Dynamic.dll', :csproj => 'Microsoft.Dynamic.csproj', @@ -440,20 +440,22 @@ IronRubyCompiler = CSProjCompiler.new do :dir => 'Libraries.LCA_RESTRICTED', :csproj => 'IronRuby.Libraries.csproj' - console :references => ['Microsoft.Scripting.Core.dll','Microsoft.Scripting.dll','IronRuby.dll'], + ir :references => ['Microsoft.Scripting.Core.dll','Microsoft.Scripting.dll','IronRuby.dll'], :output => 'ir.exe', :dir => './Console', :csproj => 'Ruby.Console.csproj' + + ir64 :references => ['Microsoft.Scripting.Core.dll','Microsoft.Scripting.dll','IronRuby.dll'], + :output => 'ir64.exe', + :dir => './Console', + :csproj => 'Ruby.ConsoleAny.csproj' + test_runner :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll', 'IronRuby.Libraries.dll', '!System.dll', '!System.Windows.Forms.dll'], :output => 'IronRuby.Tests.exe', :dir => './IronRuby.Tests', :csproj => 'IronRuby.Tests.csproj' - scanner :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll', 'IronRuby.Libraries.dll', '!System.Core.dll'], - :output => 'IronRuby.Libraries.Scanner.exe', - :dir => './IronRuby.Libraries.Scanner' - yaml :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll', 'IronRuby.Libraries.dll', '!System.dll'], :switches => ['target:library'], :output => 'IronRuby.Libraries.Yaml.dll', @@ -488,6 +490,18 @@ IronRubyCompiler = CSProjCompiler.new do :dir => '../IronPython/IronPythonConsole', :csproj => 'IronPythonConsole.csproj' + ipyw64 :references => ['IronPython.dll', 'Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', '!System.dll', '!System.Windows.Forms.dll'], + :switches => ['target:winexe', "define:IRONPYTHON_WINDOW", "win32icon:..\\IronPythonWindow\\ipy.ico"], + :output => 'ipyw64.exe', + :dir => '../IronPython/IronPythonWindowAny', + :csproj => 'IronPythonWindowAny.csproj' + + ipy64 :references => ['IronPython.dll', 'Microsoft.Scripting.Core.dll','Microsoft.Scripting.dll', '!System.dll'], + :switches => ['target:exe', 'win32icon:..\\IronPythonConsole\\ipy.ico'], + :output => 'ipy64.exe', + :dir => '../IronPython/IronPythonConsoleAny', + :csproj => 'IronPythonConsoleAny.csproj' + ironpython_modules :references => ['IronPython.dll', 'Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'Microsoft.Scripting.ExtensionAttribute.dll', '!System.Data.dll', '!System.dll', '!System.Xml.dll'], :switches => ['target:library'], :output => 'IronPython.Modules.dll', Merlin/Main/Languages/Ruby/context.rb @@ -28,7 +28,7 @@ namespace :compile do task :dlr => [:extension_attributes] do IronRubyCompiler.compile :dlr_core IronRubyCompiler.compile :dlr_libs - IronRubyCompiler.compile :dlr_com + IronRubyCompiler.compile :dlr_dynamic IronRubyCompiler.compile :dlr_debug end @@ -49,19 +49,16 @@ namespace :compile do desc "compile IronRuby console" task :console => [:libraries] do - IronRubyCompiler.compile :console + IronRubyCompiler.compile :ir IronRubyCompiler.move_config + IronRubyCompiler.compile :ir64 + IronRubyCompiler.move_config "ir64" end desc "compile IronRuby.Tests" task :testhost => [:libraries] do IronRubyCompiler.compile :test_runner - IronRubyCompiler.move_config "IronRuby.Tests.exe.config" - end - - desc "compile IronRuby.Libraries.Scanner" - task :scanner => [:libraries] do - IronRubyCompiler.compile :scanner + IronRubyCompiler.move_config "IronRuby.Tests" end desc "compile Yaml" @@ -71,10 +68,14 @@ namespace :compile do desc "compile IronPython" task :ironpython => [:dlr] do - [:ironpython, :ipyw, :ipy, :ironpython_modules].each do |target| + [:ironpython, :ipyw, :ipy, :ipyw64, :ipy64, :ironpython_modules].each do |target| IronRubyCompiler.compile target end + %w{ipy ipyw ipy64 ipyw64}.each do |target| + IronRubyCompiler.move_config target + end end + desc "compile IronRuby and IronPython" task :all => [:compile, :ironpython] end Merlin/Main/Languages/Ruby/rake/compile.rake 5da36f1e9193c693e3040299be874f1ed122a07b Jim Deville jdeville@microsoft.com http://github.com/shri/ironruby/commit/4a4455dcbc726d7210996b57cd60e8ff0374f6bb 4a4455dcbc726d7210996b57cd60e8ff0374f6bb 2009-07-21T10:50:06-07:00 2009-07-20T17:01:19-07:00 almost have all compilation working 4853aea5dd586190bbee5cbca9c51403a103aa93 Jim Deville jdeville@microsoft.com