aboutsummaryrefslogtreecommitdiffstats
path: root/filedistribution
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2017-06-13 10:10:29 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2017-06-13 10:10:29 +0000
commit99e615cb41b0098ef41f7ed1e83501fdd9ea318a (patch)
treef289a08cc3823f1c1dd21aec1f5a2249011d48f7 /filedistribution
parent9fe6a9f635a5277d6d6c58ccbe5b279449e016c1 (diff)
Rename filedistribution programs to have vespa- prefix.
Temporarily add symlinks from old name to new name.
Diffstat (limited to 'filedistribution')
-rw-r--r--filedistribution/src/apps/filedistributor/.gitignore2
-rw-r--r--filedistribution/src/apps/filedistributor/CMakeLists.txt2
-rw-r--r--filedistribution/src/apps/status/.gitignore2
-rw-r--r--filedistribution/src/apps/status/CMakeLists.txt2
-rw-r--r--filedistribution/src/apps/status/vespa-status-filedistribution.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/filedistribution/src/apps/filedistributor/.gitignore b/filedistribution/src/apps/filedistributor/.gitignore
index a41b1963b70..89aaa70637e 100644
--- a/filedistribution/src/apps/filedistributor/.gitignore
+++ b/filedistribution/src/apps/filedistributor/.gitignore
@@ -1,2 +1,2 @@
/filedistributor
-filedistributor-bin
+vespa-filedistributor-bin
diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt
index 1a7ef87bbac..42e47856208 100644
--- a/filedistribution/src/apps/filedistributor/CMakeLists.txt
+++ b/filedistribution/src/apps/filedistributor/CMakeLists.txt
@@ -2,7 +2,7 @@
vespa_add_executable(filedistribution_filedistributor_app
SOURCES
filedistributor.cpp
- OUTPUT_NAME filedistributor-bin
+ OUTPUT_NAME vespa-filedistributor-bin
INSTALL sbin
DEPENDS
filedistribution_distributor
diff --git a/filedistribution/src/apps/status/.gitignore b/filedistribution/src/apps/status/.gitignore
index 6dc1c1fff5d..2105a3c7051 100644
--- a/filedistribution/src/apps/status/.gitignore
+++ b/filedistribution/src/apps/status/.gitignore
@@ -1,2 +1,2 @@
-/status-filedistribution
+/vespa-status-filedistribution-bin
filedistribution_status-filedistribution_app
diff --git a/filedistribution/src/apps/status/CMakeLists.txt b/filedistribution/src/apps/status/CMakeLists.txt
index 63e9752496e..e46e0c58d86 100644
--- a/filedistribution/src/apps/status/CMakeLists.txt
+++ b/filedistribution/src/apps/status/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(filedistribution_status-filedistribution_app
SOURCES
status-filedistribution.cpp
INSTALL bin
- OUTPUT_NAME status-filedistribution
+ OUTPUT_NAME vespa-status-filedistribution-bin
DEPENDS
filedistribution_filedistributionmodel
filedistribution_common
diff --git a/filedistribution/src/apps/status/vespa-status-filedistribution.sh b/filedistribution/src/apps/status/vespa-status-filedistribution.sh
index 104688a4883..1ba56d6c798 100644
--- a/filedistribution/src/apps/status/vespa-status-filedistribution.sh
+++ b/filedistribution/src/apps/status/vespa-status-filedistribution.sh
@@ -65,4 +65,4 @@ ROOT=${VESPA_HOME%/}
ZKSTRING=$($ROOT/libexec/vespa/vespa-config.pl -zkstring)
test -z "$VESPA_LOG_LEVEL" && VESPA_LOG_LEVEL=warning
export VESPA_LOG_LEVEL
-exec $ROOT/bin/status-filedistribution --zkstring "$ZKSTRING" $@
+exec $ROOT/bin/vespa-status-filedistribution-bin --zkstring "$ZKSTRING" $@