Revert "[3.0] Put third party source files in separate folder & exclude from coverage"

This reverts commit 49cdc30dfb534bc407b8ca7c050c0b7dd7249447.

Change-Id: Id2d8aa68087ea3faf13c48a10e6fd46a8a792688

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 7513141..9c8a903 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 
-#include <dali-toolkit/third-party/facebook-flexbox/layout.h>
+#include <dali-toolkit/internal/controls/flex-container/layout.h>
 
 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 18faf8d..e116401 100644 (file)
--- 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/*" "*/dali-toolkit/third-party/*" -o dali.info
+       @cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "/usr/include/*" "*/dali-env/*" -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 7383ebe..2cc6de7 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -16,12 +16,11 @@
 
 # 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
-third_party_src_dir = ../../../dali-toolkit/third-party
+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_styles_dir = $(STYLE_DIR)
 toolkit_style_images_dir = $(STYLE_DIR)/images
@@ -32,7 +31,6 @@ 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
@@ -58,8 +56,7 @@ lib_LTLIBRARIES = libdali-toolkit.la
 libdali_toolkit_la_SOURCES = \
                      $(toolkit_src_files) \
                      $(public_api_src_files) \
-                     $(devel_api_src_files) \
-                     $(third_party_src_files)
+                     $(devel_api_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 f89c1f4..2005f9c 100644 (file)
--- 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 <dali-toolkit/public-api/controls/flex-container/flex-container.h>
 extern "C"
 {
-#include <dali-toolkit/third-party/facebook-flexbox/layout.h>
+#include "layout.h"
 }
 
 namespace Dali

diff --git a/dali-toolkit/third-party/facebook-flexbox/layout.c b/dali-toolkit/internal/controls/flex-container/layout.c
similarity index 100%
rename from dali-toolkit/third-party/facebook-flexbox/layout.c
rename to dali-toolkit/internal/controls/flex-container/layout.c

diff --git a/dali-toolkit/third-party/facebook-flexbox/layout.h b/dali-toolkit/internal/controls/flex-container/layout.h
similarity index 100%
rename from dali-toolkit/third-party/facebook-flexbox/layout.h
rename to dali-toolkit/internal/controls/flex-container/layout.h

diff --git a/dali-toolkit/third-party/nanosvg/nanosvg.cc b/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.cc
similarity index 100%
rename from dali-toolkit/third-party/nanosvg/nanosvg.cc
rename to dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.cc

diff --git a/dali-toolkit/third-party/nanosvg/nanosvg.h b/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.h
similarity index 100%
rename from dali-toolkit/third-party/nanosvg/nanosvg.h
rename to dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvg.h

diff --git a/dali-toolkit/third-party/nanosvg/nanosvgrast.cc b/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.cc
similarity index 100%
rename from dali-toolkit/third-party/nanosvg/nanosvgrast.cc
rename to dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.cc

diff --git a/dali-toolkit/third-party/nanosvg/nanosvgrast.h b/dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.h
similarity index 100%
rename from dali-toolkit/third-party/nanosvg/nanosvgrast.h
rename to dali-toolkit/internal/controls/renderers/svg/nanosvg/nanosvgrast.h

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 9e2e707..a2c1ad7 100644 (file)
--- 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 <dali-toolkit/third-party/nanosvg/nanosvgrast.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-renderer.h>
+#include "nanosvg/nanosvgrast.h"
+#include "svg-renderer.h"
 
 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 8fbf70a..ce3dbc0 100644 (file)
--- 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 <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h>
+#include "nanosvg/nanosvg.h"
+#include "svg-rasterize-thread.h"
 #include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-string-constants.h>

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index e5d0dc1..f9edbdd 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -25,6 +25,8 @@ 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 \
@@ -36,6 +38,7 @@ 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/third-party/file.list b/dali-toolkit/third-party/file.list
deleted file mode 100644 (file)
index 53e027f..0000000
--- a/dali-toolkit/third-party/file.list
+++ /dev/null
@@ -1,4 +0,0 @@
-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