From 2adc8696b8f1a9f9038a1e6377ac23e1bfd03ceb Mon Sep 17 00:00:00 2001 From: imarom Date: Mon, 24 Aug 2015 15:32:53 +0300 Subject: [PATCH] moved files to be on a single directory --- linux/ws_main.py | 8 ++++---- linux_dpdk/ws_main.py | 4 ++-- src/rpc-server/{src => }/commands/trex_rpc_cmd_general.cpp | 0 src/rpc-server/{src => }/commands/trex_rpc_cmd_stream.cpp | 0 src/rpc-server/{src => }/commands/trex_rpc_cmd_test.cpp | 0 src/rpc-server/{src => }/commands/trex_rpc_cmds.h | 0 src/rpc-server/{src => }/trex_rpc_cmd.cpp | 0 src/rpc-server/{include => }/trex_rpc_cmd_api.h | 0 src/rpc-server/{src => }/trex_rpc_cmds_table.cpp | 0 src/rpc-server/{include => }/trex_rpc_cmds_table.h | 0 src/rpc-server/{include => }/trex_rpc_exception_api.h | 0 src/rpc-server/{src => }/trex_rpc_jsonrpc_v2_parser.cpp | 0 src/rpc-server/{include => }/trex_rpc_jsonrpc_v2_parser.h | 0 src/rpc-server/{src => }/trex_rpc_req_resp_server.cpp | 0 src/rpc-server/{include => }/trex_rpc_req_resp_server.h | 0 src/rpc-server/{src => }/trex_rpc_server.cpp | 0 src/rpc-server/{include => }/trex_rpc_server_api.h | 0 src/rpc-server/{src => }/trex_rpc_server_mock.cpp | 0 18 files changed, 6 insertions(+), 6 deletions(-) rename src/rpc-server/{src => }/commands/trex_rpc_cmd_general.cpp (100%) rename src/rpc-server/{src => }/commands/trex_rpc_cmd_stream.cpp (100%) rename src/rpc-server/{src => }/commands/trex_rpc_cmd_test.cpp (100%) rename src/rpc-server/{src => }/commands/trex_rpc_cmds.h (100%) rename src/rpc-server/{src => }/trex_rpc_cmd.cpp (100%) rename src/rpc-server/{include => }/trex_rpc_cmd_api.h (100%) rename src/rpc-server/{src => }/trex_rpc_cmds_table.cpp (100%) rename src/rpc-server/{include => }/trex_rpc_cmds_table.h (100%) rename src/rpc-server/{include => }/trex_rpc_exception_api.h (100%) rename src/rpc-server/{src => }/trex_rpc_jsonrpc_v2_parser.cpp (100%) rename src/rpc-server/{include => }/trex_rpc_jsonrpc_v2_parser.h (100%) rename src/rpc-server/{src => }/trex_rpc_req_resp_server.cpp (100%) rename src/rpc-server/{include => }/trex_rpc_req_resp_server.h (100%) rename src/rpc-server/{src => }/trex_rpc_server.cpp (100%) rename src/rpc-server/{include => }/trex_rpc_server_api.h (100%) rename src/rpc-server/{src => }/trex_rpc_server_mock.cpp (100%) diff --git a/linux/ws_main.py b/linux/ws_main.py index 9ee9a465..7d9aae3b 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -139,7 +139,7 @@ net_src = SrcGroup(dir='src/common/Network/Packet', 'VLANHeader.cpp']); # RPC code -rpc_server_src = SrcGroup(dir='src/rpc-server/src', +rpc_server_src = SrcGroup(dir='src/rpc-server/', src_list=[ 'trex_rpc_server.cpp', 'trex_rpc_req_resp_server.cpp', @@ -153,10 +153,10 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/src', ]) # RPC mock server (test) -rpc_server_mock_src = SrcGroup(dir='src/rpc-server/src', +rpc_server_mock_src = SrcGroup(dir='src/rpc-server/', src_list=[ 'trex_rpc_server_mock.cpp', - '../../gtest/rpc_test.cpp', + '../gtest/rpc_test.cpp', ]) # JSON package @@ -224,7 +224,7 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ ../src/zmq/include/ ../src/ - ../src/rpc-server/include + ../src/rpc-server/ ../external_libs/json/ ../yaml-cpp/include/ '''; diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 6bae1348..aef36244 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -137,7 +137,7 @@ json_src = SrcGroup(dir='external_libs/json', ]) # RPC code -rpc_server_src = SrcGroup(dir='src/rpc-server/src', +rpc_server_src = SrcGroup(dir='src/rpc-server/', src_list=[ 'trex_rpc_server.cpp', 'trex_rpc_req_resp_server.cpp', @@ -400,7 +400,7 @@ common_flags_old = common_flags + [ includes_path =''' ../src/pal/linux_dpdk/ ../src/ ../external_libs/json/ - ../src/rpc-server/include + ../src/rpc-server/ ../yaml-cpp/include/ ../src/zmq/include/ ../src/dpdk_lib18/librte_eal/linuxapp/eal/include/ diff --git a/src/rpc-server/src/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp similarity index 100% rename from src/rpc-server/src/commands/trex_rpc_cmd_general.cpp rename to src/rpc-server/commands/trex_rpc_cmd_general.cpp diff --git a/src/rpc-server/src/commands/trex_rpc_cmd_stream.cpp b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp similarity index 100% rename from src/rpc-server/src/commands/trex_rpc_cmd_stream.cpp rename to src/rpc-server/commands/trex_rpc_cmd_stream.cpp diff --git a/src/rpc-server/src/commands/trex_rpc_cmd_test.cpp b/src/rpc-server/commands/trex_rpc_cmd_test.cpp similarity index 100% rename from src/rpc-server/src/commands/trex_rpc_cmd_test.cpp rename to src/rpc-server/commands/trex_rpc_cmd_test.cpp diff --git a/src/rpc-server/src/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h similarity index 100% rename from src/rpc-server/src/commands/trex_rpc_cmds.h rename to src/rpc-server/commands/trex_rpc_cmds.h diff --git a/src/rpc-server/src/trex_rpc_cmd.cpp b/src/rpc-server/trex_rpc_cmd.cpp similarity index 100% rename from src/rpc-server/src/trex_rpc_cmd.cpp rename to src/rpc-server/trex_rpc_cmd.cpp diff --git a/src/rpc-server/include/trex_rpc_cmd_api.h b/src/rpc-server/trex_rpc_cmd_api.h similarity index 100% rename from src/rpc-server/include/trex_rpc_cmd_api.h rename to src/rpc-server/trex_rpc_cmd_api.h diff --git a/src/rpc-server/src/trex_rpc_cmds_table.cpp b/src/rpc-server/trex_rpc_cmds_table.cpp similarity index 100% rename from src/rpc-server/src/trex_rpc_cmds_table.cpp rename to src/rpc-server/trex_rpc_cmds_table.cpp diff --git a/src/rpc-server/include/trex_rpc_cmds_table.h b/src/rpc-server/trex_rpc_cmds_table.h similarity index 100% rename from src/rpc-server/include/trex_rpc_cmds_table.h rename to src/rpc-server/trex_rpc_cmds_table.h diff --git a/src/rpc-server/include/trex_rpc_exception_api.h b/src/rpc-server/trex_rpc_exception_api.h similarity index 100% rename from src/rpc-server/include/trex_rpc_exception_api.h rename to src/rpc-server/trex_rpc_exception_api.h diff --git a/src/rpc-server/src/trex_rpc_jsonrpc_v2_parser.cpp b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp similarity index 100% rename from src/rpc-server/src/trex_rpc_jsonrpc_v2_parser.cpp rename to src/rpc-server/trex_rpc_jsonrpc_v2_parser.cpp diff --git a/src/rpc-server/include/trex_rpc_jsonrpc_v2_parser.h b/src/rpc-server/trex_rpc_jsonrpc_v2_parser.h similarity index 100% rename from src/rpc-server/include/trex_rpc_jsonrpc_v2_parser.h rename to src/rpc-server/trex_rpc_jsonrpc_v2_parser.h diff --git a/src/rpc-server/src/trex_rpc_req_resp_server.cpp b/src/rpc-server/trex_rpc_req_resp_server.cpp similarity index 100% rename from src/rpc-server/src/trex_rpc_req_resp_server.cpp rename to src/rpc-server/trex_rpc_req_resp_server.cpp diff --git a/src/rpc-server/include/trex_rpc_req_resp_server.h b/src/rpc-server/trex_rpc_req_resp_server.h similarity index 100% rename from src/rpc-server/include/trex_rpc_req_resp_server.h rename to src/rpc-server/trex_rpc_req_resp_server.h diff --git a/src/rpc-server/src/trex_rpc_server.cpp b/src/rpc-server/trex_rpc_server.cpp similarity index 100% rename from src/rpc-server/src/trex_rpc_server.cpp rename to src/rpc-server/trex_rpc_server.cpp diff --git a/src/rpc-server/include/trex_rpc_server_api.h b/src/rpc-server/trex_rpc_server_api.h similarity index 100% rename from src/rpc-server/include/trex_rpc_server_api.h rename to src/rpc-server/trex_rpc_server_api.h diff --git a/src/rpc-server/src/trex_rpc_server_mock.cpp b/src/rpc-server/trex_rpc_server_mock.cpp similarity index 100% rename from src/rpc-server/src/trex_rpc_server_mock.cpp rename to src/rpc-server/trex_rpc_server_mock.cpp -- 2.16.6