Merge pull request #2690 from yahoo/geirst/rename-binaries-in-vespaclient

Geirst/rename binaries in vespaclient

10 files changed, 16 insertions, 16 deletions

diff --git a/dist/post_install.sh b/dist/post_install.sh
index a688b325f78..9475894d2e0 100755
--- a/dist/post_install.sh
+++ b/dist/post_install.sh
@@ -93,6 +93,11 @@ ln -s vespa-distributord-bin $INSTALLPATH/sbin/distributord-bin
 ln -s vespa-storaged $INSTALLPATH/sbin/storaged
 ln -s vespa-distributord $INSTALLPATH/sbin/distributord
 
+# Temporary when renaming binaries in vespaclient
+ln -s vespa-doclocator $INSTALLPATH/bin/vespadoclocator
+ln -s vespa-route $INSTALLPATH/bin/vesparoute
+ln -s vespa-spoolmaster $INSTALLPATH/bin/spoolmaster
+
 # Temporary when renaming binaries in vespalog
 ln -s vespa-log-conv $INSTALLPATH/bin/vlogconv
 ln -s vespa-logctl $INSTALLPATH/bin/logctl
diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt
index 8825383cfbd..d7743d42744 100644
--- a/vespabase/CMakeLists.txt
+++ b/vespabase/CMakeLists.txt
@@ -1,19 +1,15 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_install_script(src/start-cbinaries.sh vespa-get-config bin)
 vespa_install_script(src/start-cbinaries.sh vds-document-statistics bin)
-vespa_install_script(src/start-cbinaries.sh vdsgetclusterstate bin)
-vespa_install_script(src/start-cbinaries.sh vdsgetnodestate bin)
-vespa_install_script(src/start-cbinaries.sh vdsgetsystemstate bin)
-vespa_install_script(src/start-cbinaries.sh vdssetnodestate bin)
 vespa_install_script(src/start-cbinaries.sh vdsstat bin)
 vespa_install_script(src/start-cbinaries.sh vespa-verify-ranksetup bin)
 vespa_install_script(src/start-cbinaries.sh vespa-config-status bin)
-vespa_install_script(src/start-cbinaries.sh vespadoclocator bin)
+vespa_install_script(src/start-cbinaries.sh vespa-doclocator bin)
 vespa_install_script(src/start-cbinaries.sh vespaget bin)
 vespa_install_script(src/start-cbinaries.sh vespa-model-inspect bin)
 vespa_install_script(src/start-cbinaries.sh vespa-proton-cmd bin)
 vespa_install_script(src/start-cbinaries.sh vespa-query-profile-dump-tool bin)
-vespa_install_script(src/start-cbinaries.sh vesparoute bin)
+vespa_install_script(src/start-cbinaries.sh vespa-route 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)
diff --git a/vespaclient/src/vespa/vespaclient/spoolmaster/.gitignore b/vespaclient/src/vespa/vespaclient/spoolmaster/.gitignore
index 1a890e8015f..81b1279cdb1 100644
--- a/vespaclient/src/vespa/vespaclient/spoolmaster/.gitignore
+++ b/vespaclient/src/vespa/vespaclient/spoolmaster/.gitignore
@@ -1,3 +1,3 @@
 .depend
 Makefile
-spoolmaster
+vespa-spoolmaster
diff --git a/vespaclient/src/vespa/vespaclient/spoolmaster/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/spoolmaster/CMakeLists.txt
index 7ed480e1fbe..a633c9518da 100644
--- a/vespaclient/src/vespa/vespaclient/spoolmaster/CMakeLists.txt
+++ b/vespaclient/src/vespa/vespaclient/spoolmaster/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(vespaclient_spoolmaster_app
     SOURCES
     main.cpp
     application.cpp
-    OUTPUT_NAME spoolmaster
+    OUTPUT_NAME vespa-spoolmaster
     INSTALL bin
     DEPENDS
 )
diff --git a/vespaclient/src/vespa/vespaclient/vdsstates/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vdsstates/CMakeLists.txt
index d362a1e9ad0..56ff525e31a 100644
--- a/vespaclient/src/vespa/vespaclient/vdsstates/CMakeLists.txt
+++ b/vespaclient/src/vespa/vespaclient/vdsstates/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespaclient_vdsgetnodestate_app
     SOURCES
     statesapp.cpp
     OUTPUT_NAME vdsgetnodestate-bin
-    INSTALL bin
     DEPENDS
     vespaclient_clusterlist
 )
diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/.gitignore b/vespaclient/src/vespa/vespaclient/vespadoclocator/.gitignore
index 82da15ee406..52e1033ec5b 100644
--- a/vespaclient/src/vespa/vespaclient/vespadoclocator/.gitignore
+++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/.gitignore
@@ -1,4 +1,4 @@
 .depend
 Makefile
-vespadoclocator
-vespadoclocator-bin
+vespa-doclocator
+vespa-doclocator-bin
diff --git a/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt
index bd0f36f3896..2fe0452700a 100644
--- a/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt
+++ b/vespaclient/src/vespa/vespaclient/vespadoclocator/CMakeLists.txt
@@ -4,7 +4,7 @@ vespa_add_executable(vespaclient_vespadoclocator_app
     application.cpp
     locator.cpp
     main.cpp
-    OUTPUT_NAME vespadoclocator-bin
+    OUTPUT_NAME vespa-doclocator-bin
     INSTALL bin
     DEPENDS
 )
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore b/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
index 4d072420886..573df74b762 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/.gitignore
@@ -1,4 +1,4 @@
 .depend
 Makefile
-vesparoute
-vesparoute-bin
+vespa-route
+vespa-route-bin
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt b/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
index bb9391331fc..a191c646671 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_add_executable(vespaclient_vesparoute_app
     main.cpp
     mynetwork.cpp
     params.cpp
-    OUTPUT_NAME vesparoute-bin
+    OUTPUT_NAME vespa-route-bin
     INSTALL bin
     DEPENDS
 )
diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp
index e01104943cd..82add5ff69c 100644
--- a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp
+++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp
@@ -186,7 +186,7 @@ Application::parseArgs()
 void
 Application::printHelp() const
 {
-    printf("Usage: vesparoute [OPTION]...\n"
+    printf("Usage: vespa-route [OPTION]...\n"
            "Options:\n"
            "  --documenttypesconfigid <id>  Sets the config id that supplies document configuration.\n"
            "  --dump                          Prints the complete content of the routing table.\n"