From cecaf28ab61882d323cb5f3d813518523f7e836b Mon Sep 17 00:00:00 2001 From: Dan Klein Date: Tue, 25 Aug 2015 10:05:31 +0300 Subject: comment out itay's rpc module --- linux/ws_main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/ws_main.py') diff --git a/linux/ws_main.py b/linux/ws_main.py index f30a7be3..1f096788 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -351,7 +351,7 @@ build_types = [ build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_32, is_pie = False), build_option(name = "bp-sim", src = bp, debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False), - build_option(name = "mock-rpc-server", use = ['zmq'], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False), + # build_option(name = "mock-rpc-server", use = ['zmq'], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False), ] -- cgit From fc46f2618332037a8c1b58fbce5d616033bff1c9 Mon Sep 17 00:00:00 2001 From: Dan Klein Date: Wed, 26 Aug 2015 15:05:58 +0300 Subject: Rearranged files and external libraries in two different locations, one for cpp (trex-core/external_libs) and one for python (trex-core/scripts/external_libs) --- linux/ws_main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'linux/ws_main.py') diff --git a/linux/ws_main.py b/linux/ws_main.py index 1f096788..505853b6 100755 --- a/linux/ws_main.py +++ b/linux/ws_main.py @@ -159,7 +159,7 @@ rpc_server_mock_src = SrcGroup(dir='src/rpc-server/src', ]) # JSON package -json_src = SrcGroup(dir='external_libs/cpp/json', +json_src = SrcGroup(dir='external_libs/json', src_list=[ 'jsoncpp.cpp' ]) @@ -170,7 +170,7 @@ rpc_server_mock = SrcGroups([cmn_src, json_src ]) -yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/', +yaml_src = SrcGroup(dir='external_libs/yaml-cpp/src/', src_list=[ 'aliasmanager.cpp', 'binary.cpp', @@ -223,9 +223,9 @@ cxxflags_base =['-DWIN_UCODE_SIM', includes_path =''' ../src/pal/linux/ ../src/ ../src/rpc-server/include - ../external_libs/cpp/json/ - ../external_libs/cpp/zmq/include/ - ../external_libs/cpp/yaml-cpp/include/ + ../external_libs/json/ + ../external_libs/zmq/include/ + ../external_libs/yaml-cpp/include/ '''; @@ -357,7 +357,7 @@ build_types = [ def build_prog (bld, build_obj): - zmq_lib_path='external_libs/cpp/zmq/' + zmq_lib_path='external_libs/zmq/' bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] ) bld.program(features='cxx cxxprogram', -- cgit