From: imarom <imarom@cisco.com>
Date: Mon, 24 Aug 2015 14:52:52 +0000 (+0300)
Subject: fix compile issues with external libarries
X-Git-Tag: v1.76~18^2~2
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=36c6c87fe4380b214f8ff8a45dc0213fa109821c;p=trex.git

fix compile issues with external libarries
---

diff --git a/yaml-cpp/CMakeLists.txt b/external_libs/cpp/yaml-cpp/CMakeLists.txt
similarity index 100%
rename from yaml-cpp/CMakeLists.txt
rename to external_libs/cpp/yaml-cpp/CMakeLists.txt
diff --git a/yaml-cpp/include/yaml-cpp/aliasmanager.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/aliasmanager.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/aliasmanager.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/aliasmanager.h
diff --git a/yaml-cpp/include/yaml-cpp/anchor.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/anchor.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/anchor.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/anchor.h
diff --git a/yaml-cpp/include/yaml-cpp/binary.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/binary.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/binary.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/binary.h
diff --git a/yaml-cpp/include/yaml-cpp/contrib/anchordict.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/anchordict.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/contrib/anchordict.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/anchordict.h
diff --git a/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/contrib/graphbuilder.h
diff --git a/yaml-cpp/include/yaml-cpp/conversion.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/conversion.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/conversion.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/conversion.h
diff --git a/yaml-cpp/include/yaml-cpp/dll.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/dll.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/dll.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/dll.h
diff --git a/yaml-cpp/include/yaml-cpp/emitfromevents.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emitfromevents.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/emitfromevents.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/emitfromevents.h
diff --git a/yaml-cpp/include/yaml-cpp/emitter.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emitter.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/emitter.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/emitter.h
diff --git a/yaml-cpp/include/yaml-cpp/emittermanip.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/emittermanip.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/emittermanip.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/emittermanip.h
diff --git a/yaml-cpp/include/yaml-cpp/eventhandler.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/eventhandler.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/eventhandler.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/eventhandler.h
diff --git a/yaml-cpp/include/yaml-cpp/exceptions.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/exceptions.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/exceptions.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/exceptions.h
diff --git a/yaml-cpp/include/yaml-cpp/iterator.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/iterator.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/iterator.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/iterator.h
diff --git a/yaml-cpp/include/yaml-cpp/ltnode.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/ltnode.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/ltnode.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/ltnode.h
diff --git a/yaml-cpp/include/yaml-cpp/mark.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/mark.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/mark.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/mark.h
diff --git a/yaml-cpp/include/yaml-cpp/node.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/node.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/node.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/node.h
diff --git a/yaml-cpp/include/yaml-cpp/nodeimpl.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeimpl.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/nodeimpl.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeimpl.h
diff --git a/yaml-cpp/include/yaml-cpp/nodereadimpl.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodereadimpl.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/nodereadimpl.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/nodereadimpl.h
diff --git a/yaml-cpp/include/yaml-cpp/nodeutil.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeutil.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/nodeutil.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/nodeutil.h
diff --git a/yaml-cpp/include/yaml-cpp/noncopyable.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/noncopyable.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/noncopyable.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/noncopyable.h
diff --git a/yaml-cpp/include/yaml-cpp/null.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/null.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/null.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/null.h
diff --git a/yaml-cpp/include/yaml-cpp/ostream.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/ostream.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/ostream.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/ostream.h
diff --git a/yaml-cpp/include/yaml-cpp/parser.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/parser.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/parser.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/parser.h
diff --git a/yaml-cpp/include/yaml-cpp/stlemitter.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/stlemitter.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/stlemitter.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/stlemitter.h
diff --git a/yaml-cpp/include/yaml-cpp/stlnode.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/stlnode.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/stlnode.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/stlnode.h
diff --git a/yaml-cpp/include/yaml-cpp/traits.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/traits.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/traits.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/traits.h
diff --git a/yaml-cpp/include/yaml-cpp/yaml.h b/external_libs/cpp/yaml-cpp/include/yaml-cpp/yaml.h
similarity index 100%
rename from yaml-cpp/include/yaml-cpp/yaml.h
rename to external_libs/cpp/yaml-cpp/include/yaml-cpp/yaml.h
diff --git a/yaml-cpp/install.txt b/external_libs/cpp/yaml-cpp/install.txt
similarity index 100%
rename from yaml-cpp/install.txt
rename to external_libs/cpp/yaml-cpp/install.txt
diff --git a/yaml-cpp/license.txt b/external_libs/cpp/yaml-cpp/license.txt
similarity index 100%
rename from yaml-cpp/license.txt
rename to external_libs/cpp/yaml-cpp/license.txt
diff --git a/yaml-cpp/src/aliasmanager.cpp b/external_libs/cpp/yaml-cpp/src/aliasmanager.cpp
similarity index 100%
rename from yaml-cpp/src/aliasmanager.cpp
rename to external_libs/cpp/yaml-cpp/src/aliasmanager.cpp
diff --git a/yaml-cpp/src/binary.cpp b/external_libs/cpp/yaml-cpp/src/binary.cpp
similarity index 100%
rename from yaml-cpp/src/binary.cpp
rename to external_libs/cpp/yaml-cpp/src/binary.cpp
diff --git a/yaml-cpp/src/collectionstack.h b/external_libs/cpp/yaml-cpp/src/collectionstack.h
similarity index 100%
rename from yaml-cpp/src/collectionstack.h
rename to external_libs/cpp/yaml-cpp/src/collectionstack.h
diff --git a/yaml-cpp/src/contrib/graphbuilder.cpp b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilder.cpp
similarity index 100%
rename from yaml-cpp/src/contrib/graphbuilder.cpp
rename to external_libs/cpp/yaml-cpp/src/contrib/graphbuilder.cpp
diff --git a/yaml-cpp/src/contrib/graphbuilderadapter.cpp b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.cpp
similarity index 100%
rename from yaml-cpp/src/contrib/graphbuilderadapter.cpp
rename to external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.cpp
diff --git a/yaml-cpp/src/contrib/graphbuilderadapter.h b/external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.h
similarity index 100%
rename from yaml-cpp/src/contrib/graphbuilderadapter.h
rename to external_libs/cpp/yaml-cpp/src/contrib/graphbuilderadapter.h
diff --git a/yaml-cpp/src/conversion.cpp b/external_libs/cpp/yaml-cpp/src/conversion.cpp
similarity index 100%
rename from yaml-cpp/src/conversion.cpp
rename to external_libs/cpp/yaml-cpp/src/conversion.cpp
diff --git a/yaml-cpp/src/directives.cpp b/external_libs/cpp/yaml-cpp/src/directives.cpp
similarity index 100%
rename from yaml-cpp/src/directives.cpp
rename to external_libs/cpp/yaml-cpp/src/directives.cpp
diff --git a/yaml-cpp/src/directives.h b/external_libs/cpp/yaml-cpp/src/directives.h
similarity index 100%
rename from yaml-cpp/src/directives.h
rename to external_libs/cpp/yaml-cpp/src/directives.h
diff --git a/yaml-cpp/src/emitfromevents.cpp b/external_libs/cpp/yaml-cpp/src/emitfromevents.cpp
similarity index 100%
rename from yaml-cpp/src/emitfromevents.cpp
rename to external_libs/cpp/yaml-cpp/src/emitfromevents.cpp
diff --git a/yaml-cpp/src/emitter.cpp b/external_libs/cpp/yaml-cpp/src/emitter.cpp
similarity index 100%
rename from yaml-cpp/src/emitter.cpp
rename to external_libs/cpp/yaml-cpp/src/emitter.cpp
diff --git a/yaml-cpp/src/emitterstate.cpp b/external_libs/cpp/yaml-cpp/src/emitterstate.cpp
similarity index 100%
rename from yaml-cpp/src/emitterstate.cpp
rename to external_libs/cpp/yaml-cpp/src/emitterstate.cpp
diff --git a/yaml-cpp/src/emitterstate.h b/external_libs/cpp/yaml-cpp/src/emitterstate.h
similarity index 100%
rename from yaml-cpp/src/emitterstate.h
rename to external_libs/cpp/yaml-cpp/src/emitterstate.h
diff --git a/yaml-cpp/src/emitterutils.cpp b/external_libs/cpp/yaml-cpp/src/emitterutils.cpp
similarity index 100%
rename from yaml-cpp/src/emitterutils.cpp
rename to external_libs/cpp/yaml-cpp/src/emitterutils.cpp
diff --git a/yaml-cpp/src/emitterutils.h b/external_libs/cpp/yaml-cpp/src/emitterutils.h
similarity index 100%
rename from yaml-cpp/src/emitterutils.h
rename to external_libs/cpp/yaml-cpp/src/emitterutils.h
diff --git a/yaml-cpp/src/exp.cpp b/external_libs/cpp/yaml-cpp/src/exp.cpp
similarity index 100%
rename from yaml-cpp/src/exp.cpp
rename to external_libs/cpp/yaml-cpp/src/exp.cpp
diff --git a/yaml-cpp/src/exp.h b/external_libs/cpp/yaml-cpp/src/exp.h
similarity index 100%
rename from yaml-cpp/src/exp.h
rename to external_libs/cpp/yaml-cpp/src/exp.h
diff --git a/yaml-cpp/src/indentation.h b/external_libs/cpp/yaml-cpp/src/indentation.h
similarity index 100%
rename from yaml-cpp/src/indentation.h
rename to external_libs/cpp/yaml-cpp/src/indentation.h
diff --git a/yaml-cpp/src/iterator.cpp b/external_libs/cpp/yaml-cpp/src/iterator.cpp
similarity index 100%
rename from yaml-cpp/src/iterator.cpp
rename to external_libs/cpp/yaml-cpp/src/iterator.cpp
diff --git a/yaml-cpp/src/iterpriv.h b/external_libs/cpp/yaml-cpp/src/iterpriv.h
similarity index 100%
rename from yaml-cpp/src/iterpriv.h
rename to external_libs/cpp/yaml-cpp/src/iterpriv.h
diff --git a/yaml-cpp/src/node.cpp b/external_libs/cpp/yaml-cpp/src/node.cpp
similarity index 100%
rename from yaml-cpp/src/node.cpp
rename to external_libs/cpp/yaml-cpp/src/node.cpp
diff --git a/yaml-cpp/src/nodebuilder.cpp b/external_libs/cpp/yaml-cpp/src/nodebuilder.cpp
similarity index 100%
rename from yaml-cpp/src/nodebuilder.cpp
rename to external_libs/cpp/yaml-cpp/src/nodebuilder.cpp
diff --git a/yaml-cpp/src/nodebuilder.h b/external_libs/cpp/yaml-cpp/src/nodebuilder.h
similarity index 100%
rename from yaml-cpp/src/nodebuilder.h
rename to external_libs/cpp/yaml-cpp/src/nodebuilder.h
diff --git a/yaml-cpp/src/nodeownership.cpp b/external_libs/cpp/yaml-cpp/src/nodeownership.cpp
similarity index 100%
rename from yaml-cpp/src/nodeownership.cpp
rename to external_libs/cpp/yaml-cpp/src/nodeownership.cpp
diff --git a/yaml-cpp/src/nodeownership.h b/external_libs/cpp/yaml-cpp/src/nodeownership.h
similarity index 100%
rename from yaml-cpp/src/nodeownership.h
rename to external_libs/cpp/yaml-cpp/src/nodeownership.h
diff --git a/yaml-cpp/src/null.cpp b/external_libs/cpp/yaml-cpp/src/null.cpp
similarity index 100%
rename from yaml-cpp/src/null.cpp
rename to external_libs/cpp/yaml-cpp/src/null.cpp
diff --git a/yaml-cpp/src/ostream.cpp b/external_libs/cpp/yaml-cpp/src/ostream.cpp
similarity index 100%
rename from yaml-cpp/src/ostream.cpp
rename to external_libs/cpp/yaml-cpp/src/ostream.cpp
diff --git a/yaml-cpp/src/parser.cpp b/external_libs/cpp/yaml-cpp/src/parser.cpp
similarity index 100%
rename from yaml-cpp/src/parser.cpp
rename to external_libs/cpp/yaml-cpp/src/parser.cpp
diff --git a/yaml-cpp/src/ptr_stack.h b/external_libs/cpp/yaml-cpp/src/ptr_stack.h
similarity index 100%
rename from yaml-cpp/src/ptr_stack.h
rename to external_libs/cpp/yaml-cpp/src/ptr_stack.h
diff --git a/yaml-cpp/src/ptr_vector.h b/external_libs/cpp/yaml-cpp/src/ptr_vector.h
similarity index 100%
rename from yaml-cpp/src/ptr_vector.h
rename to external_libs/cpp/yaml-cpp/src/ptr_vector.h
diff --git a/yaml-cpp/src/regex.cpp b/external_libs/cpp/yaml-cpp/src/regex.cpp
similarity index 100%
rename from yaml-cpp/src/regex.cpp
rename to external_libs/cpp/yaml-cpp/src/regex.cpp
diff --git a/yaml-cpp/src/regex.h b/external_libs/cpp/yaml-cpp/src/regex.h
similarity index 100%
rename from yaml-cpp/src/regex.h
rename to external_libs/cpp/yaml-cpp/src/regex.h
diff --git a/yaml-cpp/src/regeximpl.h b/external_libs/cpp/yaml-cpp/src/regeximpl.h
similarity index 100%
rename from yaml-cpp/src/regeximpl.h
rename to external_libs/cpp/yaml-cpp/src/regeximpl.h
diff --git a/yaml-cpp/src/scanner.cpp b/external_libs/cpp/yaml-cpp/src/scanner.cpp
similarity index 100%
rename from yaml-cpp/src/scanner.cpp
rename to external_libs/cpp/yaml-cpp/src/scanner.cpp
diff --git a/yaml-cpp/src/scanner.h b/external_libs/cpp/yaml-cpp/src/scanner.h
similarity index 100%
rename from yaml-cpp/src/scanner.h
rename to external_libs/cpp/yaml-cpp/src/scanner.h
diff --git a/yaml-cpp/src/scanscalar.cpp b/external_libs/cpp/yaml-cpp/src/scanscalar.cpp
similarity index 100%
rename from yaml-cpp/src/scanscalar.cpp
rename to external_libs/cpp/yaml-cpp/src/scanscalar.cpp
diff --git a/yaml-cpp/src/scanscalar.h b/external_libs/cpp/yaml-cpp/src/scanscalar.h
similarity index 100%
rename from yaml-cpp/src/scanscalar.h
rename to external_libs/cpp/yaml-cpp/src/scanscalar.h
diff --git a/yaml-cpp/src/scantag.cpp b/external_libs/cpp/yaml-cpp/src/scantag.cpp
similarity index 100%
rename from yaml-cpp/src/scantag.cpp
rename to external_libs/cpp/yaml-cpp/src/scantag.cpp
diff --git a/yaml-cpp/src/scantag.h b/external_libs/cpp/yaml-cpp/src/scantag.h
similarity index 100%
rename from yaml-cpp/src/scantag.h
rename to external_libs/cpp/yaml-cpp/src/scantag.h
diff --git a/yaml-cpp/src/scantoken.cpp b/external_libs/cpp/yaml-cpp/src/scantoken.cpp
similarity index 100%
rename from yaml-cpp/src/scantoken.cpp
rename to external_libs/cpp/yaml-cpp/src/scantoken.cpp
diff --git a/yaml-cpp/src/setting.h b/external_libs/cpp/yaml-cpp/src/setting.h
similarity index 100%
rename from yaml-cpp/src/setting.h
rename to external_libs/cpp/yaml-cpp/src/setting.h
diff --git a/yaml-cpp/src/simplekey.cpp b/external_libs/cpp/yaml-cpp/src/simplekey.cpp
similarity index 100%
rename from yaml-cpp/src/simplekey.cpp
rename to external_libs/cpp/yaml-cpp/src/simplekey.cpp
diff --git a/yaml-cpp/src/singledocparser.cpp b/external_libs/cpp/yaml-cpp/src/singledocparser.cpp
similarity index 100%
rename from yaml-cpp/src/singledocparser.cpp
rename to external_libs/cpp/yaml-cpp/src/singledocparser.cpp
diff --git a/yaml-cpp/src/singledocparser.h b/external_libs/cpp/yaml-cpp/src/singledocparser.h
similarity index 100%
rename from yaml-cpp/src/singledocparser.h
rename to external_libs/cpp/yaml-cpp/src/singledocparser.h
diff --git a/yaml-cpp/src/stream.cpp b/external_libs/cpp/yaml-cpp/src/stream.cpp
similarity index 100%
rename from yaml-cpp/src/stream.cpp
rename to external_libs/cpp/yaml-cpp/src/stream.cpp
diff --git a/yaml-cpp/src/stream.h b/external_libs/cpp/yaml-cpp/src/stream.h
similarity index 100%
rename from yaml-cpp/src/stream.h
rename to external_libs/cpp/yaml-cpp/src/stream.h
diff --git a/yaml-cpp/src/streamcharsource.h b/external_libs/cpp/yaml-cpp/src/streamcharsource.h
similarity index 100%
rename from yaml-cpp/src/streamcharsource.h
rename to external_libs/cpp/yaml-cpp/src/streamcharsource.h
diff --git a/yaml-cpp/src/stringsource.h b/external_libs/cpp/yaml-cpp/src/stringsource.h
similarity index 100%
rename from yaml-cpp/src/stringsource.h
rename to external_libs/cpp/yaml-cpp/src/stringsource.h
diff --git a/yaml-cpp/src/tag.cpp b/external_libs/cpp/yaml-cpp/src/tag.cpp
similarity index 100%
rename from yaml-cpp/src/tag.cpp
rename to external_libs/cpp/yaml-cpp/src/tag.cpp
diff --git a/yaml-cpp/src/tag.h b/external_libs/cpp/yaml-cpp/src/tag.h
similarity index 100%
rename from yaml-cpp/src/tag.h
rename to external_libs/cpp/yaml-cpp/src/tag.h
diff --git a/yaml-cpp/src/token.h b/external_libs/cpp/yaml-cpp/src/token.h
similarity index 100%
rename from yaml-cpp/src/token.h
rename to external_libs/cpp/yaml-cpp/src/token.h
diff --git a/yaml-cpp/test/CMakeLists.txt b/external_libs/cpp/yaml-cpp/test/CMakeLists.txt
similarity index 100%
rename from yaml-cpp/test/CMakeLists.txt
rename to external_libs/cpp/yaml-cpp/test/CMakeLists.txt
diff --git a/yaml-cpp/test/emittertests.cpp b/external_libs/cpp/yaml-cpp/test/emittertests.cpp
similarity index 100%
rename from yaml-cpp/test/emittertests.cpp
rename to external_libs/cpp/yaml-cpp/test/emittertests.cpp
diff --git a/yaml-cpp/test/emittertests.h b/external_libs/cpp/yaml-cpp/test/emittertests.h
similarity index 100%
rename from yaml-cpp/test/emittertests.h
rename to external_libs/cpp/yaml-cpp/test/emittertests.h
diff --git a/yaml-cpp/test/main.cpp b/external_libs/cpp/yaml-cpp/test/main.cpp
similarity index 100%
rename from yaml-cpp/test/main.cpp
rename to external_libs/cpp/yaml-cpp/test/main.cpp
diff --git a/yaml-cpp/test/nodetests.h b/external_libs/cpp/yaml-cpp/test/nodetests.h
similarity index 100%
rename from yaml-cpp/test/nodetests.h
rename to external_libs/cpp/yaml-cpp/test/nodetests.h
diff --git a/yaml-cpp/test/old-api/parsertests.cpp b/external_libs/cpp/yaml-cpp/test/old-api/parsertests.cpp
similarity index 100%
rename from yaml-cpp/test/old-api/parsertests.cpp
rename to external_libs/cpp/yaml-cpp/test/old-api/parsertests.cpp
diff --git a/yaml-cpp/test/old-api/spectests.cpp b/external_libs/cpp/yaml-cpp/test/old-api/spectests.cpp
similarity index 100%
rename from yaml-cpp/test/old-api/spectests.cpp
rename to external_libs/cpp/yaml-cpp/test/old-api/spectests.cpp
diff --git a/yaml-cpp/test/parsertests.h b/external_libs/cpp/yaml-cpp/test/parsertests.h
similarity index 100%
rename from yaml-cpp/test/parsertests.h
rename to external_libs/cpp/yaml-cpp/test/parsertests.h
diff --git a/yaml-cpp/test/specexamples.h b/external_libs/cpp/yaml-cpp/test/specexamples.h
similarity index 100%
rename from yaml-cpp/test/specexamples.h
rename to external_libs/cpp/yaml-cpp/test/specexamples.h
diff --git a/yaml-cpp/test/spectests.cpp b/external_libs/cpp/yaml-cpp/test/spectests.cpp
similarity index 100%
rename from yaml-cpp/test/spectests.cpp
rename to external_libs/cpp/yaml-cpp/test/spectests.cpp
diff --git a/yaml-cpp/test/spectests.h b/external_libs/cpp/yaml-cpp/test/spectests.h
similarity index 100%
rename from yaml-cpp/test/spectests.h
rename to external_libs/cpp/yaml-cpp/test/spectests.h
diff --git a/yaml-cpp/test/tests.cpp b/external_libs/cpp/yaml-cpp/test/tests.cpp
similarity index 100%
rename from yaml-cpp/test/tests.cpp
rename to external_libs/cpp/yaml-cpp/test/tests.cpp
diff --git a/yaml-cpp/test/tests.h b/external_libs/cpp/yaml-cpp/test/tests.h
similarity index 100%
rename from yaml-cpp/test/tests.h
rename to external_libs/cpp/yaml-cpp/test/tests.h
diff --git a/yaml-cpp/util/CMakeLists.txt b/external_libs/cpp/yaml-cpp/util/CMakeLists.txt
similarity index 100%
rename from yaml-cpp/util/CMakeLists.txt
rename to external_libs/cpp/yaml-cpp/util/CMakeLists.txt
diff --git a/yaml-cpp/util/api.cpp b/external_libs/cpp/yaml-cpp/util/api.cpp
similarity index 100%
rename from yaml-cpp/util/api.cpp
rename to external_libs/cpp/yaml-cpp/util/api.cpp
diff --git a/yaml-cpp/util/parse.cpp b/external_libs/cpp/yaml-cpp/util/parse.cpp
similarity index 100%
rename from yaml-cpp/util/parse.cpp
rename to external_libs/cpp/yaml-cpp/util/parse.cpp
diff --git a/yaml-cpp/yaml-cpp.pc.cmake b/external_libs/cpp/yaml-cpp/yaml-cpp.pc.cmake
similarity index 100%
rename from yaml-cpp/yaml-cpp.pc.cmake
rename to external_libs/cpp/yaml-cpp/yaml-cpp.pc.cmake
diff --git a/src/zmq/include/zmq.h b/external_libs/cpp/zmq/include/zmq.h
similarity index 100%
rename from src/zmq/include/zmq.h
rename to external_libs/cpp/zmq/include/zmq.h
diff --git a/src/zmq/include/zmq_utils.h b/external_libs/cpp/zmq/include/zmq_utils.h
similarity index 100%
rename from src/zmq/include/zmq_utils.h
rename to external_libs/cpp/zmq/include/zmq_utils.h
diff --git a/src/zmq/libzmq.a b/external_libs/cpp/zmq/libzmq.a
similarity index 100%
rename from src/zmq/libzmq.a
rename to external_libs/cpp/zmq/libzmq.a
diff --git a/src/zmq/libzmq.la b/external_libs/cpp/zmq/libzmq.la
similarity index 100%
rename from src/zmq/libzmq.la
rename to external_libs/cpp/zmq/libzmq.la
diff --git a/src/zmq/libzmq.lai b/external_libs/cpp/zmq/libzmq.lai
similarity index 100%
rename from src/zmq/libzmq.lai
rename to external_libs/cpp/zmq/libzmq.lai
diff --git a/src/zmq/libzmq.so b/external_libs/cpp/zmq/libzmq.so
similarity index 100%
rename from src/zmq/libzmq.so
rename to external_libs/cpp/zmq/libzmq.so
diff --git a/scripts/libzmq.so.3 b/external_libs/cpp/zmq/libzmq.so.3
similarity index 100%
rename from scripts/libzmq.so.3
rename to external_libs/cpp/zmq/libzmq.so.3
diff --git a/scripts/libzmq.so.3.1.0 b/external_libs/cpp/zmq/libzmq.so.3.1.0
similarity index 100%
rename from scripts/libzmq.so.3.1.0
rename to external_libs/cpp/zmq/libzmq.so.3.1.0
diff --git a/external_libs/python/zmq/backend/cython/_device.so b/external_libs/python/zmq/backend/cython/_device.so
new file mode 100644
index 00000000..5957f8e0
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/_device.so differ
diff --git a/external_libs/python/zmq/backend/cython/_poll.so b/external_libs/python/zmq/backend/cython/_poll.so
new file mode 100644
index 00000000..d93d0f10
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/_poll.so differ
diff --git a/external_libs/python/zmq/backend/cython/_version.so b/external_libs/python/zmq/backend/cython/_version.so
new file mode 100644
index 00000000..40dd3dc8
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/_version.so differ
diff --git a/external_libs/python/zmq/backend/cython/constants.so b/external_libs/python/zmq/backend/cython/constants.so
new file mode 100644
index 00000000..cf44c07e
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/constants.so differ
diff --git a/external_libs/python/zmq/backend/cython/context.so b/external_libs/python/zmq/backend/cython/context.so
new file mode 100644
index 00000000..ef9b9699
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/context.so differ
diff --git a/external_libs/python/zmq/backend/cython/error.so b/external_libs/python/zmq/backend/cython/error.so
new file mode 100644
index 00000000..360da9dd
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/error.so differ
diff --git a/external_libs/python/zmq/backend/cython/message.so b/external_libs/python/zmq/backend/cython/message.so
new file mode 100644
index 00000000..f674489f
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/message.so differ
diff --git a/external_libs/python/zmq/backend/cython/socket.so b/external_libs/python/zmq/backend/cython/socket.so
new file mode 100644
index 00000000..1c927042
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/socket.so differ
diff --git a/external_libs/python/zmq/backend/cython/utils.so b/external_libs/python/zmq/backend/cython/utils.so
new file mode 100644
index 00000000..b4e5b283
Binary files /dev/null and b/external_libs/python/zmq/backend/cython/utils.so differ
diff --git a/external_libs/python/zmq/devices/monitoredqueue.so b/external_libs/python/zmq/devices/monitoredqueue.so
new file mode 100644
index 00000000..edca8a4b
Binary files /dev/null and b/external_libs/python/zmq/devices/monitoredqueue.so differ
diff --git a/src/zmq/libzmq.so.3 b/external_libs/python/zmq/libzmq.so
old mode 100755
new mode 100644
similarity index 100%
rename from src/zmq/libzmq.so.3
rename to external_libs/python/zmq/libzmq.so
diff --git a/linux/ws_main.py b/linux/ws_main.py
index 6a8967bf..f30a7be3 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/json',
+json_src = SrcGroup(dir='external_libs/cpp/json',
                     src_list=[
                         'jsoncpp.cpp'
                         ])
