Merge update of Vagrant box to 14.04 and automatic installation and u…

…pgrading of VirtualBox Guest Additions. Fix bug 1064411. Close #326.

Vagrantfile

@@ -18,13 +18,14 @@ end
 CONF = _config
 MOUNT_POINT = '/home/vagrant/dxr'
 
-
 Vagrant::Config.run do |config|
-    config.vm.box = "saucy64"
-    config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-amd64-vagrant-disk1.box"
+    config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+    config.vm.box = "ubuntu/trusty64"
 
     Vagrant.configure("1") do |config|
         config.vm.customize ["modifyvm", :id, "--memory", CONF['memory']]
+        # Make sure guest additions are up to date!
+        config.vbguest.auto_update = true
     end
 
     Vagrant.configure("2") do |config|

docs/source/download-boot-and-build.rst

@@ -20,6 +20,7 @@ for it. We recommend VirtualBox.
 Once you've installed VirtualBox and Vagrant, run these commands in DXR's
 top-level directory::
 
+   vagrant plugin install vagrant-vbguest
    vagrant up
    vagrant ssh
 
@@ -30,10 +31,14 @@ Then, run this inside the VM::
 
 .. note::
 
-   The Vagrant image is built for VirtualBox 4.2.0.  If your version is older,
+   The Vagrant image is built for VirtualBox 4.2.0 or newer.  If your version is older,
    the image might not work as expected.
 
+   Your Vagrant version may require a specific vbguest plugin installation method.
+   If you receive errors about the plugin visit the vbguest_ plugin page.
 
 .. _TriLite SQLite extension: https://github.com/jonasfj/trilite
 
 .. _Vagrant: http://www.vagrantup.com/
+
+.. _vbguest: https://github.com/dotless-de/vagrant-vbguest

jenkins.sh

@@ -4,6 +4,11 @@
 git submodule sync
 git submodule update --init --recursive
 
+VBGUEST=$(vagrant plugin list |grep -i vbguest)
+if [ ! "$VBGUEST" ]; then
+  vagrant plugin install vagrant-vbguest
+fi;
+
 /opt/vagrant/bin/vagrant up
 /opt/vagrant/bin/vagrant ssh -c 'cd /home/vagrant/dxr && make clean && make test'
 RESULT=$?

vagrant_provision.sh

@@ -5,10 +5,11 @@ set -e
 set -x
 
 apt-get update
+# clean out redundant packages from vagrant base image
+apt-get autoremove -y
 
 #configure locales:
-export LC_ALL="en_US.UTF-8"
-locale-gen en_US.UTF-8
+apt-get install -y language-pack-en
 
 # node and npm:
 apt-get install -y npm
@@ -22,21 +23,6 @@ apt-get install -y sphinx-common
 apt-get install -y libapache2-mod-wsgi python-pip
 pip install virtualenv virtualenvwrapper python-hglib nose
 cd ~vagrant/dxr
-# If it hangs here, you might have a mismatched version of the VirtualBox Guest
-# Additions. Shut down the box. Start it back up using the VB GUI. Choose
-# "Insert Guest Additions CD" from the Devices menu. On the guest, mount
-# /dev/cdrom /mnt && cd /mnt && ./VBoxLinuxAdditions.run. Shut the guest back
-# down.
-#
-# Alternately, per
-# https://github.com/TryGhost/Ghost-Vagrant#updating-virtual-box-guest-additions,
-# from the host, run...
-# 1) vagrant plugin install vagrant-vbguest
-# 2) vagrant up --no-provision
-# 3) vagrant ssh -c 'sudo apt-get -y -q purge virtualbox-guest-dkms
-#    virtualbox-guest-utils virtualbox-guest-x11'
-# 4) vagrant halt
-# 5) vagrant up --provision
 ./peep.py install -r requirements.txt
 python setup.py develop
 
@@ -83,4 +69,6 @@ apt-get install -y libsqlite3-dev sqlite3 git mercurial llvm-3.3 libclang-3.3-de
 update-alternatives --install /usr/local/bin/llvm-config llvm-config /usr/bin/llvm-config-3.3 0
 # Install libtrilite so Apache WSGI processes can see it:
 ln -sf ~vagrant/dxr/trilite/libtrilite.so /usr/local/lib/libtrilite.so
+# make sure local trilite is available
+rm /etc/ld.so.cache
 /sbin/ldconfig