diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-12-01 15:24:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 15:24:20 +0100 |
| commit | c10917672ef65303eb758fbe5a38a69f941523c6 (patch) | |
| tree | efe1f49b762e4b764c1201cef80eccf463d4bdbd | |
| parent | b9209c8c827a50a87ed87835b89166202cdef7dc (diff) | |
| parent | f2bead5bf5e5fc7ea1e76ada2725bd21a30eb188 (diff) | |
Merge pull request #20314 from vespa-engine/hakonhall/install-manual-pages-in-vespa-clients-rpm
Install manual pages in vespa-clients RPM
| -rw-r--r-- | client/go/Makefile | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 6 | ||||
| -rw-r--r-- | screwdriver.yaml | 2 | ||||
| -rwxr-xr-x | screwdriver/build-vespa.sh | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/client/go/Makefile b/client/go/Makefile index fc1ac843917..1d995c7f5bf 100644 --- a/client/go/Makefile +++ b/client/go/Makefile @@ -99,6 +99,8 @@ ifeq ($(VERSION),$(DEVEL_VERSION)) $(error Invalid release version: $(VERSION). Try 'git checkout vX.Y.Z' or 'env VERSION=X.Y.Z make ...') endif +install-all: all manpages + # # Development targets # diff --git a/dist/vespa.spec b/dist/vespa.spec index 1416109ab40..3c96c6b0ce1 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -542,7 +542,7 @@ mvn --batch-mode -e -N io.takari:maven:wrapper -Dmaven=3.6.3 . make %{_smp_mflags} -VERSION=%{version} make -C client/go +VERSION=%{version} make -C client/go install-all %endif %install @@ -553,6 +553,8 @@ cp -r %{installdir} %{buildroot} %else make install DESTDIR=%{buildroot} cp client/go/bin/vespa %{buildroot}%{_prefix}/bin/vespa +mkdir -p %{buildroot}/usr/share +cp -a client/go/share/* %{buildroot}/usr/share %endif # Otherwise installation may fail for find-debuginfo.sh/dwz: # dwz: dwz.c:9899: read_dwarf: Assertion `data != ((void *)0) && data->d_buf != ((void *)0)' failed. @@ -780,6 +782,8 @@ fi %{_prefix}/conf/vespa-feed-client/logging.properties %{_prefix}/lib/jars/vespa-http-client-jar-with-dependencies.jar %{_prefix}/lib/jars/vespa-feed-client-cli-jar-with-dependencies.jar +%docdir /usr/share/man +/usr/share/man %files config-model-fat %if %{_defattr_is_vespa_vespa} diff --git a/screwdriver.yaml b/screwdriver.yaml index 597f5f2678e..6ea74ae8a1d 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -139,7 +139,7 @@ jobs: cd $WORKDIR/vespa export FACTORY_VESPA_VERSION=$VESPA_VERSION NUM_THREADS=$(( $(nproc) + 2 )) - time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin + time make -C client/go BIN=$WORKDIR/vespa-install/opt/vespa/bin SHARE=$WORKDIR/vespa-install/usr/share install-all time ./bootstrap.sh java time mvn -T $NUM_THREADS $VESPA_MAVEN_EXTRA_OPTS install cmake3 -DVESPA_UNPRIVILEGED=no . diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 714f4972e12..f321e3820fd 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -40,10 +40,10 @@ case $SHOULD_BUILD in mvn -V $VESPA_MAVEN_EXTRA_OPTS install ;; go) - make -C client/go + make -C client/go install-all ;; *) - make -C client/go + make -C client/go install-all ./bootstrap.sh java time mvn -V $VESPA_MAVEN_EXTRA_OPTS install cmake3 -DVESPA_UNPRIVILEGED=no . |