[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/20090805+git.e6b28d27+dfsg-1-16-g73ea914
C.J. Adams-Collier
cjac at colliertech.org
Wed Feb 3 01:00:43 UTC 2010
The following commit has been merged in the master branch:
commit 73ea9141712dfeb64e02a4b5d5b42ed04dcb6ee7
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date: Tue Feb 2 16:57:15 2010 -0800
the version in our repo was a little out of date compared to the tag from upstream. This fixes those diffs.
diff --git a/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec b/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec
index 20c3e73..d7aa065 100644
--- a/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec
+++ b/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec
@@ -9,19 +9,32 @@ if (ENV["THISISSNAP"] || ENV["SILENTASSERT"]) && engine == 'ironruby'
end
System::Diagnostics::Debug.Listeners.clear
System::Diagnostics::Debug.Listeners.add(MyTraceListener.new)
+end
+
+def mono?
+ return true if ENV['mono']
+ ENV['OS'] != "Windows_NT"
+end
+
+def ir_cmd
+ if mono?
+ "mono #{ENV['MERLIN_ROOT']}/Bin/mono_debug/ir.exe -X:Interpret "
+ else
+ "#{ENV['MERLIN_ROOT']}/Test/Scripts/ir.cmd" unless mono?
+ end
end
class MSpecScript
# The default implementation to run the specs.
- set :target, "#{ENV['MERLIN_ROOT']}\\Test\\Scripts\\ir.cmd"
+ set :target, ir_cmd
# config[:prefix] must be set before filtered is used
- set :prefix, "#{ENV['MERLIN_ROOT']}\\..\\External.LCA_RESTRICTED\\Languages\\IronRuby\\mspec\\rubyspec"
+ set :prefix, "#{ENV['MERLIN_ROOT']}/../External.LCA_RESTRICTED/Languages/IronRuby/mspec/rubyspec"
set :core1sub1,filtered("core","[ac-i]")
set :core1sub2,[ #want to keep basicobject out of the 1.8 list
- "core\\bignum",
- "core\\binding",
- "core\\builtin_constants"
+ "core/bignum",
+ "core/binding",
+ "core/builtin_constants"
]
set :core2, filtered("core", "[j-z]").reject{|el| el =~ /thread/i}
set :lang, [
@@ -34,20 +47,20 @@ class MSpecScript
set :lib2, filtered("library", "[p-z]")
#.NET interop
set :netinterop, [
- "..\\..\\..\\..\\..\\Main\\Languages\\Ruby\\Tests\\Interop\\net"
+ "../../../../../Main/Languages/Ruby/Tests/Interop/net"
]
set :netcli, [
- "..\\..\\..\\..\\..\\Main\\Languages\\Ruby\\Tests\\Interop\\cli"
+ "../../../../../Main/Languages/Ruby/Tests/Interop/cli"
]
set :cominterop, [
- "..\\..\\..\\..\\..\\Main\\Languages\\Ruby\\Tests\\Interop\\com"
+ "../../../../../Main/Languages/Ruby/Tests/Interop/com"
]
set :thread, [
- "core\\thread",
- "core\\threadgroup"
+ "core/thread",
+ "core/threadgroup"
]
#combination tasks
diff --git a/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/mspec/lib/mspec/commands/mspec.rb b/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/mspec/lib/mspec/commands/mspec.rb
index 6770dce..5dee759 100644
--- a/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/mspec/lib/mspec/commands/mspec.rb
+++ b/Merlin/External.LCA_RESTRICTED/Languages/IronRuby/mspec/mspec/lib/mspec/commands/mspec.rb
@@ -8,6 +8,13 @@ require 'mspec/utils/script'
require 'mspec/helpers/tmp'
require 'mspec/runner/actions/timer'
+# module Kernel
+# alias_method :old_exec, :exec
+# def exec(command, *args)
+# puts "excuting: #{command} #{args.join(" ")}"
+# exec command} #{args.join(" ")}"
+# end
+# end
class MSpecMain < MSpecScript
def initialize
@@ -149,7 +156,7 @@ class MSpecMain < MSpecScript
if config[:multi] and config[:command] == "ci"
multi_exec argv
- else
+ else
exec config[:target], *argv
end
end
diff --git a/Merlin/Main/Languages/Ruby/Licenses/README.txt b/Merlin/Main/Languages/Ruby/Licenses/README.txt
deleted file mode 100644
index 48a3c8b..0000000
--- a/Merlin/Main/Languages/Ruby/Licenses/README.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-IronRuby - A .NET Implementation of the Ruby language
-
-Authors:
- Daniele Alessandri, Shri Borde, Peter Bacon Darwin, Jim Deville,
- Curt Hagenlocher, John Lam, Haibo Luo, Tomas Matousek, John Messerly,
- Jirapong Nanta, Srivatsn Narayanan, Jimmy Schementi, Oleg Tkachenko,
- Dino Viehland, and everyone else from the community who reports bugs,
- builds libraries, and helps enrich IronRuby.
-
-Project Contact: Jimmy Schementi <jimmysch at microsoft.com>
-
-== About
-
-IronRuby is a Open Source implementation of the Ruby programming language
-(http://www.ruby-lang.org) for .NET, heavily relying on Microsoft's
-Dynamic Language Runtime (http://dlr.codeplex.com).
-
-The project's #1 goal is to be a true Ruby implementation, meaning it runs
-existing Ruby code. See
-http://ironruby.net/Documentation/Real_Ruby_Applications for information about
-using the Ruby standard library and 3rd party libraries in IronRuby.
-
-IronRuby has tightly integration with .NET, so any .NET types can be used from
-IronRuby, and the IronRuby runtime can be embedded into any .NET application.
-See http://ironruby.net/documentation/.net for more information.
-
-== Running
-
-bin/ir.exe rubyfile.rb
-
-Will run rubyfile.rb with the IronRuby compiler.
-
-== Package
-
- /bin IronRuby binaries, ir.exe, iirb, irake, igem, iri, irdoc, etc.
- /lib Ruby standard library, including RubyGems
- CHANGELOG.txt Changes for each release
- RELEASE.txt Release notes
- LICENSE.Ruby.txt Ruby license
- LICENSE.CPL.txt Common Public License
- LICENSE.MSPL.html Microsoft Public License
- README.txt This file
-
-== License
-
-Read the License.* files
diff --git a/Merlin/Main/Languages/Ruby/Scripts/irtests.rb b/Merlin/Main/Languages/Ruby/Scripts/irtests.rb
deleted file mode 100644
index f63f275..0000000
--- a/Merlin/Main/Languages/Ruby/Scripts/irtests.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require 'optparse'
-require 'singleton'
-
-class IRTest
- include Singleton
- attr_accessor :options
- def initialize
- @options = {}
- @results = ["Results:"]
- @root = ENV["MERLIN_ROOT"]
- mspec_base = "mspec ci -fd"
- ir = "#{@root}\\bin\\debug\\ir.exe"
- @start = Time.now
- @suites = {
- :Smoke => "#{@root}\\Languages\\Ruby\\Tests\\Scripts\\irtest.bat",
- :Legacy => "#{@root}\\Languages\\Ruby\\Tests\\run.bat",
- :RubySpec_A => "#{mspec_base} :lang :cli :netinterop :cominterop :thread, :netcli",
- :RubySpec_B => "#{mspec_base} :core1 :lib1",
- :RubySpec_C => "#{mspec_base} :core2 :lib2",
- :RubyGems => "#{ir} #{@root}\\Languages\\Ruby\\Tests\\Scripts\\RubyGemsTests.rb",
- :Rake => "#{ir} #{@root}\\Languages\\Ruby\\Tests\\Scripts\\RakeTests.rb",
- :Yaml => "#{ir} #{@root}\\..\\External.LCA_RESTRICTED\\Languages\\IronRuby\\yaml\\YamlTest\\yaml_test_suite.rb"
- }
- end
-
- def self.method_missing(meth, *args, &blk)
- self.instance.send(meth, *args, &blk)
- end
-
- def run
- time("Starting")
- kill
- time("Compiling")
- build_all
- time("Running tests")
- test_all
- report
- end
-
- def time(str, start_time = 0)
- if start_time.kind_of? Time
- diff_secs = (Time.now - start_time).to_int
- mins = diff_secs / 60
- secs = diff_secs % 60
- puts "#{str} #{mins}:#{secs} minutes"
- else
- puts "#{str} #{Time.now}"
- end
- end
-
- def kill
- %w{ir.exe ipy.exe}.each do |app|
- 3.times do
- system "taskkill /f /im #{app} > nul: 2>&1"
- end
- end
- end
-
- def build_all
- if options[:nocompile]
- puts "Skipping compile step..."
- return
- end
- msbuild "Ruby\\Ruby.sln"
- msbuild "IronPython\\IronPython.sln"
-
- if File.exists?(file = "#{@root}\\Scripts\\Python\\GenerateSystemCoreCsproj.py")
- cmd = "#{@root}\\Bin\\Debug\\ipy.exe #{file}"
- run_cmd(cmd) { @results << "Dev10 Build failed!!!" }
- end
- end
-
- def msbuild(project)
- cmd = "msbuild.exe /verbosity:minimal #{@root}\\Languages\\#{project} /p:Configuration=\"Debug\""
- run_cmd(cmd) { exit 1 }
- end
-
- def test_all
- @suites.each_key do |key|
- test(key)
- end
- end
-
- def test(suite)
- title = suite.to_s.gsub("_", " ") << " Tests"
- test = @suites[suite]
- cmd = nil
- if options[:parallel]
- cmd = "start \"#{title}\" #{test}"
- else
- puts title
- cmd = test
- end
- time(title)
- run_cmd(cmd) { @results << "#{title} failed!!!"}
- end
-
- def run_cmd(cmd, &blk)
- blk.call unless system cmd
- end
-
- def report
- exit_code = if @results.size == 1
- puts "Success!!"
- 0
- else
- puts @results.join("\n")
- 1
- end
-
- time("Finished")
- time("Total Elapsed time: ", @start)
- exit exit_code
- end
-end
-
-if $0 == __FILE__
- OptionParser.new do |opts|
- opts.banner = "Usage: irtests.rb [options]"
-
- opts.separator ""
-
- opts.on("-p", "--[no-]parallel", "Run in parallel") do |p|
- IRTest.options[:parallel] = p
- end
-
- opts.on("-n", "--nocompile", "Don't compile before running") do |n|
- IRTest.options[:nocompile] = n
- end
-
- opts.on_tail("-h", "--help", "Show this message") do |n|
- puts opts
- exit
- end
- end.parse!
-
- IRTest.run
-end
diff --git a/Merlin/Main/Languages/Ruby/context.rb b/Merlin/Main/Languages/Ruby/context.rb
index 27c8281..4e1bc81 100644
--- a/Merlin/Main/Languages/Ruby/context.rb
+++ b/Merlin/Main/Languages/Ruby/context.rb
@@ -383,6 +383,7 @@ class CSProjCompiler
# signing is on for IronRuby in Merlin, off for SVN and Binary
layout = {'Merlin' => { :LibraryPaths => '..\..\Languages\Ruby\libs;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\lib\ruby\site_ruby\1.8;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\lib\ruby\site_ruby;..\..\..\External.LCA_RESTRICTED\Languages\Ruby\Ruby-1.8.6p287\lib\ruby\1.8' },
'Binary' => { :LibraryPaths => '..\lib\IronRuby;..\lib\ruby\site_ruby\1.8;..\lib\ruby\site_ruby;..\lib\ruby\1.8' },
+ 'MerlinMono' => { :LibraryPaths => '../../Languages/Ruby/libs;../../../External.LCA_RESTRICTED/Languages/Ruby/Ruby-1.8.6p287/lib/ruby/site_ruby/1.8;../../../External.LCA_RESTRICTED/Languages/Ruby/Ruby-1.8.6p287/lib/ruby/site_ruby;../../../External.LCA_RESTRICTED/Languages/Ruby/Ruby-1.8.6p287/lib/ruby/1.8' },
'MonoRL' => { :LibraryPaths => '../lib;../lib/ironruby;../lib/ruby/site_ruby/1.8/;../lib/ruby/site_ruby/;../lib/ruby/1.8/' } }
transform_config source_path, target_build_path, layout[configuration][:LibraryPaths]
@@ -391,7 +392,7 @@ class CSProjCompiler
def move_config(name = "ir.exe.config")
source = project_root + "Config/Unsigned/App.config"
config_file = build_path + name
- transform_config_file(mono? ? 'MonoRL' : 'Merlin', source, config_file)
+ transform_config_file(mono? ? ((ENV['configuration']||:debug).to_sym == :debug ? 'MerlinMono' : 'MonoRL' ) : 'Merlin', source, config_file)
end
def method_missing(name, *args)
diff --git a/Merlin/Main/Languages/Ruby/default.mspec b/Merlin/Main/Languages/Ruby/default.mspec
index 6604352..6cdb858 100644
--- a/Merlin/Main/Languages/Ruby/default.mspec
+++ b/Merlin/Main/Languages/Ruby/default.mspec
@@ -12,4 +12,4 @@
#
#
# ****************************************************************************
-load "#{ENV['MERLIN_ROOT']}\\..\\External.LCA_RESTRICTED\\Languages\\IronRuby\\mspec\\default.mspec"
+load "#{ENV['MERLIN_ROOT']}/../External.LCA_RESTRICTED/Languages/IronRuby/mspec/default.mspec"
diff --git a/Merlin/Main/Languages/Ruby/rake/package.rake b/Merlin/Main/Languages/Ruby/rake/package.rake
index 9e8c6f6..1a1031d 100644
--- a/Merlin/Main/Languages/Ruby/rake/package.rake
+++ b/Merlin/Main/Languages/Ruby/rake/package.rake
@@ -14,8 +14,8 @@
# ****************************************************************************
MERLIN_ROOT = (ENV['MERLIN_ROOT'] || File.expand_path(File.dirname(__FILE__) + '/../../..')).gsub(/\\/, '/') # paths need forward slashes or Dir.glob isn't happy
-PACKAGE_DIR = mono? ? "#{MERLIN_ROOT}/../../dist#{"-debug" if ENV['configuration'] == "debug"}" : 'c:/ironruby' # directory that binary package is created in
-PYTHON_PACKAGE_DIR = mono? ? "#{MERLIN_ROOT}/../../python-dist#{"-debug" if ENV['configuration'] == "debug"}" : 'c:/ironpython' # directory that binary package is created in
+PACKAGE_DIR = mono? ? "#{MERLIN_ROOT}/../../dist/ironruby#{"-debug" if ENV['configuration'] == "debug"}" : 'c:/ironruby' # directory that binary package is created in
+PYTHON_PACKAGE_DIR = mono? ? "#{MERLIN_ROOT}/../../python-dist/ironpython#{"-debug" if ENV['configuration'] == "debug"}" : 'c:/ironpython' # directory that binary package is created in
BUILD_BIN = "#{MERLIN_ROOT}/Bin/#{'mono_' if mono?}#{ENV['configuration'] || "release"}"
DIST_DIR = mono? ? "#{MERLIN_ROOT}/../../pkg" : "C:/"
IRONRUBY_VERSION = `git rev-parse HEAD`[0..6] # replace to version for a release "0.9"
diff --git a/ndp/fx/src/Core/Microsoft/Scripting/Actions/DynamicObject.cs b/ndp/fx/src/Core/Microsoft/Scripting/Actions/DynamicObject.cs
index 5fd0df6..3bb2c35 100644
--- a/ndp/fx/src/Core/Microsoft/Scripting/Actions/DynamicObject.cs
+++ b/ndp/fx/src/Core/Microsoft/Scripting/Actions/DynamicObject.cs
@@ -17,7 +17,6 @@ using System.Diagnostics;
using System.Dynamic.Utils;
using System.Linq.Expressions;
using System.Reflection;
-using System.Dynamic.Utils;
using System.Collections.Generic;
namespace System.Dynamic {
--
ironruby
More information about the Pkg-cli-libs-commits
mailing list