Merge "Tizen Directory Migration" into devel/master

diff --git a/automated-tests/.gitignore-with-autogenerated-files b/automated-tests/.gitignore-with-autogenerated-files
index f039d8a..39d9377 100644 (file)
--- a/automated-tests/.gitignore-with-autogenerated-files
+++ b/automated-tests/.gitignore-with-autogenerated-files
@@ -2,3 +2,4 @@
 build
 build.log
 tct*core.h
+results_xml.*

diff --git a/automated-tests/.gitignore-without-autogenerated-files b/automated-tests/.gitignore-without-autogenerated-files
index 8f3f9e2..7c7f30b 100644 (file)
--- a/automated-tests/.gitignore-without-autogenerated-files
+++ b/automated-tests/.gitignore-without-autogenerated-files
@@ -1,3 +1,4 @@
 *.xml
 build
 build.log
+results_xml.*

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index 155c3f4..9a0d6b1 100644 (file)
--- a/dali/public-api/dali-core-version.cpp
+++ b/dali/public-api/dali-core-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int CORE_MAJOR_VERSION = 1;
 const unsigned int CORE_MINOR_VERSION = 1;
-const unsigned int CORE_MICRO_VERSION = 43;
+const unsigned int CORE_MICRO_VERSION = 44;
 const char * const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifndef EMSCRIPTEN

diff --git a/doc/dali-core-doc.h b/doc/dali-core-doc.h
index 3c47b3a..561c847 100644 (file)
--- a/doc/dali-core-doc.h
+++ b/doc/dali-core-doc.h
@@ -72,6 +72,22 @@
  * </tr>
  * </table>
  *
+ * \ifnot show_tizen_feature
+ *
+ * @section dali_toolkit_feature Related Features
+ * This API is related with the following features:\n
+ *    - http://tizen.org/feature/opengles.version.2_0\n
+ *
+ * It is recommended to design feature related codes in your application for reliability.\n
+ *
+ * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.\n
+ *
+ * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
+ *
+ * More details on featuring your application can be found from <a href="https://developer.tizen.org/development/tools/native-tools/manifest-text-editor#feature"><b>Feature Element</b>.</a>
+ *
+ * \endif
+ *
  * @ingroup dali
  * @{
  *   @defgroup dali_core_actors Actors

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 8803552..9f3c21c 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali
 Summary:    The OpenGLES Canvas Core Library
-Version:    1.1.43
+Version:    1.1.44
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT
@@ -73,6 +73,11 @@ LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -lgcc_s -lg
 CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon"
 %endif
 
+%if 0%{?enable_coverage}
+CXXFLAGS+=" --coverage "
+LDFLAGS+=" --coverage "
+%endif
+
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
 autoreconf --install