diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2018-01-19 16:14:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 16:14:29 +0100 |
| commit | cd8e4c6a373c8b458a3eb1ec42f41bff82ac6bb5 (patch) | |
| tree | cf367cdf5c2ff163a6a771fbd1fad19416c8fca1 /vagrant | |
| parent | d35b6a45994709331db42b00b78658ca26c2635f (diff) | |
| parent | 63f899363c6410b94406a257697278b41b112f4b (diff) | |
Merge pull request #4714 from vespa-engine/bratseth/vagrant-tweaks
Tweaks
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/README.md | 20 | ||||
| -rw-r--r-- | vagrant/Vagrantfile | 3 |
2 files changed, 18 insertions, 5 deletions
diff --git a/vagrant/README.md b/vagrant/README.md index bf25047f452..d81e80e8808 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -31,7 +31,6 @@ This is needed in order to compile and run tests fast on the local file system i git clone git@github.com:vespa-engine/vespa.git - ## Build C++ modules Please follow the build instructions described [here](../README.md#build-c-modules). Skip these steps if doing development with CLion. @@ -41,15 +40,21 @@ 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 +When promoted, configure c and cpp compilers to + + /opt/rh/devtoolset-7/root/usr/bin/cc + /opt/rh/devtoolset-7/root/usr/bin/c++ + #### 3. Open the Vespa Project Go to *File* -> *Open* and choose <vespa-source>>/CMakeLists.txt. @@ -57,5 +62,12 @@ Go to *File* -> *Open* and choose <vespa-source>>/CMakeLists.txt. Go to *File* -> *Settings* -> *Build, Execution, Deployment* -> *CMake*. Under *Build Options* specify "-j 4" and click *Apply*. +#### 5. Run bootstrap again + + ./bootstrap-cpp.sh . . + +(Some of the changes made by it are undone by clion on the first startup.) + #### 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. + diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index abd2375319b..de7867cd4f7 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 = "TODO" + config.vm.box_url = "TODO" config.ssh.forward_agent = true |