Create devel-api folder for header files used by Adaptor/Toolkit

Moved the following from public-api to devel-api:
map-wrapper
set-wrapper
dynamics

Change-Id: If8d7c30fa48c893e1433bc4cf0585ccffe55cc83

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
index e1360c5..21c16c2 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
@@ -24,7 +24,7 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
 #include <dali/integration-api/platform-abstraction.h>
 
 #include "test-trace-call-stack.h"

diff --git a/automated-tests/src/dali/utc-Dali-DynamicsBody.cpp b/automated-tests/src/dali/utc-Dali-DynamicsBody.cpp
index 7dc259e..3c09a8d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-DynamicsBody.cpp
+++ b/automated-tests/src/dali/utc-Dali-DynamicsBody.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
 
 int UtcDaliDynamicsBodyConstructor(void)
 {

diff --git a/automated-tests/src/dali/utc-Dali-DynamicsBodyConfig.cpp b/automated-tests/src/dali/utc-Dali-DynamicsBodyConfig.cpp
index 0ab81f3..30ae434 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-DynamicsBodyConfig.cpp
+++ b/automated-tests/src/dali/utc-Dali-DynamicsBodyConfig.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
 
 using namespace Dali;
 

diff --git a/automated-tests/src/dali/utc-Dali-DynamicsJoint.cpp b/automated-tests/src/dali/utc-Dali-DynamicsJoint.cpp
index 1be8e8c..854fd87 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-DynamicsJoint.cpp
+++ b/automated-tests/src/dali/utc-Dali-DynamicsJoint.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
 
 using namespace Dali;
 

diff --git a/automated-tests/src/dali/utc-Dali-DynamicsShape.cpp b/automated-tests/src/dali/utc-Dali-DynamicsShape.cpp
index 57730ad..43f723d 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-DynamicsShape.cpp
+++ b/automated-tests/src/dali/utc-Dali-DynamicsShape.cpp
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
+#include <dali/devel-api/dynamics/dynamics.h>
 
 using namespace Dali;
 

diff --git a/automated-tests/src/dali/utc-Dali-DynamicsWorld.cpp b/automated-tests/src/dali/utc-Dali-DynamicsWorld.cpp
index 05ae43f..f567f9e 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-DynamicsWorld.cpp
+++ b/automated-tests/src/dali/utc-Dali-DynamicsWorld.cpp
@@ -20,6 +20,7 @@
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <test-dynamics.h>
+#include <dali/devel-api/dynamics/dynamics.h>
 
 using namespace Dali;
 

diff --git a/automated-tests/src/dali/utc-Dali-DynamicsWorldConfig.cpp b/automated-tests/src/dali/utc-Dali-DynamicsWorldConfig.cpp
index e8adfa4..372ed66 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-DynamicsWorldConfig.cpp
+++ b/automated-tests/src/dali/utc-Dali-DynamicsWorldConfig.cpp
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
-
+#include <dali/devel-api/dynamics/dynamics.h>
 
 using namespace Dali;
 

diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
index e4a72de..713cb99 100644 (file)
--- a/build/tizen/dali-core/Makefile.am
+++ b/build/tizen/dali-core/Makefile.am
@@ -25,6 +25,9 @@ include ../../../dali/internal/file.list
 public_api_src_dir = ../../../dali/public-api
 include ../../../dali/public-api/file.list
 
+devel_api_src_dir = ../../../dali/devel-api
+include ../../../dali/devel-api/file.list
+
 platform_abstraction_src_dir = ../../../dali/integration-api
 include ../../../dali/integration-api/file.list
 
@@ -33,7 +36,8 @@ include ../../../dali/integration-api/file.list
 src_files = $(internal_src_files) \
             $(effects_src_files) \
             $(platform_abstraction_src_files) \
-            $(public_api_src_files)
+            $(public_api_src_files) \
+            $(devel_api_src_files)
 
 if DYNAMICS_SUPPORT
 src_files += $(internal_dynamics_src_files)
@@ -78,11 +82,23 @@ platformabstraction_HEADERS = $(platform_abstraction_header_files)
 platformabstractionevents_HEADERS = $(platform_abstraction_events_header_files)
 platformabstractiondynamics_HEADERS = $(platform_abstraction_dynamics_header_files)
 
+#devel api (used by adaptor / toolkit
+develapidir = $(devincludepath)/dali/devel-api
+develapiactorsdir = $(develapidir)/actors
+develapicommondir = $(develapidir)/common
+develapidynamicsdir = $(develapidir)/dynamics
+
+develapi_HEADERS = $(devel_api_header_files)
+develapicommon_HEADERS = $(devel_api_core_common_header_files)
+develapidynamics_HEADERS = $(devel_api_core_dynamics_header_files)
+
+
+
+#public api
 publicapidir = $(devincludepath)/dali/public-api
 publicapiactorsdir = $(publicapidir)/actors
 publicapianimationdir = $(publicapidir)/animation
 publicapicommondir = $(publicapidir)/common
-publicapidynamicsdir = $(publicapidir)/dynamics
 publicapieventsdir = $(publicapidir)/events
 publicapigeometrydir = $(publicapidir)/geometry
 publicapiimagesdir = $(publicapidir)/images
@@ -100,7 +116,6 @@ publicapi_HEADERS = $(public_api_header_files)
 publicapiactors_HEADERS = $(public_api_core_actors_header_files)
 publicapianimation_HEADERS = $(public_api_core_animation_header_files)
 publicapicommon_HEADERS = $(public_api_core_common_header_files)
-publicapidynamics_HEADERS = $(public_api_core_dynamics_header_files)
 publicapievents_HEADERS = $(public_api_core_events_header_files)
 publicapigeometry_HEADERS = $(public_api_core_geometry_header_files)
 publicapiimages_HEADERS = $(public_api_core_images_header_files)

diff --git a/dali/public-api/common/map-wrapper.h b/dali/devel-api/common/map-wrapper.h
similarity index 100%
rename from dali/public-api/common/map-wrapper.h
rename to dali/devel-api/common/map-wrapper.h

diff --git a/dali/public-api/common/set-wrapper.h b/dali/devel-api/common/set-wrapper.h
similarity index 100%
rename from dali/public-api/common/set-wrapper.h
rename to dali/devel-api/common/set-wrapper.h

diff --git a/dali/public-api/dynamics/dynamics-body-config.cpp b/dali/devel-api/dynamics/dynamics-body-config.cpp
similarity index 99%
rename from dali/public-api/dynamics/dynamics-body-config.cpp
rename to dali/devel-api/dynamics/dynamics-body-config.cpp
index 04faaf2..6ce1b4b 100644 (file)
--- a/dali/public-api/dynamics/dynamics-body-config.cpp
+++ b/dali/devel-api/dynamics/dynamics-body-config.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
 
 // INTERNAL HEADERS
 #ifdef DYNAMICS_SUPPORT

diff --git a/dali/public-api/dynamics/dynamics-body-config.h b/dali/devel-api/dynamics/dynamics-body-config.h
similarity index 99%
rename from dali/public-api/dynamics/dynamics-body-config.h
rename to dali/devel-api/dynamics/dynamics-body-config.h
index 0c8e0ec..f77cc16 100644 (file)
--- a/dali/public-api/dynamics/dynamics-body-config.h
+++ b/dali/devel-api/dynamics/dynamics-body-config.h
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/dynamics/dynamics-body.cpp b/dali/devel-api/dynamics/dynamics-body.cpp
similarity index 98%
rename from dali/public-api/dynamics/dynamics-body.cpp
rename to dali/devel-api/dynamics/dynamics-body.cpp
index c19961f..98db1f6 100644 (file)
--- a/dali/public-api/dynamics/dynamics-body.cpp
+++ b/dali/devel-api/dynamics/dynamics-body.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-body.h>
+#include <dali/devel-api/dynamics/dynamics-body.h>
 
 // INTERNAL HEADERS
 #include <dali/internal/event/actors/actor-impl.h>

diff --git a/dali/public-api/dynamics/dynamics-body.h b/dali/devel-api/dynamics/dynamics-body.h
similarity index 100%
rename from dali/public-api/dynamics/dynamics-body.h
rename to dali/devel-api/dynamics/dynamics-body.h

diff --git a/dali/public-api/dynamics/dynamics-collision.cpp b/dali/devel-api/dynamics/dynamics-collision.cpp
similarity index 97%
rename from dali/public-api/dynamics/dynamics-collision.cpp
rename to dali/devel-api/dynamics/dynamics-collision.cpp
index 703e381..6e481ba 100644 (file)
--- a/dali/public-api/dynamics/dynamics-collision.cpp
+++ b/dali/devel-api/dynamics/dynamics-collision.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-collision.h>
+#include <dali/devel-api/dynamics/dynamics-collision.h>
 
 // INTERNAL HEADERS
 #include <dali/internal/event/actors/actor-impl.h>

diff --git a/dali/public-api/dynamics/dynamics-collision.h b/dali/devel-api/dynamics/dynamics-collision.h
similarity index 100%
rename from dali/public-api/dynamics/dynamics-collision.h
rename to dali/devel-api/dynamics/dynamics-collision.h

diff --git a/dali/public-api/dynamics/dynamics-joint.cpp b/dali/devel-api/dynamics/dynamics-joint.cpp
similarity index 98%
rename from dali/public-api/dynamics/dynamics-joint.cpp
rename to dali/devel-api/dynamics/dynamics-joint.cpp
index 7258b8c..7d36d3d 100644 (file)
--- a/dali/public-api/dynamics/dynamics-joint.cpp
+++ b/dali/devel-api/dynamics/dynamics-joint.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-joint.h>
+#include <dali/devel-api/dynamics/dynamics-joint.h>
 
 // INTERNAL HEADERS
 #include <dali/internal/event/actors/actor-impl.h>

diff --git a/dali/public-api/dynamics/dynamics-joint.h b/dali/devel-api/dynamics/dynamics-joint.h
similarity index 100%
rename from dali/public-api/dynamics/dynamics-joint.h
rename to dali/devel-api/dynamics/dynamics-joint.h

diff --git a/dali/public-api/dynamics/dynamics-shape.cpp b/dali/devel-api/dynamics/dynamics-shape.cpp
similarity index 98%
rename from dali/public-api/dynamics/dynamics-shape.cpp
rename to dali/devel-api/dynamics/dynamics-shape.cpp
index 792d83a..6c41f04 100644 (file)
--- a/dali/public-api/dynamics/dynamics-shape.cpp
+++ b/dali/devel-api/dynamics/dynamics-shape.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 // INTERNAL HEADERS
 #include <dali/internal/event/modeling/mesh-impl.h>

diff --git a/dali/public-api/dynamics/dynamics-shape.h b/dali/devel-api/dynamics/dynamics-shape.h
similarity index 100%
rename from dali/public-api/dynamics/dynamics-shape.h
rename to dali/devel-api/dynamics/dynamics-shape.h

diff --git a/dali/public-api/dynamics/dynamics-world-config.cpp b/dali/devel-api/dynamics/dynamics-world-config.cpp
similarity index 97%
rename from dali/public-api/dynamics/dynamics-world-config.cpp
rename to dali/devel-api/dynamics/dynamics-world-config.cpp
index 98e928d..805b789 100644 (file)
--- a/dali/public-api/dynamics/dynamics-world-config.cpp
+++ b/dali/devel-api/dynamics/dynamics-world-config.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
 
 // INTERNAL HEADERS
 #ifdef DYNAMICS_SUPPORT

diff --git a/dali/public-api/dynamics/dynamics-world-config.h b/dali/devel-api/dynamics/dynamics-world-config.h
similarity index 100%
rename from dali/public-api/dynamics/dynamics-world-config.h
rename to dali/devel-api/dynamics/dynamics-world-config.h

diff --git a/dali/public-api/dynamics/dynamics-world.cpp b/dali/devel-api/dynamics/dynamics-world.cpp
similarity index 96%
rename from dali/public-api/dynamics/dynamics-world.cpp
rename to dali/devel-api/dynamics/dynamics-world.cpp
index 904d210..28723fe 100644 (file)
--- a/dali/public-api/dynamics/dynamics-world.cpp
+++ b/dali/devel-api/dynamics/dynamics-world.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <dali/public-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
 
 // INTERNAL HEADERS
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 #include <dali/internal/event/actors/actor-impl.h>
 
 #ifdef DYNAMICS_SUPPORT

diff --git a/dali/public-api/dynamics/dynamics-world.h b/dali/devel-api/dynamics/dynamics-world.h
similarity index 100%
rename from dali/public-api/dynamics/dynamics-world.h
rename to dali/devel-api/dynamics/dynamics-world.h

diff --git a/dali/devel-api/dynamics/dynamics.h b/dali/devel-api/dynamics/dynamics.h
new file mode 100644 (file)
index 0000000..59282ec
--- /dev/null
+++ b/dali/devel-api/dynamics/dynamics.h
@@ -0,0 +1,29 @@
+#ifndef __DALI_DYNAMICS_H__
+#define __DALI_DYNAMICS_H__
+
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <dali/devel-api/dynamics/dynamics-body.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-collision.h>
+#include <dali/devel-api/dynamics/dynamics-joint.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
+
+#endif //__DALI_DYNAMICS_H__

diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
new file mode 100644 (file)
index 0000000..45e67fd
--- /dev/null
+++ b/dali/devel-api/file.list
@@ -0,0 +1,26 @@
+# Add devel source files here for DALi internal developer files used by Adaptor & Toolkit
+
+devel_api_src_files = \
+  $(devel_api_src_dir)/dynamics/dynamics-body.cpp \
+  $(devel_api_src_dir)/dynamics/dynamics-body-config.cpp \
+  $(devel_api_src_dir)/dynamics/dynamics-collision.cpp \
+  $(devel_api_src_dir)/dynamics/dynamics-joint.cpp \
+  $(devel_api_src_dir)/dynamics/dynamics-shape.cpp \
+  $(devel_api_src_dir)/dynamics/dynamics-world.cpp \
+  $(devel_api_src_dir)/dynamics/dynamics-world-config.cpp
+
+# Add devel header files here DALi internal developer files used by Adaptor & Toolkit
+
+devel_api_core_common_header_files = \
+  $(devel_api_src_dir)/common/map-wrapper.h \
+  $(devel_api_src_dir)/common/set-wrapper.h
+
+devel_api_core_dynamics_header_files = \
+  $(devel_api_src_dir)/dynamics/dynamics.h \
+  $(devel_api_src_dir)/dynamics/dynamics-body.h \
+  $(devel_api_src_dir)/dynamics/dynamics-body-config.h \
+  $(devel_api_src_dir)/dynamics/dynamics-collision.h \
+  $(devel_api_src_dir)/dynamics/dynamics-joint.h \
+  $(devel_api_src_dir)/dynamics/dynamics-shape.h \
+  $(devel_api_src_dir)/dynamics/dynamics-world.h \
+  $(devel_api_src_dir)/dynamics/dynamics-world-config.h

diff --git a/dali/integration-api/dynamics/dynamics-body-settings.h b/dali/integration-api/dynamics/dynamics-body-settings.h
index 72d5268..a119c45 100644 (file)
--- a/dali/integration-api/dynamics/dynamics-body-settings.h
+++ b/dali/integration-api/dynamics/dynamics-body-settings.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/dynamics/dynamics-world-intf.h b/dali/integration-api/dynamics/dynamics-world-intf.h
index f221dec..df9b2d7 100644 (file)
--- a/dali/integration-api/dynamics/dynamics-world-intf.h
+++ b/dali/integration-api/dynamics/dynamics-world-intf.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/integration-api/dynamics/dynamics-debug-vertex.h>
 
 namespace Dali

diff --git a/dali/integration-api/dynamics/dynamics-world-settings.h b/dali/integration-api/dynamics/dynamics-world-settings.h
index 3b55b4e..3e3d48e 100644 (file)
--- a/dali/integration-api/dynamics/dynamics-world-settings.h
+++ b/dali/integration-api/dynamics/dynamics-world-settings.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
 #include <dali/public-api/math/vector3.h>
 
 namespace Dali

diff --git a/dali/internal/event/animation/animation-playlist.cpp b/dali/internal/event/animation/animation-playlist.cpp
index 866a400..ef3644b 100644 (file)
--- a/dali/internal/event/animation/animation-playlist.cpp
+++ b/dali/internal/event/animation/animation-playlist.cpp
@@ -21,7 +21,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
 #include <dali/internal/event/animation/animation-impl.h>
 
 

diff --git a/dali/internal/event/common/type-registry-impl.h b/dali/internal/event/common/type-registry-impl.h
index b73b3e1..c3f5c90 100644 (file)
--- a/dali/internal/event/common/type-registry-impl.h
+++ b/dali/internal/event/common/type-registry-impl.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/object/base-object.h>

diff --git a/dali/internal/event/dynamics/dynamics-body-config-impl.h b/dali/internal/event/dynamics/dynamics-body-config-impl.h
index 46e7b1b..cad5c50 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-body-config-impl.h
+++ b/dali/internal/event/dynamics/dynamics-body-config-impl.h
@@ -23,8 +23,8 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-body-config.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-body-config.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/dynamics/dynamics-body-impl.h b/dali/internal/event/dynamics/dynamics-body-impl.h
index f31e61d..69b56f7 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-body-impl.h
+++ b/dali/internal/event/dynamics/dynamics-body-impl.h
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-body.h>
+#include <dali/devel-api/dynamics/dynamics-body.h>
 
 
 namespace Dali

diff --git a/dali/internal/event/dynamics/dynamics-collision-impl.h b/dali/internal/event/dynamics/dynamics-collision-impl.h
index e651429..d667a67 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-collision-impl.h
+++ b/dali/internal/event/dynamics/dynamics-collision-impl.h
@@ -24,7 +24,7 @@
 // INTERNAL HEADERS
 #include <dali/internal/event/actors/actor-declarations.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-collision.h>
+#include <dali/devel-api/dynamics/dynamics-collision.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/dynamics/dynamics-joint-impl.h b/dali/internal/event/dynamics/dynamics-joint-impl.h
index b10119e..e6a89cf 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-joint-impl.h
+++ b/dali/internal/event/dynamics/dynamics-joint-impl.h
@@ -24,7 +24,7 @@
 // INTERNAL HEADERS
 #include <dali/internal/event/actors/actor-declarations.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-joint.h>
+#include <dali/devel-api/dynamics/dynamics-joint.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/dynamics/dynamics-shape-impl.h b/dali/internal/event/dynamics/dynamics-shape-impl.h
index aa1be03..61dc35f 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-shape-impl.h
+++ b/dali/internal/event/dynamics/dynamics-shape-impl.h
@@ -27,7 +27,7 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 #include <dali/public-api/math/vector3.h>
 
 namespace Dali

diff --git a/dali/internal/event/dynamics/dynamics-world-config-impl.h b/dali/internal/event/dynamics/dynamics-world-config-impl.h
index 0e5a18c..ba352ab 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-world-config-impl.h
+++ b/dali/internal/event/dynamics/dynamics-world-config-impl.h
@@ -23,7 +23,7 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
 
 namespace Dali
 {

diff --git a/dali/internal/event/dynamics/dynamics-world-impl.h b/dali/internal/event/dynamics/dynamics-world-impl.h
index 0f1b667..9bd35f6 100644 (file)
--- a/dali/internal/event/dynamics/dynamics-world-impl.h
+++ b/dali/internal/event/dynamics/dynamics-world-impl.h
@@ -20,12 +20,12 @@
 
 // INTERNAL HEADERS
 #include <dali/public-api/object/base-object.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/event/actors/actor-declarations.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/internal/event/effects/shader-declarations.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
 #include <dali/public-api/signals/slot-delegate.h>
 
 

diff --git a/dali/internal/event/resources/resource-client.cpp b/dali/internal/event/resources/resource-client.cpp
index 3fe6bd8..f175bb4 100644 (file)
--- a/dali/internal/event/resources/resource-client.cpp
+++ b/dali/internal/event/resources/resource-client.cpp
@@ -17,7 +17,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/event/resources/resource-client.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 
 #include <dali/integration-api/resource-request.h>
 #include <dali/integration-api/debug.h>

diff --git a/dali/internal/event/resources/resource-ticket.h b/dali/internal/event/resources/resource-ticket.h
index 27c61b4..958da0b 100644 (file)
--- a/dali/internal/event/resources/resource-ticket.h
+++ b/dali/internal/event/resources/resource-ticket.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/vector-wrapper.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/common/loading-state.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/internal/event/resources/resource-type-path.h>

diff --git a/dali/internal/event/resources/resource-type-path-id-map.h b/dali/internal/event/resources/resource-type-path-id-map.h
index ba6d2be..8c8bab3 100644 (file)
--- a/dali/internal/event/resources/resource-type-path-id-map.h
+++ b/dali/internal/event/resources/resource-type-path-id-map.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/internal/event/resources/resource-type-path.h>
 
 namespace Dali

diff --git a/dali/internal/render/gl-resources/texture-cache.h b/dali/internal/render/gl-resources/texture-cache.h
index 8187b80..dadf9bd 100644 (file)
--- a/dali/internal/render/gl-resources/texture-cache.h
+++ b/dali/internal/render/gl-resources/texture-cache.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/images/native-image.h>
 #include <dali/public-api/math/rect.h>

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.cpp
index 4977111..5dccf7f 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-capsule-shape.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/dynamics/dynamics-factory-intf.h>
 #include <dali/integration-api/dynamics/dynamics-shape-intf.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-collision-data.h b/dali/internal/update/dynamics/scene-graph-dynamics-collision-data.h
index f92ed3f..e482a76 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-collision-data.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-collision-data.h
@@ -22,7 +22,7 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.cpp
index 6f7ceb3..2b5c79f 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-cone-shape.cpp
@@ -24,7 +24,7 @@
 #include <dali/integration-api/dynamics/dynamics-factory-intf.h>
 #include <dali/integration-api/dynamics/dynamics-shape-intf.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.cpp
index 08a2ad9..5309284 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-cube-shape.cpp
@@ -24,7 +24,7 @@
 #include <dali/integration-api/dynamics/dynamics-shape-intf.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
 #include <dali/public-api/math/vector3.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.cpp
index 5cecbec..1be88c2 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-cylinder-shape.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/dynamics/dynamics-factory-intf.h>
 #include <dali/integration-api/dynamics/dynamics-shape-intf.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.cpp
index e537e19..776908a 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-mesh-shape.cpp
@@ -27,7 +27,7 @@
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
 #include <dali/internal/update/modeling/scene-graph-mesh.h>
 #include <dali/internal/update/modeling/internal-mesh-data.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.cpp b/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.cpp
index bd379dd..87af890 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.cpp
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-sphere-shape.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/dynamics/dynamics-factory-intf.h>
 #include <dali/integration-api/dynamics/dynamics-shape-intf.h>
 #include <dali/internal/update/dynamics/scene-graph-dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
+#include <dali/devel-api/dynamics/dynamics-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/dynamics/scene-graph-dynamics-world.h b/dali/internal/update/dynamics/scene-graph-dynamics-world.h
index 691bc7d..3eb8c3b 100644 (file)
--- a/dali/internal/update/dynamics/scene-graph-dynamics-world.h
+++ b/dali/internal/update/dynamics/scene-graph-dynamics-world.h
@@ -25,7 +25,7 @@
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/dynamics/dynamics-declarations.h>
 #include <dali/internal/update/common/scene-graph-buffers.h>
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/math/vector3.h>
 
 namespace Dali

diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index d3a6872..75d43ea 100644 (file)
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/stage.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
 
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/render-controller.h>

diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h
index e342708..d6ae626 100644 (file)
--- a/dali/internal/update/nodes/node.h
+++ b/dali/internal/update/nodes/node.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/actor-enumerations.h>
 #include <dali/public-api/actors/draw-mode.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
 #include <dali/public-api/math/quaternion.h>
 #include <dali/public-api/math/math-utils.h>
 #include <dali/public-api/math/vector3.h>

diff --git a/dali/internal/update/resources/complete-status-manager.h b/dali/internal/update/resources/complete-status-manager.h
index 022dc71..de384ae 100644 (file)
--- a/dali/internal/update/resources/complete-status-manager.h
+++ b/dali/internal/update/resources/complete-status-manager.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include <dali/public-api/common/map-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
 #include <dali/integration-api/resource-declarations.h>
 #include <dali/internal/update/common/scene-graph-buffers.h>
 

diff --git a/dali/internal/update/resources/resource-manager.cpp b/dali/internal/update/resources/resource-manager.cpp
index 3d123e5..1cfba74 100644 (file)
--- a/dali/internal/update/resources/resource-manager.cpp
+++ b/dali/internal/update/resources/resource-manager.cpp
@@ -23,8 +23,8 @@
 #include <typeinfo>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/map-wrapper.h>
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/map-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
 #include <dali/public-api/math/vector2.h>
 
 #include <dali/integration-api/debug.h>

diff --git a/dali/internal/update/touch/history.h b/dali/internal/update/touch/history.h
index d073d61..438cfef 100644 (file)
--- a/dali/internal/update/touch/history.h
+++ b/dali/internal/update/touch/history.h
@@ -22,7 +22,7 @@
 #include <limits>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/set-wrapper.h>
+#include <dali/devel-api/common/set-wrapper.h>
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/math/vector2.h>
 

diff --git a/dali/public-api/actors/custom-actor.cpp b/dali/public-api/actors/custom-actor.cpp
index c1fe709..816db29 100644 (file)
--- a/dali/public-api/actors/custom-actor.cpp
+++ b/dali/public-api/actors/custom-actor.cpp
@@ -18,10 +18,9 @@
 // CLASS HEADER
 #include <dali/public-api/actors/custom-actor.h>
 
-#include <dali/public-api/object/type-registry.h>
-
 // INTERNAL INCLUDES
 #include <dali/internal/event/actors/custom-actor-internal.h>
+#include <dali/public-api/object/type-registry.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/common/stage.cpp b/dali/public-api/common/stage.cpp
index ac0e87d..01f037b 100644 (file)
--- a/dali/public-api/common/stage.cpp
+++ b/dali/public-api/common/stage.cpp
@@ -26,8 +26,8 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/object/object-registry.h>
 
-#include <dali/public-api/dynamics/dynamics-world.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
+#include <dali/devel-api/dynamics/dynamics-world.h>
+#include <dali/devel-api/dynamics/dynamics-world-config.h>
 
 #ifdef DYNAMICS_SUPPORT
 #include <dali/internal/event/dynamics/dynamics-declarations.h>

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index bc59014..078452d 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -53,14 +53,6 @@
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/common/view-mode.h>
 
-#include <dali/public-api/dynamics/dynamics-body.h>
-#include <dali/public-api/dynamics/dynamics-body-config.h>
-#include <dali/public-api/dynamics/dynamics-collision.h>
-#include <dali/public-api/dynamics/dynamics-joint.h>
-#include <dali/public-api/dynamics/dynamics-shape.h>
-#include <dali/public-api/dynamics/dynamics-world-config.h>
-#include <dali/public-api/dynamics/dynamics-world.h>
-
 #include <dali/public-api/events/gesture-detector.h>
 #include <dali/public-api/events/gesture.h>
 #include <dali/public-api/events/hit-test-algorithm.h>

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index e1d1bba..467b828 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -1,4 +1,6 @@
-# Add local source files here
+#
+# Add public-api source files here
+#
 
 public_api_src_files = \
   $(public_api_src_dir)/actors/actor.cpp \
@@ -25,13 +27,6 @@ public_api_src_files = \
   $(public_api_src_dir)/common/hash.cpp \
   $(public_api_src_dir)/common/mutex.cpp \
   $(public_api_src_dir)/common/stage.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-body.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-body-config.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-collision.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-joint.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-shape.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-world.cpp \
-  $(public_api_src_dir)/dynamics/dynamics-world-config.cpp \
   $(public_api_src_dir)/events/gesture.cpp \
   $(public_api_src_dir)/events/gesture-detector.cpp \
   $(public_api_src_dir)/events/hit-test-algorithm.cpp \
@@ -103,7 +98,10 @@ public_api_src_files = \
   $(public_api_src_dir)/object/type-registry.cpp \
   $(public_api_src_dir)/dali-core-version.cpp
 
+
+#
 # Add public header files here
+#
 
 public_api_header_files = \
   $(public_api_src_dir)/dali-core.h \
@@ -144,24 +142,13 @@ public_api_core_common_header_files = \
   $(public_api_src_dir)/common/intrusive-ptr.h \
   $(public_api_src_dir)/common/loading-state.h \
   $(public_api_src_dir)/common/mutex.h \
-  $(public_api_src_dir)/common/map-wrapper.h \
   $(public_api_src_dir)/common/ref-counted-dali-vector.h \
-  $(public_api_src_dir)/common/set-wrapper.h \
   $(public_api_src_dir)/common/scoped-pointer.h \
   $(public_api_src_dir)/common/stage.h \
   $(public_api_src_dir)/common/type-traits.h \
   $(public_api_src_dir)/common/vector-wrapper.h \
   $(public_api_src_dir)/common/view-mode.h
 
-public_api_core_dynamics_header_files = \
-  $(public_api_src_dir)/dynamics/dynamics-body.h \
-  $(public_api_src_dir)/dynamics/dynamics-body-config.h \
-  $(public_api_src_dir)/dynamics/dynamics-collision.h \
-  $(public_api_src_dir)/dynamics/dynamics-joint.h \
-  $(public_api_src_dir)/dynamics/dynamics-shape.h \
-  $(public_api_src_dir)/dynamics/dynamics-world.h \
-  $(public_api_src_dir)/dynamics/dynamics-world-config.h
-
 public_api_core_events_header_files = \
   $(public_api_src_dir)/events/gesture.h \
   $(public_api_src_dir)/events/gesture-detector.h \

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 5bca12a..0a81643 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -134,6 +134,7 @@ exit 0
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*.pc
 %{dev_include_path}/%{name}/public-api/*
+%{dev_include_path}/%{name}/devel-api/*
 
 %files integration-devel
 %defattr(-,root,root,-)