summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdist/post_install.sh5
-rw-r--r--fnet/src/examples/frt/rpc/.gitignore6
-rw-r--r--fnet/src/examples/frt/rpc/CMakeLists.txt7
3 files changed, 6 insertions, 12 deletions
diff --git a/dist/post_install.sh b/dist/post_install.sh
index a5cb48c2d9e..e9fd96bf6db 100755
--- a/dist/post_install.sh
+++ b/dist/post_install.sh
@@ -69,11 +69,6 @@ ln -s $PREFIX/lib/jars/zkfacade-jar-with-dependencies.jar $INSTALLPATH/conf/conf
ln -s $PREFIX/conf/configserver-app/components $INSTALLPATH/lib/jars/config-models
ln -s vespa-storaged-bin $INSTALLPATH/sbin/vespa-distributord-bin
-# Temporary when renaming binaries in fnet
-ln -s vespa-rpc-info $INSTALLPATH/bin/rpc_info
-ln -s vespa-rpc-invoke $INSTALLPATH/bin/rpc_invoke
-ln -s vespa-rpc-proxy $INSTALLPATH/bin/rpc_proxy
-
# Temporary when renaming binaries in fsa
ln -s vespa-fsadump $INSTALLPATH/bin/fsadump
ln -s vespa-fsainfo $INSTALLPATH/bin/fsainfo
diff --git a/fnet/src/examples/frt/rpc/.gitignore b/fnet/src/examples/frt/rpc/.gitignore
index 907b6c8a249..91218a0868b 100644
--- a/fnet/src/examples/frt/rpc/.gitignore
+++ b/fnet/src/examples/frt/rpc/.gitignore
@@ -5,12 +5,12 @@ echo_server
rpc_callback_client
rpc_callback_server
rpc_client
+rpc_info
+rpc_invoke
+rpc_proxy
rpc_server
fnet_echo_client_app
fnet_rpc_callback_client_app
fnet_rpc_callback_server_app
fnet_rpc_client_app
fnet_rpc_server_app
-vespa-rpc-info
-vespa-rpc-invoke
-vespa-rpc-proxy
diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt
index 0d71ba4f91e..338fe761b97 100644
--- a/fnet/src/examples/frt/rpc/CMakeLists.txt
+++ b/fnet/src/examples/frt/rpc/CMakeLists.txt
@@ -20,15 +20,14 @@ vespa_add_executable(fnet_echo_client_app
vespa_add_executable(fnet_rpc_info_app
SOURCES
rpc_info.cpp
- OUTPUT_NAME vespa-rpc-info
- INSTALL bin
+ OUTPUT_NAME rpc_info
DEPENDS
fnet
)
vespa_add_executable(fnet_rpc_proxy_app
SOURCES
rpc_proxy.cpp
- OUTPUT_NAME vespa-rpc-proxy
+ OUTPUT_NAME rpc_proxy
INSTALL bin
DEPENDS
fnet
@@ -48,7 +47,7 @@ vespa_add_executable(fnet_rpc_callback_client_app
vespa_add_executable(fnet_rpc_invoke_app
SOURCES
rpc_invoke.cpp
- OUTPUT_NAME vespa-rpc-invoke
+ OUTPUT_NAME rpc_invoke
INSTALL bin
DEPENDS
fnet