diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-12 11:37:18 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-12 11:37:18 +0000 |
commit | 0e6bc769cbea3500055d68f82f84087af2eff667 (patch) | |
tree | ed6cf5d1e2fc7acc50869a8495847ccffe689799 | |
parent | e54857bf484158e84e3f13ce44ca7b8ad0ff71aa (diff) |
Rename slobrok programs to have vespa- prefix.
Temporarily add symlinks from old name to new name.
-rwxr-xr-x | dist/post_install.sh | 4 | ||||
-rw-r--r-- | jrt_test/src/binref/env.sh.in | 4 | ||||
-rw-r--r-- | slobrok/src/apps/check_slobrok/CMakeLists.txt | 1 | ||||
-rw-r--r-- | slobrok/src/apps/sbcmd/.gitignore | 2 | ||||
-rw-r--r-- | slobrok/src/apps/sbcmd/CMakeLists.txt | 2 | ||||
-rw-r--r-- | slobrok/src/apps/sbcmd/sbcmd.cpp | 6 | ||||
-rw-r--r-- | slobrok/src/apps/slobrok/.gitignore | 2 | ||||
-rw-r--r-- | slobrok/src/apps/slobrok/CMakeLists.txt | 2 | ||||
-rw-r--r-- | slobrok/src/apps/slobrok/slobrok.cpp | 2 | ||||
-rwxr-xr-x | slobrok/src/tests/startsome/startsome.sh | 4 |
10 files changed, 16 insertions, 13 deletions
diff --git a/dist/post_install.sh b/dist/post_install.sh index ff096d8f7ef..8640f377e3d 100755 --- a/dist/post_install.sh +++ b/dist/post_install.sh @@ -127,3 +127,7 @@ ln -s vespa-fbench $INSTALLPATH/bin/fbench ln -s vespa-fbench-filter-file $INSTALLPATH/bin/filterfile ln -s vespa-geturl $INSTALLPATH/bin/geturl ln -s vespa-fbench-split-file $INSTALLPATH/bin/splitfile + +# Temporary when renaming programs in slobrok +ln -s vespa-slobrok $INSTALLPATH/bin/slobrok +ln -s vespa-slobrok-cmd $INSTALLPATH/bin/sbcmd diff --git a/jrt_test/src/binref/env.sh.in b/jrt_test/src/binref/env.sh.in index 6549af72454..ffe136defbe 100644 --- a/jrt_test/src/binref/env.sh.in +++ b/jrt_test/src/binref/env.sh.in @@ -1,6 +1,6 @@ BINREF=@CMAKE_CURRENT_BINARY_DIR@ -SBCMD=@PROJECT_BINARY_DIR@/slobrok/src/apps/sbcmd/sbcmd -SLOBROK=@PROJECT_BINARY_DIR@/slobrok/src/apps/slobrok/slobrok +SBCMD=@PROJECT_BINARY_DIR@/slobrok/src/apps/sbcmd/vespa-slobrok-cmd +SLOBROK=@PROJECT_BINARY_DIR@/slobrok/src/apps/slobrok/vespa-slobrok SIMPLESERVER=@PROJECT_BINARY_DIR@/jrt_test/src/jrt-test/simpleserver/jrt_test_simpleserver_app export BINREF SBCMD SLOBROK SIMPLESERVER # port numbers allocated for this module: diff --git a/slobrok/src/apps/check_slobrok/CMakeLists.txt b/slobrok/src/apps/check_slobrok/CMakeLists.txt index 638f1c8c9d1..92d58e0045e 100644 --- a/slobrok/src/apps/check_slobrok/CMakeLists.txt +++ b/slobrok/src/apps/check_slobrok/CMakeLists.txt @@ -2,6 +2,5 @@ vespa_add_executable(slobrok_check_slobrok_app SOURCES check_slobrok.cpp - INSTALL bin DEPENDS ) diff --git a/slobrok/src/apps/sbcmd/.gitignore b/slobrok/src/apps/sbcmd/.gitignore index c035466f4f9..2b106b70225 100644 --- a/slobrok/src/apps/sbcmd/.gitignore +++ b/slobrok/src/apps/sbcmd/.gitignore @@ -1,3 +1,3 @@ /.depend /Makefile -/sbcmd +/vespa-slobrok-cmd diff --git a/slobrok/src/apps/sbcmd/CMakeLists.txt b/slobrok/src/apps/sbcmd/CMakeLists.txt index 3eea280ac55..c9df0a44500 100644 --- a/slobrok/src/apps/sbcmd/CMakeLists.txt +++ b/slobrok/src/apps/sbcmd/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(slobrok_sbcmd_app SOURCES sbcmd.cpp - OUTPUT_NAME sbcmd + OUTPUT_NAME vespa-slobrok-cmd INSTALL bin DEPENDS ) diff --git a/slobrok/src/apps/sbcmd/sbcmd.cpp b/slobrok/src/apps/sbcmd/sbcmd.cpp index 927fab6ebff..bbf8c21abe6 100644 --- a/slobrok/src/apps/sbcmd/sbcmd.cpp +++ b/slobrok/src/apps/sbcmd/sbcmd.cpp @@ -7,7 +7,7 @@ #include <sstream> #include <vespa/log/log.h> -LOG_SETUP("sb-cmd"); +LOG_SETUP("vespa-slobrok-cmd"); class Slobrok_CMD : public FastOS_Application { @@ -135,7 +135,7 @@ Slobrok_CMD::Main() _target->InvokeSync(req, 5.0); if (req->IsError()) { - fprintf(stderr, "sb-cmd error %d: %s\n", + fprintf(stderr, "vespa-slobrok-cmd error %d: %s\n", req->GetErrorCode(), req->GetErrorMessage()); } else { FRT_Values &answer = *(req->GetReturn()); @@ -163,7 +163,7 @@ Slobrok_CMD::Main() answer[1]._string_array._pt[j]._str); } } else { - fprintf(stderr, "sb-cmd OK, returntypes '%s'\n", atypes); + fprintf(stderr, "vespa-slobrok-cmd OK, returntypes '%s'\n", atypes); uint32_t idx = 0; while (atypes != NULL && *atypes != '\0') { switch (*atypes) { diff --git a/slobrok/src/apps/slobrok/.gitignore b/slobrok/src/apps/slobrok/.gitignore index e0038c324fb..d562c5b3250 100644 --- a/slobrok/src/apps/slobrok/.gitignore +++ b/slobrok/src/apps/slobrok/.gitignore @@ -1,3 +1,3 @@ /.depend /Makefile -/slobrok +/vespa-slobrok diff --git a/slobrok/src/apps/slobrok/CMakeLists.txt b/slobrok/src/apps/slobrok/CMakeLists.txt index edb3976b74e..84c1f6426ad 100644 --- a/slobrok/src/apps/slobrok/CMakeLists.txt +++ b/slobrok/src/apps/slobrok/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_add_executable(slobrok_app SOURCES slobrok.cpp - OUTPUT_NAME slobrok + OUTPUT_NAME vespa-slobrok INSTALL bin DEPENDS slobrok_slobrokserver diff --git a/slobrok/src/apps/slobrok/slobrok.cpp b/slobrok/src/apps/slobrok/slobrok.cpp index 50d0c2a0399..6945cc11292 100644 --- a/slobrok/src/apps/slobrok/slobrok.cpp +++ b/slobrok/src/apps/slobrok/slobrok.cpp @@ -6,7 +6,7 @@ #include <vespa/fastos/app.h> #include <vespa/log/log.h> -LOG_SETUP("slobrok"); +LOG_SETUP("vespa-slobrok"); /** * @brief namespace for the actual slobrok application. diff --git a/slobrok/src/tests/startsome/startsome.sh b/slobrok/src/tests/startsome/startsome.sh index 2a865988c41..db2f61307f9 100755 --- a/slobrok/src/tests/startsome/startsome.sh +++ b/slobrok/src/tests/startsome/startsome.sh @@ -2,8 +2,8 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e -SBCMD=../../apps/sbcmd/sbcmd -SLOBROK=../../apps/slobrok/slobrok +SBCMD=../../apps/sbcmd/vespa-slobrok-cmd +SLOBROK=../../apps/slobrok/vespa-slobrok listall () { |