Upgrade to v8 4.5

.gitignore

@@ -12,3 +12,6 @@ lib/libv8/VERSION
 /ext/libv8/.location.yml
 /release/**/libv8
 /release/**/.vagrant
+/vendor/.gclient
+/vendor/.gclient_entries
+/vendor/v8/

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "vendor/v8"]
-	path = vendor/v8
-	url = https://github.com/v8/v8.git
-[submodule "vendor/gyp"]
-	path = vendor/gyp
-	url = https://chromium.googlesource.com/external/gyp.git
+[submodule "vendor/depot_tools"]
+	path = vendor/depot_tools
+	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--warnings

.travis.yml

@@ -1,13 +1,42 @@
+language: ruby
 rvm:
+  - 2.2.2
+  - 2.1.2
   - 2.0.0
-  - 2.1.5
   - 1.9.3
-  - rbx
-bundler_args: --jobs=1 --retry=3
+  - rbx-2
+matrix:
+  include:
+    - rvm: ruby-2.2.2-clang
+      env: CXX=clang++
+    - rvm: ruby-head
+    - rvm: ruby-head-clang
+      env: CXX=clang++
+    - rvm: ree
+    - rvm: ruby-1.8.7
+  allow_failures:
+    - rvm: ree
+    - rvm: ruby-1.8.7
+    - rvm: ruby-head
+    - rvm: ruby-head-clang
+  fast_finish: true
+bundler_args: -j4 --retry=3
+script:
+  - MAKEFLAGS+=-j8 bundle exec rake spec build binary --trace
+  - MAKEFLAGS+=-j8 travis_wait gem install pkg/*.gem
 notifications:
   recipients:
     - cowboyd@thefrontside.net
     - bordjukov@gmail.com
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install git-svn
+cache: bundler
+sudo: false
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-4.8
+      - g++-4.8
+      - clang
+env:
+  - CXX=g++-4.8

README.md

@@ -1,7 +1,7 @@
 # libv8
 [![Gem Version](https://badge.fury.io/rb/libv8.svg)](http://badge.fury.io/rb/libv8)
 [![Build Status](https://travis-ci.org/cowboyd/libv8.svg?branch=master)](https://travis-ci.org/cowboyd/libv8)
-[![Build status](https://ci.appveyor.com/api/projects/status/ugeqff972kxlba5j?svg=true)](https://ci.appveyor.com/project/cowboyd/libv8)
+<!-- [![Build status](https://ci.appveyor.com/api/projects/status/ugeqff972kxlba5j?svg=true)](https://ci.appveyor.com/project/cowboyd/libv8) -->
 [![Join the chat at https://gitter.im/cowboyd/therubyracer](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cowboyd/therubyracer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A gem for distributing the v8 runtime libraries and headers in both
@@ -22,16 +22,11 @@ opens the door for supporting Windows.
 That depends on your platform. Right now, we support the following
 platforms.
 
-* x86_64-darwin10.7.0
-* x86_64-darwin-10
-* x86_64-darwin-11
-* x86_64-darwin-12
-* x86_64-darwin-13
+* x86_64-darwin-14
 * x86_64-linux
 * x86-linux
-* x86_64-freebsd-9
 * x86_64-freebsd-10
-* x86_64-solaris-2.11
+* i386-freebsd-10
 
 If you don't see your platform on this list, first, make sure that it
 installs from source, and second talk to us about setting up a binary
@@ -64,6 +59,16 @@ distribution
 
 > This step release system is a workaround to carlhuda/bundler#1537
 
+### Requirements
+
+Building the v8 library from source imposes the following requirements:
+
+*  A compiler that supports C++11 (such as GCC 4.8 and above or clang,
+preferably 3.5 and above)
+*  GNU Make
+*  Python 2
+*  git-svn
+
 ### Using a git version
 
 If you want to use the latest unstable version of the gem you can do
@@ -79,15 +84,14 @@ You can find more info on using a git repo as a gem source in
 
 ### What if I can't install from source?
 
-If you can fix the "Makefile" so that it correctly compiles for your
+If you can fix v8's build system so that it correctly compiles for your
 platform, we'll pull it right in!
 
 To get the source, these commands will get you started:
 
-    git clone git://github.com/cowboyd/libv8.git
+    git clone --recursive git://github.com/cowboyd/libv8.git
     cd libv8
     bundle install
-    bundle exec rake checkout
     bundle exec rake compile
 
 ### Bring your own V8
@@ -106,9 +110,15 @@ Using Bundler (in your Gemfile):
 
     bundle config build.libv8 --with-system-v8
 
+#### Gotchas
+
 Please note that if you intend to run your own V8, you must install
 both V8 *and its headers* (found in libv8-dev for Debian distros).
 
+Also keep in mind that v8's API does not tend to be stable and you need to make
+sure that the version of therubyracer you intend to use is compatible with the
+version of v8 present on your system. Otherwise therubyracer's build will fail.
+
 ### Bring your own compiler
 
 You can specify a compiler of your choice by either setting the `CXX`

Rakefile

@@ -1,112 +1,83 @@
 require 'bundler/setup'
-Bundler::GemHelper.install_tasks
-class Bundler::GemHelper
-  def clean?
-    sh_with_code('git diff --exit-code --ignore-submodules')[1] == 0
-  end
-end
-
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
-require File.expand_path '../ext/libv8/make.rb', __FILE__
-require File.expand_path '../ext/libv8/checkout.rb', __FILE__
-include Libv8::Make
-include Libv8::Checkout
 
-desc "setup the vendored v8 source to correspond to the libv8 gem version"
-task :checkout do
-  sh "git submodule update --init"
-  checkout!
-end
-
-desc "compile v8 via the ruby extension mechanism"
-task :compile => :devkit do
-  sh "ruby ext/libv8/extconf.rb"
-end
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new :spec
 
-desc "manually invoke the GYP compile. Useful for seeing debug output"
-task :manual_compile do
-  require File.expand_path '../ext/libv8/arch.rb', __FILE__
-  include Libv8::Arch
-  Dir.chdir(V8_Source) do
-    sh %Q{#{make} -j2 #{libv8_arch}.release ARFLAGS.target=crs}
+module Helpers
+  module_function
+  def binary_gemspec(platform = Gem::Platform.local)
+    gemspec = eval(File.read 'libv8.gemspec')
+    gemspec.platform = platform
+    gemspec
   end
-end
 
-def get_binary_gemspec(platform = RUBY_PLATFORM)
-  gemspec = eval(File.read('libv8.gemspec'))
-  gemspec.platform = Gem::Platform.new(platform)
-  gemspec
+  def binary_gem_name(platform = Gem::Platform.local)
+    File.basename binary_gemspec(platform).cache_file
+  end
 end
 
-begin
-  binary_gem_name = File.basename get_binary_gemspec.cache_file
-rescue
-  binary_gem_name = ''
+desc "compile v8 via the ruby extension mechanism"
+task :compile  do
+  sh "ruby ext/libv8/extconf.rb"
 end
 
-desc "build a binary gem #{binary_gem_name}"
+desc "build a binary gem #{Helpers.binary_gem_name}"
 task :binary => :compile do
-  gemspec = get_binary_gemspec
+  gemspec = Helpers.binary_gemspec
   gemspec.extensions.clear
+
   # We don't need most things for the binary
   gemspec.files = []
   gemspec.files += ['lib/libv8.rb', 'lib/libv8/version.rb']
   gemspec.files += ['ext/libv8/arch.rb', 'ext/libv8/location.rb', 'ext/libv8/paths.rb']
   gemspec.files += ['ext/libv8/.location.yml']
+
   # V8
-  gemspec.files += Dir['vendor/v8/include/*']
+  gemspec.files += Dir['vendor/v8/include/**/*.h']
   gemspec.files += Dir['vendor/v8/out/**/*.a']
