diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2017-06-09 14:32:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-09 14:32:32 +0200 |
commit | 8cec7dcc18f268a647cfb5958f62dda864adba1f (patch) | |
tree | ea044b0de19c5703e717e58843d7d8191d68a42a /vespaclient/src | |
parent | 351e3af943fa3e3fdf288ba35cc01f8afaded318 (diff) | |
parent | 7d8f504d37b0ee61f99505a11c22cee1834debbc (diff) |
Merge pull request #2690 from yahoo/geirst/rename-binaries-in-vespaclient
Geirst/rename binaries in vespaclient
Diffstat (limited to 'vespaclient/src')
8 files changed, 9 insertions, 10 deletions
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" |