diff options
| -rw-r--r-- | configserver/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | dist/vespa.spec | 2 | ||||
| -rw-r--r-- | install_java.cmake | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/configserver/CMakeLists.txt b/configserver/CMakeLists.txt index 90d92c7c03e..fcc011790b9 100644 --- a/configserver/CMakeLists.txt +++ b/configserver/CMakeLists.txt @@ -1,7 +1,9 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_install_script(src/main/sh/cloudconfig_server-remove-state bin) -vespa_install_script(src/main/sh/start-filedistribution start-file libexec/vespa) +vespa_install_script(src/main/sh/start-filedistribution libexec/vespa) vespa_install_script(src/main/sh/ping-configserver libexec/vespa) vespa_install_script(src/main/sh/start-configserver libexec/vespa) vespa_install_script(src/main/sh/start-logd libexec/vespa) vespa_install_script(src/main/sh/stop-configserver libexec/vespa) +install(DIRECTORY src/main/resources/logd DESTINATION conf) +install(DIRECTORY src/main/resources/configserver-app DESTINATION conf) diff --git a/dist/vespa.spec b/dist/vespa.spec index 9effb0c0571..678cac66dba 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -177,7 +177,7 @@ exit 0 %{_prefix}/libexec/vespa/common-env.sh %{_prefix}/libexec/vespa/start-vespa-base.sh %{_prefix}/libexec/vespa/stop-vespa-base.sh -%{_prefix}/libexec/vespa/start-file +%{_prefix}/libexec/vespa/start-filedistribution %{_prefix}/libexec/vespa/ping-configserver %{_prefix}/libexec/vespa/start-configserver %{_prefix}/libexec/vespa/start-logd diff --git a/install_java.cmake b/install_java.cmake index 567cafd881c..e62d931539e 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -1,5 +1,8 @@ function(install_java_artifact NAME) install(FILES "${NAME}/target/${NAME}.jar" DESTINATION lib/jars/) + if (IS_DIRECTORY "${NAME}/target/dependency") + install(DIRECTORY "${NAME}/target/dependency" DESTINATION lib/jars/ FILES_MATCHING PATTERN "*.jar") + endif() endfunction() function(install_fat_java_artifact NAME) @@ -13,10 +16,14 @@ install_java_artifact(vespajlib) install_fat_java_artifact(application-preprocessor) install_fat_java_artifact(component) install_fat_java_artifact(config-bundle) +install_fat_java_artifact(config-model-api) +install_fat_java_artifact(config-model) +install_fat_java_artifact(config-provisioning) install_fat_java_artifact(configdefinitions) install_fat_java_artifact(container-disc) install_fat_java_artifact(container-jersey2) install_fat_java_artifact(container-search-and-docproc) +install_fat_java_artifact(defaults) install_fat_java_artifact(docprocs) install_fat_java_artifact(jdisc_core) install_fat_java_artifact(jdisc_http_service) |