From 0f9667847096c1f20f7e784ea009c43d8835b1db Mon Sep 17 00:00:00 2001
From: Charles Lowell <cowboyd@frontside.io>
Date: Mon, 13 Jul 2015 15:38:03 -0500
Subject: [PATCH] enhance the binary builders by

* doing a full clone of the depot tools. I thought that I could save
  some time, but it means that building the binaries is not idempotent
* using rvm instead of system ruby
---
 Rakefile                         |  3 +--
 release/x86-linux/Vagrantfile    | 14 +++++++++-----
 release/x86_64-linux/Vagrantfile | 14 +++++++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Rakefile b/Rakefile
index 49754df0..e43da122 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,8 +57,7 @@ namespace :build do
       arch_dir = Pathname(__FILE__).dirname.join("release/#{arch}")
       Dir.chdir(arch_dir) do
         sh "vagrant up"
-        sh "vagrant ssh -c 'rm -rf libv8 && git clone /libv8/.git libv8'"
-        sh "vagrant ssh -c 'cd libv8 && git submodule update --init --depth=1'"
+        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'"
diff --git a/release/x86-linux/Vagrantfile b/release/x86-linux/Vagrantfile
index be2221b4..1848475e 100644
--- a/release/x86-linux/Vagrantfile
+++ b/release/x86-linux/Vagrantfile
@@ -66,10 +66,14 @@ Vagrant.configure(2) do |config|
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
-    sudo apt-get update
-    sudo apt-get install -y gcc-4.8 g++-4.8 build-essential git git-svn python ruby ruby-dev
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
-    sudo update-alternatives --config gcc
-    gem install bundler
+    apt-get update
+    apt-get install -y gcc-4.8 g++-4.8 build-essential git git-svn python ruby ruby-dev emacs
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
+    update-alternatives --config gcc
+    su -c 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3' - vagrant
+    su -c '\\curl -sSL https://get.rvm.io | bash -s stable' - vagrant
+    su -c 'rvm install 2.2.2 --disable-binary' - vagrant
+    su -c 'rvm --default use 2.2.2' - vagrant
+    su -c 'gem install bundler' - vagrant
   SHELL
 end
diff --git a/release/x86_64-linux/Vagrantfile b/release/x86_64-linux/Vagrantfile
index f06a1ed0..7deda6f7 100644
--- a/release/x86_64-linux/Vagrantfile
+++ b/release/x86_64-linux/Vagrantfile
@@ -66,10 +66,14 @@ Vagrant.configure(2) do |config|
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
-    sudo apt-get update
-    sudo apt-get install -y gcc-4.8 g++-4.8 build-essential git git-svn python ruby ruby-dev
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
-    sudo update-alternatives --config gcc
-    gem install bundler
+     apt-get update
+     apt-get install -y gcc-4.8 g++-4.8 build-essential git git-svn python ruby ruby-dev emacs
+     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
+     update-alternatives --config gcc
+     su -c 'gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3' - vagrant
+     su -c '\\curl -sSL https://get.rvm.io | bash -s stable' - vagrant
+     su -c 'rvm install 2.2.2 --disable-binary' - vagrant
+     su -c 'rvm --default use 2.2.2' - vagrant
+     su -c 'gem install bundler' - vagrant
   SHELL
 end