From c97f82fcfa9085f4144863e28909476e611bc0d8 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 22 Jun 2016 12:36:31 +0100 Subject: [PATCH] Put third party source files in separate folder & exclude from coverage Change-Id: Iaa1333b06aaf596d47b901b28cafd4f19ab1613b --- .../facebook-flexbox/layout-test-utils.h | 2 +- build/tizen/Makefile.am | 2 +- build/tizen/dali-toolkit/Makefile.am | 15 +++++++++------ .../controls/flex-container/flex-container-impl.h | 2 +- .../controls/renderers/svg/svg-rasterize-thread.cpp | 4 ++-- .../internal/controls/renderers/svg/svg-renderer.cpp | 4 ++-- dali-toolkit/internal/file.list | 3 --- .../facebook-flexbox}/layout.c | 0 .../facebook-flexbox}/layout.h | 0 dali-toolkit/third-party/file.list | 4 ++++ .../renderers/svg => third-party}/nanosvg/nanosvg.cc | 0 .../renderers/svg => third-party}/nanosvg/nanosvg.h | 0 .../renderers/svg => third-party}/nanosvg/nanosvgrast.cc | 0 .../renderers/svg => third-party}/nanosvg/nanosvgrast.h | 0 14 files changed, 20 insertions(+), 16 deletions(-) rename dali-toolkit/{internal/controls/flex-container => third-party/facebook-flexbox}/layout.c (100%) rename dali-toolkit/{internal/controls/flex-container => third-party/facebook-flexbox}/layout.h (100%) create mode 100644 dali-toolkit/third-party/file.list rename dali-toolkit/{internal/controls/renderers/svg => third-party}/nanosvg/nanosvg.cc (100%) rename dali-toolkit/{internal/controls/renderers/svg => third-party}/nanosvg/nanosvg.h (100%) rename dali-toolkit/{internal/controls/renderers/svg => third-party}/nanosvg/nanosvgrast.cc (100%) rename dali-toolkit/{internal/controls/renderers/svg => third-party}/nanosvg/nanosvgrast.h (100%) diff --git a/automated-tests/src/dali-toolkit-third-party/facebook-flexbox/layout-test-utils.h b/automated-tests/src/dali-toolkit-third-party/facebook-flexbox/layout-test-utils.h index 9c8a903..7513141 100644 --- a/automated-tests/src/dali-toolkit-third-party/facebook-flexbox/layout-test-utils.h +++ b/automated-tests/src/dali-toolkit-third-party/facebook-flexbox/layout-test-utils.h @@ -10,7 +10,7 @@ #include #include -#include +#include void test(const char *name, css_node_t *style, css_node_t *expected_layout); bool tests_finished(void); diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am index e116401..18faf8d 100644 --- a/build/tizen/Makefile.am +++ b/build/tizen/Makefile.am @@ -55,7 +55,7 @@ cov_data: @for i in `find $(COVERAGE_DIR) -name "libdali_toolkit_la-*.gcda" -o -name "libdali_toolkit_la-*.gcno"` ;\ do mv $$i `echo $$i | sed s/libdali_toolkit_la-//` ; echo $$i ; done @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --base-directory . --directory . -c -o dali.info - @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "/usr/include/*" "*/dali-env/*" -o dali.info + @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "/usr/include/*" "*/dali-env/*" "*/dali-toolkit/third-party/*" -o dali.info @test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR) coverage: cov_data diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 2cc6de7..7383ebe 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -16,11 +16,12 @@ # Build the Dali Toolkit library -toolkit_images_dir = ../../../dali-toolkit/styles/images-common -toolkit_sounds_dir = ../../../dali-toolkit/sounds -toolkit_src_dir = ../../../dali-toolkit/internal -public_api_src_dir = ../../../dali-toolkit/public-api -devel_api_src_dir = ../../../dali-toolkit/devel-api +toolkit_images_dir = ../../../dali-toolkit/styles/images-common +toolkit_sounds_dir = ../../../dali-toolkit/sounds +toolkit_src_dir = ../../../dali-toolkit/internal +public_api_src_dir = ../../../dali-toolkit/public-api +devel_api_src_dir = ../../../dali-toolkit/devel-api +third_party_src_dir = ../../../dali-toolkit/third-party toolkit_styles_dir = $(STYLE_DIR) toolkit_style_images_dir = $(STYLE_DIR)/images @@ -31,6 +32,7 @@ include ../../../dali-toolkit/styles/images-common/file.list include ../../../dali-toolkit/internal/file.list include ../../../dali-toolkit/public-api/file.list include ../../../dali-toolkit/devel-api/file.list +include ../../../dali-toolkit/third-party/file.list vector_based_text_src_dir = ../../../dali-toolkit/internal/text/rendering/vector-based include ../../../dali-toolkit/internal/text/rendering/vector-based/file.list @@ -56,7 +58,8 @@ lib_LTLIBRARIES = libdali-toolkit.la libdali_toolkit_la_SOURCES = \ $(toolkit_src_files) \ $(public_api_src_files) \ - $(devel_api_src_files) + $(devel_api_src_files) \ + $(third_party_src_files) dalistyledir = ${dataReadOnlyDir}/toolkit/styles/ dalistyle_DATA = ${dali_toolkit_style_files} diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h index 2005f9c..f89c1f4 100644 --- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h +++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h @@ -26,7 +26,7 @@ #include extern "C" { -#include "layout.h" +#include } namespace Dali diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp index a2c1ad7..9e2e707 100644 --- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp +++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp @@ -19,8 +19,8 @@ #include "svg-rasterize-thread.h" // INTERNAL INCLUDES -#include "nanosvg/nanosvgrast.h" -#include "svg-renderer.h" +#include +#include namespace Dali { diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp index ce3dbc0..8fbf70a 100644 --- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp @@ -26,8 +26,8 @@ #include // INTERNAL INCLUDES -#include "nanosvg/nanosvg.h" -#include "svg-rasterize-thread.h" +#include +#include #include #include #include diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list index f9edbdd..e5d0dc1 100644 --- a/dali-toolkit/internal/file.list +++ b/dali-toolkit/internal/file.list @@ -25,8 +25,6 @@ toolkit_src_files = \ $(toolkit_src_dir)/controls/renderers/gradient/linear-gradient.cpp \ $(toolkit_src_dir)/controls/renderers/gradient/radial-gradient.cpp \ $(toolkit_src_dir)/controls/renderers/gradient/gradient-renderer.cpp \ - $(toolkit_src_dir)/controls/renderers/svg/nanosvg/nanosvg.cc \ - $(toolkit_src_dir)/controls/renderers/svg/nanosvg/nanosvgrast.cc \ $(toolkit_src_dir)/controls/renderers/svg/svg-rasterize-thread.cpp \ $(toolkit_src_dir)/controls/renderers/svg/svg-renderer.cpp \ $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \ @@ -38,7 +36,6 @@ toolkit_src_files = \ $(toolkit_src_dir)/controls/buttons/push-button-impl.cpp \ $(toolkit_src_dir)/controls/buttons/radio-button-impl.cpp \ $(toolkit_src_dir)/controls/effects-view/effects-view-impl.cpp \ - $(toolkit_src_dir)/controls/flex-container/layout.c \ $(toolkit_src_dir)/controls/flex-container/flex-container-impl.cpp \ $(toolkit_src_dir)/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp \ $(toolkit_src_dir)/controls/image-view/image-view-impl.cpp \ diff --git a/dali-toolkit/internal/controls/flex-container/layout.c b/dali-toolkit/third-party/facebook-flexbox/layout.c similarity index 100% rename from dali-toolkit/internal/controls/flex-container/layout.c rename to dali-toolkit/third-party/facebook-flexbox/layout.c diff --git a/dali-toolkit/internal/controls/flex-container/layout.h b/dali-toolkit/third-party/facebook-flexbox/layout.h similarity index 100% rename from dali-toolkit/internal/controls/flex-container/layout.h rename to dali-toolkit/third-party/facebook-flexbox/layout.h diff --git a/dali-toolkit/third-party/file.list b/dali-toolkit/third-party/file.list new file mode 100644 index 0000000..53e027f --- /dev/null +++ b/dali-toolkit/third-party/file.list @@ -0,0 +1,4 @@ +third_party_src_files = \ + $(third_party_src_dir)/nanosvg/nanosvg.cc \ + $(third_party_src_dir)/nanosvg/nanosvgrast.cc \ + $(third_party_src_dir)/facebook-flexbox/layout.c diff --git a/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.cc b/dali-toolkit/third-party/nanosvg/nanosvg.cc similarity index 100% rename from dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.cc rename to dali-toolkit/third-party/nanosvg/nanosvg.cc diff --git a/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.h b/dali-toolkit/third-party/nanosvg/nanosvg.h similarity index 100% rename from dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.h rename to dali-toolkit/third-party/nanosvg/nanosvg.h diff --git a/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.cc b/dali-toolkit/third-party/nanosvg/nanosvgrast.cc similarity index 100% rename from dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.cc rename to dali-toolkit/third-party/nanosvg/nanosvgrast.cc diff --git a/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.h b/dali-toolkit/third-party/nanosvg/nanosvgrast.h similarity index 100% rename from dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.h rename to dali-toolkit/third-party/nanosvg/nanosvgrast.h -- 2.7.4