summaryrefslogtreecommitdiffstats
path: root/vagrant/README.md
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2018-01-18 17:20:01 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2018-01-18 17:20:01 +0100
commit2df2387d0b51081a86937624fdd5ed94fb71ca62 (patch)
treed0fac49fd5f7bc2383600cdf61be0944cc2b9ff2 /vagrant/README.md
parentad2f9ff158a92b5bfdab84ec2455eb8c266dd7fc (diff)
Tweaks
Diffstat (limited to 'vagrant/README.md')
-rw-r--r--vagrant/README.md12
1 files changed, 9 insertions, 3 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