diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-18 17:20:01 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-18 17:20:01 +0100 |
| commit | 2df2387d0b51081a86937624fdd5ed94fb71ca62 (patch) | |
| tree | d0fac49fd5f7bc2383600cdf61be0944cc2b9ff2 /vagrant | |
| parent | ad2f9ff158a92b5bfdab84ec2455eb8c266dd7fc (diff) | |
Tweaks
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/README.md | 12 | ||||
| -rw-r--r-- | vagrant/Vagrantfile | 5 |
2 files changed, 13 insertions, 4 deletions
diff --git a/vagrant/README.md b/vagrant/README.md index bf25047f452..a0f6028f072 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -41,12 +41,13 @@ Skip these steps if doing development with CLion. CLion is installed as part of the environment and is recommended for C++ development. #### 1. Bootstrap C++ building -Go to <vespa-source> directory and execute: +cd to the vespa/ directory created by git clone and execute: + ./bootstrap.sh java ./bootstrap-cpp.sh . . #### 2. Start CLion -Open a terminal inside the virtual CentOS desktop and run: +Open a terminal inside the virtual CentOS desktop (password is "vagrant") and run: clion @@ -58,4 +59,9 @@ Go to *File* -> *Settings* -> *Build, Execution, Deployment* -> *CMake*. Under *Build Options* specify "-j 4" and click *Apply*. #### 5. Build all modules -Choose target **all_modules** from the set of build targets and click build. +Choose target **all_modules** from the set of build targets at the top right and click build. + +#### Troubleshooting + +If there are build errors try to run bootstrap-cpp.sh again +(some of what it does may be undone by clion setup).
\ No newline at end of file diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index abd2375319b..0d003018042 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -4,7 +4,8 @@ # For a complete reference, please see the online documentation at https://docs.vagrantup.com. Vagrant.configure("2") do |config| - config.vm.box = "boxcutter/centos7-desktop" + config.vm.box = "centos7-desktop" + config.vm.box_url = "/Users/bratseth/development/github/vespa-engine/vespa/vagrant/centos7-desktop-17.0915.1.box" config.ssh.forward_agent = true @@ -25,6 +26,8 @@ Vagrant.configure("2") do |config| yum -y install epel-release yum -y install centos-release-scl yum -y install yum-utils + yum -y install boost-devel + yum -y install cppunit yum -y install git \ ccache \ maven \ |