diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-02-28 20:51:45 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-02-28 21:01:37 +0100 |
| commit | c3876380dce141c3b21b1575bcc5264f6cc92169 (patch) | |
| tree | f87dbf07408f6589f94f8b389fee3dae98591416 | |
| parent | a814b598a28ebeae8d20dea5e027f0fa7aa6eee8 (diff) | |
Sync cmake install with vespa-node-admin.spec and
vespa-standalone-container.spec.
| -rw-r--r-- | docker-api/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | node-admin/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | standalone-container/CMakeLists.txt | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docker-api/CMakeLists.txt b/docker-api/CMakeLists.txt index 1288c624890..edcdcfb5bfc 100644 --- a/docker-api/CMakeLists.txt +++ b/docker-api/CMakeLists.txt @@ -1,4 +1,2 @@ # Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -install_fat_java_artifact(docker-api) -install(DIRECTORY DESTINATION conf/node-admin-app/components) -install_symlink(lib/jars/docker-api-jar-with-dependencies.jar conf/node-admin-app/components/docker-api.jar) +install(FILES target/docker-api-jar-with-dependencies.jar DESTINATION conf/node-admin-app/components) diff --git a/node-admin/CMakeLists.txt b/node-admin/CMakeLists.txt index 03bf09121c3..8dbb32c7de1 100644 --- a/node-admin/CMakeLists.txt +++ b/node-admin/CMakeLists.txt @@ -1,2 +1,6 @@ # Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install(DIRECTORY DESTINATION logs/vespa/node-admin) +install(FILES target/node-admin-jar-with-dependencies.jar DESTINATION conf/node-admin-app/components) +install_symlink(lib/jars/flags-jar-with-dependencies.jar conf/node-admin-app/components/flags-jar-with-dependencies.jar) +install(FILES src/main/application/services.xml DESTINATION conf/node-admin-app) +install(PROGRAMS src/main/sh/node-admin.sh DESTINATION libexec/vespa) diff --git a/standalone-container/CMakeLists.txt b/standalone-container/CMakeLists.txt index 83c58e09945..6e8bf49d846 100644 --- a/standalone-container/CMakeLists.txt +++ b/standalone-container/CMakeLists.txt @@ -1,2 +1,3 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. install_fat_java_artifact(standalone-container) +install(PROGRAMS src/main/sh/standalone-container.sh DESTINATION libexec/vespa) |