diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-06-18 19:33:36 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@gmail.com> | 2016-06-18 19:33:36 +0200 |
| commit | ab23b5485ef1ce595d394d2a241bd3549a52aad7 (patch) | |
| tree | b762ecb7b09260a0a4c8bbb534884213926a5fea | |
| parent | 9fbc54f37209c21e60aba28fda7ad1c6cde46411 (diff) | |
Need to add more to boostrap to be able to build from scratch in docker container.
| -rwxr-xr-x | bootstrap.sh | 6 | ||||
| -rw-r--r-- | dist/vespa.spec | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index f41f3369b32..d052388edf2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -14,10 +14,16 @@ MODULES=" scalalib bundle-plugin config-class-plugin + config-lib yolean vespajlib jrt + vespalog + testutil + config + config-bundle component + configdefinitions messagebus filedistributionmanager" diff --git a/dist/vespa.spec b/dist/vespa.spec index 99ee034f79e..c8aefbfb608 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -53,6 +53,7 @@ This is the Vespa! source /opt/rh/devtoolset-4/enable || true sh bootstrap.sh +mvn install -DskipTests -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ -DEXTRA_LINK_DIRECTORY="/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm" \ @@ -62,7 +63,6 @@ cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ . make %{_smp_mflags} -mvn install -DskipTests -Dmaven.javadoc.skip=true %install |