Merge to latest

1 files changed, 11 insertions, 15 deletions

diff --git a/linux/ws_main.py b/linux/ws_main.py
index a41fab1e..22c52eea 100755
--- a/linux/ws_main.py
+++ b/linux/ws_main.py
@@ -133,7 +133,8 @@ cmn_src = SrcGroup(dir='src/common',
         'basic_utils.cpp',
         'captureFile.cpp',
         'erf.cpp',
-        'pcap.cpp'
+        'pcap.cpp',
+        'base64.cpp'
         ]);
 
          
@@ -223,8 +224,13 @@ yaml_src = SrcGroup(dir='external_libs/yaml-cpp/src/',
             'tag.cpp']);
 
 
+# stubs
+stubs = SrcGroup(dir='/src/stub/',
+        src_list=['zmq_stub.c'])
+
 rpc_server_mock = SrcGroups([
                              main_src,
+                             stubs,
                              cmn_src,
                              rpc_server_src,
                              rpc_server_mock_src,
@@ -234,25 +240,17 @@ rpc_server_mock = SrcGroups([
                              net_src,
                              ])
 
-# REMOVE ME - need to decide if stateless is part of bp sim or not
-bp_hack_for_compile = SrcGroup(dir='/src/stub/',
-        src_list=['trex_stateless_stub.cpp'
-            ])
-
 bp =SrcGroups([
                 bp_sim_main,
                 bp_sim_gtest,
                 main_src, 
                 cmn_src ,
-
+                stubs,
                 net_src ,
                 yaml_src,
                 json_src,
                 stateless_src,
                 rpc_server_src
-                #rpc_server_mock_src,
-
-                #bp_hack_for_compile,
                 ]);
 
 
@@ -406,15 +404,15 @@ class build_option:
 
 
 build_types = [
-               build_option(name = "bp-sim", src = bp, use = ['zmq'],debug_mode= DEBUG_, platform = PLATFORM_64, is_pie = False,
+               build_option(name = "bp-sim", src = bp, use = [''],debug_mode= DEBUG_, platform = PLATFORM_64, is_pie = False,
                             flags = ['-Wall', '-Werror', '-Wno-sign-compare', '-Wno-strict-aliasing'],
                             rpath = ['.']),
 
-               build_option(name = "bp-sim", src = bp, use = ['zmq'],debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False,
+               build_option(name = "bp-sim", src = bp, use = [''],debug_mode= RELEASE_,platform = PLATFORM_64, is_pie = False,
                             flags = ['-Wall', '-Werror', '-Wno-sign-compare', '-Wno-strict-aliasing'],
                             rpath = ['.']),
 
-               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 = [''], src = rpc_server_mock, debug_mode= DEBUG_,platform = PLATFORM_64, is_pie = False, 
                             flags = ['-DTREX_RPC_MOCK_SERVER', '-Wall', '-Werror', '-Wno-sign-compare'],
                             rpath = ['.']),
               ]
@@ -422,8 +420,6 @@ build_types = [
 
 
 def build_prog (bld, build_obj):
-    zmq_lib_path='external_libs/zmq/'
-    bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] )
 
     bld.program(features='cxx cxxprogram', 
                 includes =includes_path,