Merge branch '6.2'

Author: ignisf

.gitignore

@@ -13,3 +13,6 @@ lib/libv8/VERSION
 /release/**/libv8
 /release/**/.vagrant
 /release/**/.scaleway
+/vendor/.gclient
+/vendor/.gclient_entries
+/vendor/v8/

.gitmodules

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

.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.4.1
-  - 2.3.4
+  - 2.4.2
+  - 2.3.5
   - 2.2
   - rbx
 matrix:
@@ -17,7 +17,7 @@ matrix:
       osx_image: xcode6.4
     - rvm: 2.4.0
       os: osx
-      osx_image: xcode9
+      osx_image: xcode9.1
     - rvm: system
       os: osx
       osx_image: xcode8.2
@@ -29,7 +29,7 @@ matrix:
       osx_image: xcode6.4
     - rvm: system
       os: osx
-      osx_image: xcode9
+      osx_image: xcode9.1
     - rvm: ruby-2.3.1-clang
       env: CXX=clang++
     - rvm: 1.9.3

Rakefile

@@ -102,6 +102,7 @@ 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
 

ext/libv8/builder.rb

@@ -112,12 +112,19 @@ def source_version
     #
     def setup_build_deps!
       ENV['PATH'] = "#{File.expand_path('../../../vendor/depot_tools', __FILE__)}:#{ENV['PATH']}"
-      Dir.chdir(File.expand_path('../../../vendor/v8', __FILE__)) do
-        unless system "git checkout #{source_version}"
-          fail "unable to checkout source for v8 #{source_version}"
+      Dir.chdir(File.expand_path('../../../vendor', __FILE__)) do
+        unless Dir.exists? 'v8'
+          system "env #{gyp_defines} fetch v8" or fail "unable to fetch v8 source"
+        else
+          system "env #{gyp_defines} gclient fetch" or fail "could not fetch v8 build dependencies commits"
+        end
+        Dir.chdir('v8') do
+          unless system "git checkout #{source_version}"
+            fail "unable to checkout source for v8 #{source_version}"
+          end
+          system "env #{gyp_defines} gclient sync" or fail "could not sync v8 build dependencies"
+          system "git checkout Makefile" # Work around a weird bug on FreeBSD
         end
-        system "env #{gyp_defines} gclient sync -n" or fail "could not sync v8 build dependencies"
-        system "git checkout Makefile" # Work around a weird bug on FreeBSD
       end
     end
 

ext/libv8/paths.rb

@@ -11,7 +11,7 @@ def include_paths
     end
 
     def object_paths
-      [:base, :libbase, :snapshot, :libplatform, :libsampler].map do |name|
+      [:base, :libplatform, :libsampler, :libbase, :snapshot].map do |name|
         Shellwords.escape libv8_object(name)
       end
     end

lib/libv8/version.rb

@@ -1,3 +1,3 @@
 module Libv8
-  VERSION = "6.0.286.54.1"
+  VERSION = "6.2.414.32.0beta1"
 end

patches/0001-Build-a-standalone-static-library.patch

@@ -1,17 +1,17 @@
-From 6c28fb0319c5e2e7afad4b5731fc0ded86e1f7e7 Mon Sep 17 00:00:00 2001
+From ab2830d1cb3ba231c3ed3de4ed59e19c65e6e1d4 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:00:19 +0300
-Subject: [PATCH 1/5] Build a standalone static library
+Subject: [PATCH 1/4] Build a standalone static library
 
 ---
  gypfiles/standalone.gypi | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
-index 4c805bf643..6a72a23cfb 100644
+index 63930d8aef..d0d00d3f67 100644
 --- a/gypfiles/standalone.gypi
 +++ b/gypfiles/standalone.gypi
-@@ -522,6 +522,9 @@
+@@ -517,6 +517,9 @@
        }],  # fastbuild!=0
      ],
      'target_conditions': [
@@ -22,5 +22,5 @@ index 4c805bf643..6a72a23cfb 100644
          'defines!': [
            'DEBUG',
 -- 
-2.13.3
+2.14.2
 

patches/0002-Don-t-compile-unnecessary-stuff.patch

@@ -1,36 +1,34 @@
-From 31d199f67ff88be5576869abcc23ecf219fa1e6f Mon Sep 17 00:00:00 2001
+From 8b85dc00cfffe510e51677641586732396fe4cf0 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Fri, 28 Jul 2017 11:11:08 +0300
-Subject: [PATCH 2/5] Don't compile unnecessary stuff
+Subject: [PATCH 2/4] Don't compile unnecessary stuff
 
 ---
- Makefile         | 12 +++---------
+ Makefile         |  9 ++-------
  gypfiles/all.gyp | 33 ---------------------------------
- 2 files changed, 3 insertions(+), 42 deletions(-)
+ 2 files changed, 2 insertions(+), 40 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ed5b3a7fab..04eddb5e8a 100644
+index eb146ac244..902832af48 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -265,15 +265,9 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
- 		 android_mipsel android_x87
+@@ -268,14 +268,9 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
+ 		 android_mipsel
 
  # List of files that trigger Makefile regeneration:
 -GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
 -	   gypfiles/shim_headers.gypi gypfiles/features.gypi \
 -           gypfiles/standalone.gypi \
--	   gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
++GYPFILES = gypfiles/features.gypi gypfiles/standalone.gypi \
+ 	   gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
 -	   test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
 -	   test/unittests/unittests.gyp src/v8.gyp \
 -	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
--	   buildtools/third_party/libc++abi/libc++abi.gyp \
--	   buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
-+GYPFILES = gypfiles/shim_headers.gypi gypfiles/features.gypi \
-+           gypfiles/standalone.gypi gypfiles/all.gyp \
-+	   gypfiles/mac/asan.gyp src/v8.gyp tools/parser-shell.gyp \
- 	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
+-	   samples/samples.gyp src/third_party/vtune/v8vtune.gyp src/d8.gyp
++	   src/v8.gyp src/d8.gyp
 
  # If vtunejit=on, the v8vtune.gyp will be appended.
+ ifeq ($(vtunejit), on)
 diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp
 index bc9d9650eb..96820a0ecc 100644
 --- a/gypfiles/all.gyp
@@ -83,5 +81,5 @@ index bc9d9650eb..96820a0ecc 100644
      }
    ]
 -- 
-2.13.3
+2.14.2
 

patches/0003-Use-the-fPIC-flag-for-the-static-library.patch

@@ -1,17 +1,17 @@
-From fe76837b00357250a01ad71c4cce4b7524dd765f Mon Sep 17 00:00:00 2001
+From 6d8fb9964719799a423db755f84dfe582dd0040e Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:05:47 +0300
-Subject: [PATCH 3/5] Use the -fPIC flag for the static library
+Subject: [PATCH 3/4] Use the -fPIC flag for the static library
 
 ---
  gypfiles/standalone.gypi | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
-index 6a72a23cfb..fdf27226ad 100644
+index d0d00d3f67..f01bd48596 100644
 --- a/gypfiles/standalone.gypi
 +++ b/gypfiles/standalone.gypi
-@@ -800,7 +800,7 @@
+@@ -797,7 +797,7 @@
            [ 'visibility=="hidden" and v8_enable_backtrace==0', {
              'cflags': [ '-fvisibility=hidden' ],
            }],
@@ -21,5 +21,5 @@ index 6a72a23cfb..fdf27226ad 100644
            }],
            [ 'clang==0 and coverage==1', {
 -- 
-2.13.3
+2.14.2