From f634afc36cbe7bf7f0a49a4327af1b0530ae3265 Mon Sep 17 00:00:00 2001 From: Constance Caramanolis Date: Tue, 1 Nov 2016 17:53:16 -0700 Subject: [PATCH 1/4] initial commit --- ci/build_container/build_container.sh | 5 ++++- ci/do_ci.sh | 1 + thirdparty.cmake | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 2fc5c08906b2..75eee8e6a35c 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -131,4 +131,7 @@ wget -O gcovr-3.3.tar.gz https://github.com/gcovr/gcovr/archive/3.3.tar.gz tar xf gcovr-3.3.tar.gz rm gcovr-3.3.tar.gz - +# rapidjson +wget -O rapidjson-1.1.0.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz +tar xf rapidjson-1.1.0.tar.gz +rm rapidjson-1.1.0.tar.gz \ No newline at end of file diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 966059315c9c..48f580c05434 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -45,6 +45,7 @@ $EXTRA_CMAKE_FLAGS -DENVOY_DEBUG:BOOL=OFF \ -DENVOY_PROTOBUF_INCLUDE_DIR:FILEPATH=/thirdparty_build/include \ -DENVOY_PROTOBUF_PROTOC:FILEPATH=/thirdparty_build/bin/protoc \ -DENVOY_GCOVR:FILEPATH=/thirdparty/gcovr-3.3/scripts/gcovr \ +-DENVOY_RAPIDJSON_INCLUDE_DIR:FILEPATH=/thirdparth/rapidjson-1.1.0/include/rapidjson \ -DENVOY_GCOVR_EXTRA_ARGS:STRING="-e test/* -e build/*" \ -DENVOY_EXE_EXTRA_LINKER_FLAGS:STRING=-L/thirdparty_build/lib \ -DENVOY_TEST_EXTRA_LINKER_FLAGS:STRING=-L/thirdparty_build/lib \ diff --git a/thirdparty.cmake b/thirdparty.cmake index ac69eb372c31..09fc8af97cc3 100644 --- a/thirdparty.cmake +++ b/thirdparty.cmake @@ -66,3 +66,7 @@ set(ENVOY_GCOVR_EXTRA_ARGS "" CACHE STRING "extra arguments to pass to gcovr") # Extra linker flags required to properly link envoy-test with all of the above libraries. set(ENVOY_TEST_EXTRA_LINKER_FLAGS "" CACHE STRING "envoy-test extra linker flags") + +# https://github.com/miloyip/rapidjson +# Last tested with 1.1.0 +set(ENVOY_RAPIDJSON_INCLUDE_DIR "" CACHE FILEPATH "location of rapidjson includes") From d7835d637a2eb79ff373e19d8ec6221badd3c6a2 Mon Sep 17 00:00:00 2001 From: Constance Caramanolis Date: Wed, 2 Nov 2016 13:45:12 -0700 Subject: [PATCH 2/4] ordering --- ci/build_container/build_container.sh | 9 +++++---- thirdparty.cmake | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ci/build_container/build_container.sh b/ci/build_container/build_container.sh index 75eee8e6a35c..fa05336e96b1 100755 --- a/ci/build_container/build_container.sh +++ b/ci/build_container/build_container.sh @@ -117,6 +117,11 @@ make install rm -rf lightstep-tracer-cpp-0.16 cd .. +# rapidjson +wget -O rapidjson-1.1.0.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz +tar xf rapidjson-1.1.0.tar.gz +rm rapidjson-1.1.0.tar.gz + # googletest wget -O googletest-1.8.0.tar.gz https://github.com/google/googletest/archive/release-1.8.0.tar.gz tar xf googletest-1.8.0.tar.gz @@ -131,7 +136,3 @@ wget -O gcovr-3.3.tar.gz https://github.com/gcovr/gcovr/archive/3.3.tar.gz tar xf gcovr-3.3.tar.gz rm gcovr-3.3.tar.gz -# rapidjson -wget -O rapidjson-1.1.0.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz -tar xf rapidjson-1.1.0.tar.gz -rm rapidjson-1.1.0.tar.gz \ No newline at end of file diff --git a/thirdparty.cmake b/thirdparty.cmake index 09fc8af97cc3..a946afaa7133 100644 --- a/thirdparty.cmake +++ b/thirdparty.cmake @@ -50,6 +50,10 @@ set(ENVOY_LIGHTSTEP_TRACER_INCLUDE_DIR "" CACHE FILEPATH "location of lighstep t # Extra linker flags required to properly link envoy with all of the above libraries. set(ENVOY_EXE_EXTRA_LINKER_FLAGS "" CACHE STRING "envoy extra linker flags") +# https://github.com/miloyip/rapidjson +# Last tested with 1.1.0 +set(ENVOY_RAPIDJSON_INCLUDE_DIR "" CACHE FILEPATH "location of rapidjson includes") + # # Test Requirements # @@ -66,7 +70,3 @@ set(ENVOY_GCOVR_EXTRA_ARGS "" CACHE STRING "extra arguments to pass to gcovr") # Extra linker flags required to properly link envoy-test with all of the above libraries. set(ENVOY_TEST_EXTRA_LINKER_FLAGS "" CACHE STRING "envoy-test extra linker flags") - -# https://github.com/miloyip/rapidjson -# Last tested with 1.1.0 -set(ENVOY_RAPIDJSON_INCLUDE_DIR "" CACHE FILEPATH "location of rapidjson includes") From be08ca88c25fe9c5b1cd61234bf0d1fa6164c8b7 Mon Sep 17 00:00:00 2001 From: Constance Caramanolis Date: Wed, 2 Nov 2016 15:32:00 -0700 Subject: [PATCH 3/4] fix typo --- ci/do_ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/do_ci.sh b/ci/do_ci.sh index 48f580c05434..d68294ce037e 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -45,7 +45,7 @@ $EXTRA_CMAKE_FLAGS -DENVOY_DEBUG:BOOL=OFF \ -DENVOY_PROTOBUF_INCLUDE_DIR:FILEPATH=/thirdparty_build/include \ -DENVOY_PROTOBUF_PROTOC:FILEPATH=/thirdparty_build/bin/protoc \ -DENVOY_GCOVR:FILEPATH=/thirdparty/gcovr-3.3/scripts/gcovr \ --DENVOY_RAPIDJSON_INCLUDE_DIR:FILEPATH=/thirdparth/rapidjson-1.1.0/include/rapidjson \ +-DENVOY_RAPIDJSON_INCLUDE_DIR:FILEPATH=/thirdparty/rapidjson-1.1.0/include \ -DENVOY_GCOVR_EXTRA_ARGS:STRING="-e test/* -e build/*" \ -DENVOY_EXE_EXTRA_LINKER_FLAGS:STRING=-L/thirdparty_build/lib \ -DENVOY_TEST_EXTRA_LINKER_FLAGS:STRING=-L/thirdparty_build/lib \ From eeca6a152266825ffcc43f6eda5f78ee0808641b Mon Sep 17 00:00:00 2001 From: Constance Caramanolis Date: Wed, 2 Nov 2016 16:04:53 -0700 Subject: [PATCH 4/4] spacing --- thirdparty.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thirdparty.cmake b/thirdparty.cmake index a946afaa7133..a7570e27111c 100644 --- a/thirdparty.cmake +++ b/thirdparty.cmake @@ -47,13 +47,13 @@ set(ENVOY_PROTOBUF_PROTOC "" CACHE FILEPATH "location of protoc") # Last tested with lightstep-tracer-cpp-0.16 set(ENVOY_LIGHTSTEP_TRACER_INCLUDE_DIR "" CACHE FILEPATH "location of lighstep tracer includes") -# Extra linker flags required to properly link envoy with all of the above libraries. -set(ENVOY_EXE_EXTRA_LINKER_FLAGS "" CACHE STRING "envoy extra linker flags") - # https://github.com/miloyip/rapidjson # Last tested with 1.1.0 set(ENVOY_RAPIDJSON_INCLUDE_DIR "" CACHE FILEPATH "location of rapidjson includes") +# Extra linker flags required to properly link envoy with all of the above libraries. +set(ENVOY_EXE_EXTRA_LINKER_FLAGS "" CACHE STRING "envoy extra linker flags") + # # Test Requirements #