-  FileUtils.chmod 'a+r', gemspec.files
+
+  FileUtils.chmod 0644, gemspec.files
   FileUtils.mkdir_p 'pkg'
+
   package = if Gem::VERSION < '2.0.0'
     Gem::Builder.new(gemspec).build
   else
     require 'rubygems/package'
-    Gem::Package.build(gemspec)
+    Gem::Package.build gemspec
   end
-  FileUtils.mv(package, 'pkg')
-end
 
-desc "clean up artifacts of the build"
-task :clean do
-  sh "rm -rf pkg"
-  sh "git clean -df"
-  sh "cd #{V8_Source} && git checkout -f && git clean -dxf"
-  if Dir.chdir GYP_Source
-    sh "git checkout -f"
-    puts "git clean -dxf"
-    `git clean -dxf`
-  end
-end
-
-task :devkit do
-  begin
-    if RUBY_PLATFORM =~ /mingw/
-      require "devkit"
-    end
-  rescue LoadError => e
-    abort "Failed to activate RubyInstaller's DevKit required for compilation."
-  end
+  FileUtils.mv package, 'pkg'
 end
 
 namespace :build do
-  ['x86_64-linux', 'x86-linux'].each do |arch|
+  ['x86_64-linux', 'x86-linux', 'x86_64-freebsd10'].each do |arch|
     desc "build binary gem for #{arch}"
     task arch do
       arch_dir = Pathname(__FILE__).dirname.join("release/#{arch}")
       Dir.chdir(arch_dir) do
         sh "vagrant up"
