diff options
| -rwxr-xr-x | dist/post_install.sh | 5 | ||||
| -rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/tools/.gitignore | 5 | ||||
| -rw-r--r-- | memfilepersistence/src/vespa/memfilepersistence/tools/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/dist/post_install.sh b/dist/post_install.sh index bcc33c784ad..32b2f6af05e 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -93,3 +93,8 @@ ln -s vespa-log-conv $INSTALLPATH/bin/vlogconv ln -s vespa-logctl $INSTALLPATH/bin/logctl ln -s vespa-logfmt $INSTALLPATH/bin/logfmt ln -s vespa-log-replay $INSTALLPATH/bin/vlogreplay + +# Temporary when renaming binaries in memfilepersistence +ln -s vespa-dump-slotfile $INSTALLPATH/bin/dumpslotfile +ln -s vespa-vds-disktool-bin $INSTALLPATH/bin/vdsdisktool-bin +ln -s vespa-vds-disktool $INSTALLPATH/bin/vdsdisktool diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/.gitignore b/memfilepersistence/src/vespa/memfilepersistence/tools/.gitignore index c7687cb62d2..5b3727b1f5e 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/.gitignore +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/.gitignore @@ -1,5 +1,4 @@ /.depend /Makefile -/dumpslotfile -/vdsdisktool -vdsdisktool-bin +vespa-dump-slotfile +vespa-vds-disktool-bin diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/CMakeLists.txt b/memfilepersistence/src/vespa/memfilepersistence/tools/CMakeLists.txt index cc8ad0a2320..dabec5b6a8e 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/CMakeLists.txt +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/CMakeLists.txt @@ -8,7 +8,7 @@ vespa_add_library(memfilepersistence_tools OBJECT vespa_add_executable(memfilepersistence_dumpslotfile_app SOURCES dumpslotfileapp.cpp - OUTPUT_NAME dumpslotfile + OUTPUT_NAME vespa-dump-slotfile INSTALL bin DEPENDS memfilepersistence @@ -16,7 +16,7 @@ vespa_add_executable(memfilepersistence_dumpslotfile_app vespa_add_executable(memfilepersistence_vdsdisktool_app SOURCES vdsdiskapp.cpp - OUTPUT_NAME vdsdisktool-bin + OUTPUT_NAME vespa-vds-disktool-bin INSTALL bin DEPENDS memfilepersistence diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index bd62eeadc39..4d21e535a42 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -17,6 +17,7 @@ vespa_install_script(src/start-cbinaries.sh vesparoute bin) vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin) vespa_install_script(src/start-cbinaries.sh vespavisit bin) vespa_install_script(src/start-cbinaries.sh vespavisittarget bin) +vespa_install_script(src/start-cbinaries.sh vespa-vds-disktool bin) vespa_install_script(src/start-cbinaries.sh vespa-distributord sbin) vespa_install_script(src/start-cbinaries.sh vespa-fdispatch sbin) vespa_install_script(src/start-cbinaries.sh filedistributor sbin) |