diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-17 16:21:39 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-17 16:21:39 +0200 |
| commit | 5589c5a31ea35668dfa82c0d568626110b58d17d (patch) | |
| tree | 21ed9e7649e0fb18ac574f552093efa5a6e54e98 | |
| parent | 7731f962a5064c6ba29ba52dbfe8edf743b58a32 (diff) | |
Add more dependencies from build
| -rw-r--r-- | dist/vespa.spec | 2 | ||||
| -rw-r--r-- | install_java.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 99ee034f79e..659bf65f24f 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -114,6 +114,7 @@ mkdir -p %{buildroot}/%{_prefix}/var/db/vespa/config_server/serverdb/application mkdir -p %{buildroot}/%{_prefix}/var/db/vespa/logcontrol/ mkdir -p %{buildroot}/%{_prefix}/var/jdisc_container/ mkdir -p %{buildroot}/%{_prefix}/var/jdisc_core/ +mkdir -p %{buildroot}/%{_prefix}/var/run/ mkdir -p %{buildroot}/%{_prefix}/var/spool/vespa/ mkdir -p %{buildroot}/%{_prefix}/var/spool/master/inbox/ mkdir -p %{buildroot}/%{_prefix}/var/vespa/bundlecache/ @@ -166,6 +167,7 @@ exit 0 %dir %attr( 755, vespa, vespa) %{_prefix}/var/db/vespa/logcontrol/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/jdisc_container/ %dir %attr( 777, -, -) %{_prefix}/var/jdisc_core/ +%dir %attr( 755, vespa, vespa) %{_prefix}/var/run/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/spool/vespa/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/spool/master/inbox/ %dir %attr( 755, vespa, vespa) %{_prefix}/var/vespa/bundlecache/ diff --git a/install_java.cmake b/install_java.cmake index e62d931539e..eb9b2bc8f8c 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -1,5 +1,7 @@ function(install_java_artifact NAME) - install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) + if (EXISTS "${NAME}/target/${NAME}.jar") + install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) + endif() if (IS_DIRECTORY "${NAME}/target/dependency") install(DIRECTORY "${NAME}/target/dependency" DESTINATION lib/jars/ FILES_MATCHING PATTERN "*.jar") endif() @@ -10,7 +12,9 @@ function(install_fat_java_artifact NAME) endfunction() install_java_artifact(document) +install_java_artifact(jdisc_jetty) install_java_artifact(searchlib) +install_java_artifact(vespa_jersey2) install_java_artifact(vespajlib) install_fat_java_artifact(application-preprocessor) |