diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2021-11-18 09:17:15 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-18 09:17:15 +0100 |
commit | b3692663cf9d2d5c71f36155f2ddea6adeb7d8a5 (patch) | |
tree | 2bdbe0b871cf48592557583d0eeba75710569cf1 | |
parent | 171a0b36e060cdb59c5974a4bc2c723e3b09e0f8 (diff) |
Revert "Revert "Add vespa program to vespa-clients RPM""
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | client/CMakeLists.txt | 3 | ||||
-rw-r--r-- | client/go/CMakeLists.txt | 3 | ||||
-rw-r--r-- | dist/vespa.spec | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 863ce8dd9de..6480407ce52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ add_subdirectory(container-messagebus) add_subdirectory(container-search) add_subdirectory(container-search-gui) add_subdirectory(container-search-and-docproc) +add_subdirectory(client) add_subdirectory(cloud-tenant-cd) add_subdirectory(clustercontroller-apps) add_subdirectory(clustercontroller-core) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt new file mode 100644 index 00000000000..2353b773c3a --- /dev/null +++ b/client/CMakeLists.txt @@ -0,0 +1,3 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +add_subdirectory(go) diff --git a/client/go/CMakeLists.txt b/client/go/CMakeLists.txt new file mode 100644 index 00000000000..105f85fe9a4 --- /dev/null +++ b/client/go/CMakeLists.txt @@ -0,0 +1,3 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +vespa_install_script(bin/vespa bin) diff --git a/dist/vespa.spec b/dist/vespa.spec index 031213ac693..5085c341564 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -764,6 +764,7 @@ fi %dir %{_prefix}/conf/vespa-feed-client %dir %{_prefix}/lib %dir %{_prefix}/lib/jars +%{_prefix}/bin/vespa %{_prefix}/bin/vespa-feed-client %{_prefix}/conf/vespa-feed-client/logging.properties %{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar |