From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Fri, 25 Nov 2016 11:00:32 +0000 (-0800)
Subject: Merge "Change Internal::Control destructor to protected" into devel/master
X-Git-Tag: dali_1.2.17~12
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=109f31842f47b24e609e6cc6d16f349d6d287f99;hp=c8c89602dd8734c4fba423047b6a07c7c005b423

Merge "Change Internal::Control destructor to protected" into devel/master
---

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index bd25c80..afe20fb 100644
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 2;
-const unsigned int TOOLKIT_MICRO_VERSION = 15;
+const unsigned int TOOLKIT_MICRO_VERSION = 16;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec
index 11112dc..b71be93 100644
--- a/packaging/dali-addon.spec
+++ b/packaging/dali-addon.spec
@@ -1,6 +1,6 @@
 Name:       dali-addon
 Summary:    DALi module for Node.JS
-Version:    1.2.15
+Version:    1.2.16
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0
diff --git a/packaging/dali-csharp-wrapper.spec b/packaging/dali-csharp-wrapper.spec
index 35c4e7e..0d60ade 100755
--- a/packaging/dali-csharp-wrapper.spec
+++ b/packaging/dali-csharp-wrapper.spec
@@ -1,6 +1,6 @@
 Name:       NDalic
 Summary:    dali wrapper
-Version:    1.2.15
+Version:    1.2.16
 Release:    1
 Group:      uifw/graphic
 License:    TO_BE_FILLED_IN
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 7af9db3..c1f791e 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.2.15
+Version:    1.2.16
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT
diff --git a/plugins/dali-swig/Makefile.am b/plugins/dali-swig/Makefile.am
index 6b6966a..6e70d46 100644
--- a/plugins/dali-swig/Makefile.am
+++ b/plugins/dali-swig/Makefile.am
@@ -64,6 +64,7 @@ endif
 # then call our property-wrapper to inject DALi property getters / setters
 $(BUILT_SOURCES): SWIG/*.i
 	rm -f automatic/csharp/*.cs
+	mkdir -p automatic/csharp
 	$(SWIG) -csharp -c++ -outdir automatic/csharp \
             $(DALI_CFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) -namespace Dali -o automatic/cpp/dali_wrap.cpp SWIG/dali.i
 	./property-wrapper.rb