summaryrefslogtreecommitdiffstats
path: root/linux_dpdk
diff options
context:
space:
mode:
authorDan Klein <danklein10@gmail.com>2015-11-24 08:54:53 +0200
committerDan Klein <danklein10@gmail.com>2015-11-24 08:54:53 +0200
commite7cb8b0f6c2fbe08d2086a7408040ac7d12aee5a (patch)
tree1b27e542fe9f3ae4abdc8245b804cda25a6e2c2f /linux_dpdk
parent597f74d8ed10abc3dd9df7e81ecea5ac2f5c714e (diff)
parentf3861d504353729724086dec82c79e818224554f (diff)
Merge branch 'master' into dan_stateless
Diffstat (limited to 'linux_dpdk')
-rwxr-xr-xlinux_dpdk/ws_main.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index 3f3c0950..89f41376 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -107,6 +107,7 @@ main_src = SrcGroup(dir='src',
'utl_yaml.cpp',
'nat_check.cpp',
'msg_manager.cpp',
+ 'publisher/trex_publisher.cpp',
'pal/linux_dpdk/pal_utl.cpp',
'pal/linux_dpdk/mbuf.cpp'
]);
@@ -159,6 +160,7 @@ stateless_src = SrcGroup(dir='src/stateless/',
'cp/trex_stateless.cpp',
'cp/trex_stateless_port.cpp',
'cp/trex_streams_compiler.cpp',
+ 'cp/trex_dp_port_events.cpp',
'dp/trex_stateless_dp_core.cpp',
'messaging/trex_stateless_messaging.cpp'
])
@@ -572,7 +574,7 @@ class build_option:
if self.isRelease () :
flags += ['-O3'];
else:
- flags += ['-O0'];
+ flags += ['-O0','-D_DEBUG'];
return (flags)
@@ -582,6 +584,12 @@ class build_option:
# support c++ 2011
flags += ['-std=c++0x']
+ flags += ['-Wall',
+ '-Werror',
+ '-Wno-literal-suffix',
+ '-Wno-sign-compare',
+ '-Wno-strict-aliasing']
+
return (flags)
def get_c_flags (self):
@@ -768,7 +776,7 @@ files_list=[
'trex-console'
];
-files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib']
+files_dir=['cap2','avl','cfg','ko','automation', 'external_libs', 'python-lib','stl']
class Env(object):
@@ -853,7 +861,7 @@ def publish(bld):
from_ = exec_p+'/'+release_name;
os.system("rsync -av %s %s:%s/%s " %(from_,Env().get_local_web_server(),Env().get_remote_release_path (), release_name))
os.system("ssh %s 'cd %s;rm be_latest; ln -P %s be_latest' " %(Env().get_local_web_server(),Env().get_remote_release_path (),release_name))
- os.system("ssh %s 'cd %s;rm latest; ln -P %s latest' " %(Env().get_local_web_server(),Env().get_remote_release_path (),release_name))
+ #os.system("ssh %s 'cd %s;rm latest; ln -P %s latest' " %(Env().get_local_web_server(),Env().get_remote_release_path (),release_name))
def publish_ext(bld):
@@ -864,7 +872,7 @@ def publish_ext(bld):
from_ = exec_p+'/'+release_name;
os.system('rsync -avz -e "ssh -i %s" --rsync-path=/usr/bin/rsync %s %s@%s:%s/release/%s' % (Env().get_trex_ex_web_key(),from_, Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path() ,release_name) )
os.system("ssh -i %s -l %s %s 'cd %s/release/;rm be_latest; ln -P %s be_latest' " %(Env().get_trex_ex_web_key(),Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path(),release_name))
- os.system("ssh -i %s -l %s %s 'cd %s/release/;rm latest; ln -P %s latest' " %(Env().get_trex_ex_web_key(),Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path(),release_name))
+ #os.system("ssh -i %s -l %s %s 'cd %s/release/;rm latest; ln -P %s latest' " %(Env().get_trex_ex_web_key(),Env().get_trex_ex_web_user(),Env().get_trex_ex_web_srv(),Env().get_trex_ex_web_path(),release_name))