@@ -170,7 +170,7 @@ rpc_server_mock = SrcGroups([cmn_src,
                              json_src
                              ])
 
-yaml_src = SrcGroup(dir='yaml-cpp/src/',
+yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/',
         src_list=[
             'aliasmanager.cpp',
             'binary.cpp',
@@ -221,11 +221,11 @@ cxxflags_base =['-DWIN_UCODE_SIM',
 
 
 includes_path =''' ../src/pal/linux/
-                   ../src/zmq/include/
                    ../src/
                    ../src/rpc-server/include
-                   ../external_libs/json/
-                   ../yaml-cpp/include/
+                   ../external_libs/cpp/json/
+                   ../external_libs/cpp/zmq/include/
+                   ../external_libs/cpp/yaml-cpp/include/
               ''';
 
 
@@ -349,15 +349,15 @@ build_types = [
                build_option(name = "bp-sim", src = bp, debug_mode= DEBUG_, platform = PLATFORM_32, is_pie = False),
                build_option(name = "bp-sim", src = bp, debug_mode= DEBUG_, platform = PLATFORM_64, is_pie = False),
                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 = "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),
               ]
 
 
 
 def build_prog (bld, build_obj):
-    zmq_lib_path='src/zmq/'
+    zmq_lib_path='external_libs/cpp/zmq/'
     bld.read_shlib( name='zmq' , paths=[top + zmq_lib_path] )
 
     bld.program(features='cxx cxxprogram', 
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index 997c80fb..817950f3 100755
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -131,7 +131,7 @@ net_src = SrcGroup(dir='src/common/Network/Packet',
            'VLANHeader.cpp']);
 
 # JSON package
-json_src = SrcGroup(dir='external_libs/json',
+json_src = SrcGroup(dir='external_libs/cpp/json',
         src_list=[
             'jsoncpp.cpp'
            ])
@@ -149,12 +149,12 @@ rpc_server_src = SrcGroup(dir='src/rpc-server/src',
                           ])
 
 # JSON package
-json_src = SrcGroup(dir='external_libs/json',
+json_src = SrcGroup(dir='external_libs/cpp/json',
                     src_list=[
                         'jsoncpp.cpp'
                         ])
 
-yaml_src = SrcGroup(dir='yaml-cpp/src/',
+yaml_src = SrcGroup(dir='external_libs/cpp/yaml-cpp/src/',
         src_list=[
             'aliasmanager.cpp',
             'binary.cpp',
@@ -398,10 +398,13 @@ common_flags_old = common_flags + [
 
 includes_path =''' ../src/pal/linux_dpdk/
                    ../src/
-                   ../external_libs/json/
+                   
                    ../src/rpc-server/include
-                   ../yaml-cpp/include/
-                   ../src/zmq/include/
+
+                   ../external_libs/cpp/yaml-cpp/include/
+                   ../external_libs/cpp/zmq/include/
+                   ../external_libs/cpp/json/
+
                         ../src/dpdk_lib18/librte_eal/linuxapp/eal/include/
                         ../src/dpdk_lib18/librte_eal/common/include/
                         ../src/dpdk_lib18/librte_eal/common/
@@ -590,7 +593,7 @@ build_types = [
 
 def build_prog (bld, build_obj):
 
-    zmq_lib_path='src/zmq/'
+    zmq_lib_path='external_libs/cpp/zmq/'
     bld.read_shlib( name='zmq' , paths=[top+zmq_lib_path] )
 
     #rte_libs =[
diff --git a/scripts/trex-console b/scripts/trex-console
index 50e097e7..6eab77dd 100755
--- a/scripts/trex-console
+++ b/scripts/trex-console
@@ -1,2 +1,2 @@
 #!/bin/bash
-../src/console/trex_console.py $@
+../scripts/automation/trex_control_plane/console/trex_console.py $@
diff --git a/src/zmq/libzmq.so.3.1.0 b/src/zmq/libzmq.so.3.1.0
deleted file mode 100755
index 16980c27..00000000
Binary files a/src/zmq/libzmq.so.3.1.0 and /dev/null differ