From 4f961d4852fe2ffd550a1d8cbf3efc70f8ea2eb1 Mon Sep 17 00:00:00 2001 From: "aa7133@att.com" Date: Mon, 20 Jan 2020 18:55:15 +0200 Subject: [PATCH] remove pistache from build Change-Id: I5ec1d5449c6a8d1fbc205b51f1fcb2e1c3798b13 Signed-off-by: aa7133@att.com --- RIC-E2-TERMINATION/Dockerfile | 6 ++++-- RIC-E2-TERMINATION/TEST/e2test.h | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index f24328f..c218c86 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -47,14 +47,16 @@ RUN apt-get install -y autoconf gawk libtool automake pkg-config autoconf-archiv && cd cxxopts && mkdir build && cd build && cmake .. && make install && ldconfig \ && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/Tencent/rapidjson.git \ && cd rapidjson && mkdir build && cd build && cmake .. && make install && ldconfig \ - && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/oktal/pistache.git\ - && cd pistache && git submodule update --init && mkdir build && cd build && cmake .. && make install && ldconfig\ && cd /opt/e2/RIC-E2-TERMINATION/3rdparty \ && wget --content-disposition https://github.com/cgreen-devs/cgreen/releases/download/1.2.0/cgreen_1.2.0_amd64.deb \ && dpkg -i cgreen_1.2.0_amd64.deb \ && cd /opt/e2/ && git clone https://github.com/bilke/cmake-modules.git \ && cd /opt/e2/ && /usr/local/bin/cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE . && make +# && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/oktal/pistache.git\ +# && cd pistache && git submodule update --init && mkdir build && cd build && cmake .. && make install && ldconfig\ + + RUN if [$BUILD_TYPE == "Debug"] ; then make e2_coverage ; fi # && git clone http://gerrit.o-ran-sc.org/r/ric-plt/tracelibcpp \ diff --git a/RIC-E2-TERMINATION/TEST/e2test.h b/RIC-E2-TERMINATION/TEST/e2test.h index 527bfab..09918c2 100644 --- a/RIC-E2-TERMINATION/TEST/e2test.h +++ b/RIC-E2-TERMINATION/TEST/e2test.h @@ -29,21 +29,21 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include - - -using namespace Pistache; +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include +// +// +//using namespace Pistache; class e2test { - Rest::Router router; +// Rest::Router router; }; -- 2.16.6