diff options
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | client/CMakeLists.txt | 7 | ||||
-rw-r--r-- | dist/vespa.spec | 6 |
3 files changed, 14 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..e3471cc1917 --- /dev/null +++ b/client/CMakeLists.txt @@ -0,0 +1,7 @@ +# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +add_custom_command(OUTPUT go/bin/vespa + COMMAND make -C go) +add_custom_target(vespa-cli ALL true + SOURCES go/bin/vespa) +vespa_install_script(go/bin/vespa bin) diff --git a/dist/vespa.spec b/dist/vespa.spec index bfb4c14bdeb..e09866fc749 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -6,6 +6,10 @@ # Only strip debug info %global _find_debuginfo_opts -g +# Go binaries' build-ids are not recognized by RPMs yet, see +# https://github.com/rpm-software-management/rpm/issues/367. +%global _missing_build_ids_terminate_build 0 + # Force special prefix for Vespa %define _prefix /opt/vespa %define _vespa_deps_prefix /opt/vespa-deps @@ -53,6 +57,7 @@ BuildRequires: rh-maven35 %define _rhmaven35_enable /opt/rh/rh-maven35/enable BuildRequires: python36-pytest %endif +BuildRequires: golang >= 1.15 BuildRequires: vespa-pybind11-devel BuildRequires: python3-devel %endif @@ -764,6 +769,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 |