-        sh "vagrant ssh -c 'cd /vagrant && rm -rf libv8 && git clone /libv8/.git libv8'"
-        sh "vagrant ssh -c 'cd /vagrant/libv8 && bundle install --path vendor/bundle'"
-        sh "vagrant ssh -c 'cd /vagrant/libv8 && bundle exec rake checkout binary'"
-        sh "vagrant ssh -c 'cp /vagrant/libv8/pkg/*.gem /vagrant'"
+        sh "vagrant ssh -c 'rm -rf libv8 && git clone --recursive /libv8/.git libv8'"
+        sh "vagrant ssh -c 'cd libv8 && bundle install --path vendor/bundle'"
+        sh "vagrant ssh -c 'cd libv8 && bundle exec rake binary'"
+        sh "vagrant ssh -c 'cp libv8/pkg/*.gem /vagrant'"
       end
     end
   end
+end
+
+task :clean_submodules do
+  sh "git submodule --quiet foreach git reset --hard"
+  sh "git submodule --quiet foreach git clean -dxf"
+  sh "git submodule update --init"
+end
 
+desc "clean up artifacts of the build"
+task :clean => [:clean_submodules] do
+  sh "rm -rf pkg"
+  sh "rm -rf vendor/v8"
+  sh "git clean -dxf -e .bundle -e vendor/bundle"
 end
 
-task :default => [:checkout, :compile, :spec]
-task :build => [:clean, :checkout]
+task :default => [:compile, :spec]
+task :build => [:clean]

ext/libv8/arch.rb

@@ -1,42 +1,18 @@
-require 'rbconfig'
+require 'rubygems'
 
 module Libv8
   module Arch
     module_function
 
-    def x86_64_from_build_cpu
-      RbConfig::MAKEFILE_CONFIG['build_cpu'] == 'x86_64'
-    end
-
-    def x86_64_from_byte_length
-      ['foo'].pack('p').size == 8
-    end
-
-    def x86_64_from_arch_flag
-      RbConfig::MAKEFILE_CONFIG['ARCH_FLAG'] =~ /x86_64/
-    end
-
-    def rubinius?
-      Object.const_defined?(:RUBY_ENGINE) && RUBY_ENGINE == "rbx"
-    end
-
-    # TODO fix false positive on 64-bit ARM
-    def x64?
-      if rubinius?
-        x86_64_from_build_cpu || x86_64_from_arch_flag
-      else
-        x86_64_from_byte_length
-      end
-    end
-
-    def arm?
-      RbConfig::MAKEFILE_CONFIG['build_cpu'] =~ /^arm/
-    end
-
     def libv8_arch
-      if arm? then "arm"
-      elsif x64? then "x64"
-      else "ia32"
+      case Gem::Platform.local.cpu
+      when /^arm$/            then 'arm'
+      when /^a(rm|arch)64$/   then 'arm64'
+      when /^x86$/            then 'ia32'
+      when /^(x86_64|amd64)$/ then 'x64'
+      else
+        warn "Unsupported target: #{Gem::Platform.local.cpu}"
+        Gem::Platform.local.cpu
       end
     end
   end