Permalink
Browse files

Merge branch 'master', remote-tracking branch 'origin' into 2.0.testing

  • Loading branch information...
2 parents a5a51aa + 156fd26 commit e0e5d5ab6a0bb400890de8346c18527a42e30965 @brixen brixen committed Oct 3, 2012
Showing with 3,908 additions and 563 deletions.
  1. +51 −0 CONTRIBUTING
  2. +5 −6 README
  3. +1 −1 Rakefile
  4. +168 −89 configure
  5. +10 −0 kernel/bootstrap/rubinius.rb
  6. +10 −15 kernel/bootstrap/thread.rb
  7. +41 −4 kernel/bootstrap/thread18.rb
  8. +37 −5 kernel/bootstrap/thread19.rb
  9. +2 −0 kernel/common/hash.rb
  10. +4 −2 kernel/common/module.rb
  11. +6 −1 kernel/common/process19.rb
  12. +1 −0 kernel/loader.rb
  13. +1 −0 lib/18/iconv.rb
  14. +2 −0 lib/18/iconv/ext/.gitignore
  15. +103 −0 lib/18/iconv/ext/charset_alias.rb
  16. +5 −0 lib/18/iconv/ext/extconf.h
  17. +51 −0 lib/18/iconv/ext/extconf.rb
  18. +927 −0 lib/18/iconv/ext/iconv.c
  19. +1 −0 lib/19/iconv.rb
  20. +2 −0 lib/19/iconv/ext/.gitignore
  21. +104 −0 lib/19/iconv/ext/charset_alias.rb
  22. +5 −0 lib/19/iconv/ext/extconf.h
  23. +54 −0 lib/19/iconv/ext/extconf.rb
  24. +1,259 −0 lib/19/iconv/ext/iconv.c
  25. +53 −0 lib/19/iconv/ext/mkwrapper.rb
  26. +7 −1 lib/compiler/ast/definitions.rb
  27. +0 −237 lib/iconv.rb
  28. +2 −0 lib/syslog.rb.ffi
  29. +2 −1 lib/tooling/coverage/ext/coverage.cpp
  30. +6 −0 rakelib/extensions.rake
  31. +6 −3 rakelib/install.rake
  32. +9 −0 spec/ruby/core/module/const_missing_spec.rb
  33. +5 −0 spec/ruby/language/block_spec.rb
  34. +14 −0 spec/ruby/language/fixtures/block.rb
  35. +34 −0 spec/ruby/language/fixtures/metaclass.rb
  36. +36 −0 spec/ruby/language/metaclass_spec.rb
  37. +14 −0 spec/ruby/library/syslog/mask_spec.rb
  38. +7 −0 spec/ruby/optional/capi/encoding_spec.rb
  39. +13 −0 spec/ruby/optional/capi/ext/encoding_spec.c
  40. +54 −0 spec/ruby/optional/capi/ext/kernel_spec.c
  41. +3 −1 spec/ruby/optional/capi/ext/module_under_autoload_spec.c
  42. +7 −0 spec/ruby/optional/capi/ext/rubyspec.h
  43. +20 −0 spec/ruby/optional/capi/ext/string_spec.c
  44. +4 −0 spec/ruby/optional/capi/fixtures/module.rb
  45. +4 −0 spec/ruby/optional/capi/fixtures/module_autoload.rb
  46. +40 −0 spec/ruby/optional/capi/kernel_spec.rb
  47. +8 −4 spec/ruby/optional/capi/module_spec.rb
  48. +24 −0 spec/ruby/optional/capi/string_spec.rb
  49. +10 −2 spec/ruby/shared/process/exec.rb
  50. +13 −9 spec/ruby/shared/process/spawn.rb
  51. +0 −3 spec/tags/18/ruby/core/thread/exit_tags.txt
  52. +0 −3 spec/tags/18/ruby/core/thread/kill_tags.txt
  53. +0 −3 spec/tags/18/ruby/core/thread/terminate_tags.txt
  54. +0 −2 spec/tags/18/ruby/library/iconv/charset_map_tags.txt
  55. +0 −2 spec/tags/19/ruby/core/thread/kill_tags.txt
  56. +0 −2 spec/tags/19/ruby/core/thread/terminate_tags.txt
  57. +0 −2 spec/tags/19/ruby/library/iconv/charset_map_tags.txt
  58. +3 −2 vm/agent.cpp
  59. +1 −1 vm/agent.hpp
  60. +61 −0 vm/builtin/encoding.cpp
  61. +11 −0 vm/builtin/encoding.hpp
  62. +1 −0 vm/builtin/fiber.cpp
  63. +26 −6 vm/builtin/nativemethod.cpp
  64. +1 −0 vm/builtin/nativemethod.hpp
  65. +12 −0 vm/builtin/object.cpp
  66. +21 −71 vm/builtin/string.cpp
  67. +31 −1 vm/builtin/system.cpp
  68. +6 −0 vm/builtin/system.hpp
  69. +22 −6 vm/builtin/thread.cpp
  70. +6 −0 vm/builtin/thread.hpp
  71. +1 −0 vm/builtin/time.cpp
  72. +1 −1 vm/call_frame.cpp
  73. +4 −0 vm/capi/18/include/ruby.h
  74. +1 −0 vm/capi/19/include/ruby/encoding.h
  75. +13 −0 vm/capi/19/include/ruby/ruby.h
  76. +64 −29 vm/capi/capi.cpp
  77. +9 −4 vm/capi/class.cpp
  78. +12 −0 vm/capi/encoding.cpp
  79. +4 −0 vm/capi/kernel.cpp
  80. +10 −6 vm/capi/module.cpp
  81. +18 −0 vm/capi/string.cpp
  82. +10 −3 vm/fiber_stack.cpp
  83. +3 −0 vm/fiber_stack.hpp
  84. +1 −1 vm/gc/gc.cpp
  85. +1 −1 vm/gc/root.hpp
  86. +2 −2 vm/helpers.cpp
  87. +4 −0 vm/instructions.cpp
  88. +255 −13 vm/llvm/inline_primitive.cpp
  89. +2 −0 vm/llvm/jit_operations.hpp
  90. +0 −1 vm/llvm/state.cpp
  91. +4 −4 vm/objectmemory.cpp
  92. +1 −1 vm/objectmemory.hpp
  93. +9 −8 vm/oop.cpp
  94. +3 −3 vm/oop.hpp
  95. +2 −1 vm/raise_reason.hpp
  96. +5 −0 vm/state.cpp
  97. +7 −0 vm/symboltable.hpp
  98. +4 −0 vm/thread_state.cpp
  99. +1 −0 vm/thread_state.hpp
  100. +8 −0 vm/vm.cpp
  101. +2 −0 vm/vm.hpp
