diff options
author | jfarrell <jfarrell@apache.org> | 2014-10-08 23:15:20 -0400 |
---|---|---|
committer | jfarrell <jfarrell@apache.org> | 2014-10-08 23:15:20 -0400 |
commit | 2c7eb9ee60e5e8235f2c756ca67778a765ba019f (patch) | |
tree | 962696358c1b880182eadf2f83449f59bceeba34 /contrib | |
parent | f98a67bb24569ac5dee0cf94d711dd3d63316447 (diff) | |
download | thrift-2c7eb9ee60e5e8235f2c756ca67778a765ba019f.tar.gz |
THRIFT-2759: Trusty Vagrantfile does not make clean
Client: build
Patch: jfarrell
Fixing vagrant file to build all libraries correctly
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/Vagrantfile | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/contrib/Vagrantfile b/contrib/Vagrantfile index 67e56225d..9bc50fec8 100644 --- a/contrib/Vagrantfile +++ b/contrib/Vagrantfile @@ -37,10 +37,13 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get upgrade -qq -y # Install Dependencies # --- # General dependencies -sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev git debhelper +sudo apt-get install -qq automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev git debhelper + +# C++ dependencies +sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libboost-filesystem-dev libboost-system-dev libevent-dev # Java dependencies -sudo apt-get install -qq ant openjdk-7-jdk +sudo apt-get install -qq ant openjdk-7-jdk maven # Python dependencies sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools python-support @@ -73,13 +76,17 @@ sudo cabal update sudo apt-get install -qq lua5.2 lua5.2-dev # Node.js dependencies -sudo apt-get install -qq nodejs nodejs-dev npm -sudo update-alternatives --install /usr/bin/node node /usr/bin/nodejs 10 +sudo apt-get install -qq nodejs nodejs-dev nodejs-legacy npm # CSharp sudo apt-get install -qq mono-gmcs mono-devel libmono-system-web2.0-cil sudo apt-get install -qq mingw32 mingw32-binutils mingw32-runtime nsis +# D dependencies +sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list +sudo apt-get update && sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring && sudo apt-get update +sudo apt-get install -qq xdg-utils dmd-bin + # Customize the system # --- # Default java to latest 1.7 version @@ -118,9 +125,9 @@ Vagrant.configure("2") do |config| config.vm.provider :virtualbox do |vbox| vbox.customize ["modifyvm", :id, "--memory", "1024"] vbox.customize ["modifyvm", :id, "--cpus", "2"] + vbox.customize ["modifyvm", :id, "--rtcuseutc", "on"] end - # call the script + # Run the build script to configure the system config.vm.provision :shell, :inline => $build_and_test - end |