diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2017-06-07 10:23:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 10:23:05 +0200 |
| commit | b9587814e8b69d7f14acd46a0f072836043108b5 (patch) | |
| tree | ca3707e6f855d04e5f45b535bac187da0645a623 /searchcore | |
| parent | 5b09eb5da95841ba6db00f076a0c6b70880c0047 (diff) | |
| parent | 90580eea59cac31be6c157507419249ab30842b6 (diff) | |
Merge pull request #2642 from yahoo/toregge/rename-searchcore-binaries
Rename searchcore binaries to have vespa- prefix.
Diffstat (limited to 'searchcore')
| -rw-r--r-- | searchcore/src/apps/fdispatch/.gitignore | 3 | ||||
| -rw-r--r-- | searchcore/src/apps/fdispatch/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/apps/proton/.gitignore | 3 | ||||
| -rw-r--r-- | searchcore/src/apps/proton/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/apps/verify_ranksetup/.gitignore | 3 | ||||
| -rw-r--r-- | searchcore/src/apps/verify_ranksetup/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/searchcore/src/apps/fdispatch/.gitignore b/searchcore/src/apps/fdispatch/.gitignore index 7ef8af69759..6cb8d53bdc1 100644 --- a/searchcore/src/apps/fdispatch/.gitignore +++ b/searchcore/src/apps/fdispatch/.gitignore @@ -1,2 +1 @@ -/fdispatch -fdispatch-bin +vespa-fdispatch-bin diff --git a/searchcore/src/apps/fdispatch/CMakeLists.txt b/searchcore/src/apps/fdispatch/CMakeLists.txt index 728f4e46883..63e1e6ca515 100644 --- a/searchcore/src/apps/fdispatch/CMakeLists.txt +++ b/searchcore/src/apps/fdispatch/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(searchcore_fdispatch_app SOURCES fdispatch.cpp - OUTPUT_NAME fdispatch-bin + OUTPUT_NAME vespa-fdispatch-bin INSTALL sbin DEPENDS searchcore_fdispatch_program diff --git a/searchcore/src/apps/proton/.gitignore b/searchcore/src/apps/proton/.gitignore index 4c244afd919..c2cc445d918 100644 --- a/searchcore/src/apps/proton/.gitignore +++ b/searchcore/src/apps/proton/.gitignore @@ -1,4 +1,3 @@ .depend Makefile -proton -proton-bin +vespa-proton-bin diff --git a/searchcore/src/apps/proton/CMakeLists.txt b/searchcore/src/apps/proton/CMakeLists.txt index 13f04d2d6f4..c5398feed2e 100644 --- a/searchcore/src/apps/proton/CMakeLists.txt +++ b/searchcore/src/apps/proton/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(searchcore_proton_app SOURCES downpersistence.cpp proton.cpp - OUTPUT_NAME proton-bin + OUTPUT_NAME vespa-proton-bin INSTALL sbin DEPENDS searchcore_server diff --git a/searchcore/src/apps/verify_ranksetup/.gitignore b/searchcore/src/apps/verify_ranksetup/.gitignore index 269b313f1f0..d32b68f0f38 100644 --- a/searchcore/src/apps/verify_ranksetup/.gitignore +++ b/searchcore/src/apps/verify_ranksetup/.gitignore @@ -1,4 +1,3 @@ .depend Makefile -verify_ranksetup -verify_ranksetup-bin +vespa-verify-ranksetup-bin diff --git a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt index de777f88182..7dd6d0490da 100644 --- a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt +++ b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(searchcore_verify_ranksetup_app SOURCES verify_ranksetup.cpp - OUTPUT_NAME verify_ranksetup-bin + OUTPUT_NAME vespa-verify-ranksetup-bin INSTALL bin DEPENDS searchcore_fconfig diff --git a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp index 2c5e119ecbe..8439c2fb54f 100644 --- a/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp +++ b/searchcore/src/tests/proton/verify_ranksetup/verify_ranksetup_test.cpp @@ -9,7 +9,7 @@ #include <map> #include <initializer_list> -const char *prog = "../../../apps/verify_ranksetup/verify_ranksetup-bin"; +const char *prog = "../../../apps/verify_ranksetup/vespa-verify-ranksetup-bin"; const std::string gen_dir("generated"); const char *valid_feature = "value(0)"; |