View
@@ -0,0 +1,51 @@
+We want to start off by saying thank you for using Rubinius. This project is a
+labor of love, and we appreciate all of the users that catch bugs, make
+performance improvements, and help with documentation. Every contribution is
+meaningful, so thank you for participating. That being said, here are a few
+guidelines that we ask you to follow so we can successfully address your issue.
+
+1. Submitting Issues
+
+Please include the following:
+
+* The Rubinius version (rbx -v)
+* Your OS (uname -a) RVM/rbenv/chruby/etc version or the commit hash from git
+ if you're building off of a clone
+* Stack trace (preferably as a gist, since they're easier to read) If you can
+ add a failing spec, that's great!
+* Please include the simplest possible reproduction you can. This last point is
+ vital to fixing issues.
+
+2. Fixing a bug
+
+* Fork the repo Create a topic branch Include a spec, if appropriate.
+ Pull requests that need a spec but are submitted without one will be delayed
+ until one is written. The spec should be in a separate commit.
+* Please follow the Coding Style Guide at
+ http://rubini.us/doc/en/contributing/style-guide
+* ALWAYS RUN THE FULL SPEC SUITE! rake will run the VM specs, plus all 1.8 and
+ 1.9 specs.
+* Please add a * detailed commit message. Here is a fantastic example by
+ @ryoqun https://github.com/rubinius/rubinius/commit/1f9ddd1
+ The preference is for a (max) 50 character summary as line one, a blank line,
+ then any number of lines, no longer than 80 characters.
+* Send in that pull request!
+* Follow up with us on the ticket if we haven't merged or commented in a few
+ days. We strive to address issues in a reasonable time. If we miss yours,
+ please remind us.
+
+3. Performance patches
+
+We love these!
+
+* Include benchmarks before and after the change. Please include your hardware
+ specs, namely CPU speed, # of cores, speed of hard drive (if SSD, then SSD is
+ fine) and amount of RAM.
+* ALWAYS RUN THE FULL SPEC SUITE! rake will ensure you didn't accidentally
+ break anything.
+
+For more details on how to contribute, please see Contributing to Rubinius
+http://rubini.us/2011/10/18/contributing-to-rubinius/ Also, feel free to hang
+out in #rubinius on Freenode.
+
+Again, thank you!
View
11 README
@@ -8,8 +8,8 @@ Ruby core library is written almost entirely in Ruby. Rubinius provides the
same standard libraries as Matz's Ruby implementation (MRI). Rubinius also
provides C-API compatibility for native C extensions.
-Rubinius currently is compatible with Ruby version 1.8.7. Support for Ruby
-version 1.9.2 is coming soon.
+Rubinius currently is compatible with Ruby version 1.8.7. Full support for Ruby
+version 1.9.3 is coming soon.
Rubinius runs on Mac OS X and many Unix/Linux operating systems. Support for
Microsoft Windows is coming soon.
@@ -57,8 +57,7 @@ To make Rubinius the default interpreter in new shells, run:
The documentation for RVM is available at:
- https://rvm.beginrescueend.com
-
+ https://rvm.io
5. Using RubyGems
@@ -82,5 +81,5 @@ Please file tickets for bugs or problems. The issue tracker is:
8. Contributing
-The Rubinius team welcomes contributions. Run 'rake docs' and see the
-"Contributing" page.
+The Rubinius team welcomes contributions. For more information read the
+CONTRIBUTING file in the root directory of Rubinius.
View
@@ -128,7 +128,7 @@ class SpecRunner
def self.set_at_exit_handler
return if @at_exit_handler_set
- at_exit { exit @at_exit_status }
+ at_exit { exit SpecRunner.at_exit_status }
@at_exit_handler_set = true
end
Oops, something went wrong.

0 comments on commit e0e5d5a

Please sign in to comment.