1
0
Fork 0
mirror of https://github.com/rubyjs/therubyracer synced 2023-03-27 23:21:42 -04:00

Merge branch 'master' into 0.10

Conflicts:
	lib/v8/version.rb
This commit is contained in:
Charles Lowell 2012-03-28 15:40:29 -05:00
commit 410fe595da
7 changed files with 43 additions and 26 deletions

9
.travis.yml Normal file
View file

@ -0,0 +1,9 @@
rvm:
- 1.9.2
- 1.9.3
- 1.8.7
notifications:
recipients:
- cowboyd@thefrontside.net
script: bundle exec rake compile spec
before_install: git submodule update --init

View file

@ -138,6 +138,9 @@ To use the ruby racer in rails, or any application using Bundler to manage gems,
bundle install
rake compile
## Sponsored by
<a href="http://thefrontside.net">![The Frontside](http://github.com/cowboyd/therubyracer/raw/master/thefrontside.png)</a>
## LICENSE:
(The MIT License)

View file

@ -18,8 +18,8 @@ $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
$CPPFLAGS += " -g" unless $CPPFLAGS.split.include? "-g"
$CPPFLAGS += " -rdynamic" unless $CPPFLAGS.split.include? "-rdynamic"
$DEFLIBPATH.unshift(Libv8.library_path)
$LIBS << ' -lv8 -lpthread'
$LDFLAGS.insert 0, "#{Libv8.library_path}/libv8.#{$LIBEXT} "
$LIBS << ' -lpthread'
CONFIG['LDSHARED'] = '$(CXX) -shared' unless RUBY_PLATFORM =~ /darwin/

View file

@ -63,10 +63,11 @@ module V8
def self.test
begin
require 'rubygems'
require 'rspec'
specs = File.expand_path('../../../spec', __FILE__)
$:.unshift specs
ARGV.clear
ARGV << File.dirname(__FILE__) + '/../../spec/'
ARGV << specs
::RSpec::Core::Runner.autorun
exit(0)
rescue LoadError => e

View file

@ -84,6 +84,10 @@ module V8
[]
end
end
def self.passes_this_argument?
true
end
end
module C

View file

@ -74,7 +74,7 @@ module V8
if id = @rb_proxies_js2rb[object]
ObjectSpace._id2ref id
end
rescue RangeError => e
rescue RangeError
# sometimes, the Ruby proxy has been garbage collected, but
# the finalizer which runs has not been called. That's OK
# we just clear out the entry, and return nil so that a new

BIN
thefrontside.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB