Move integration-api folder from adaptors to adaptor-framework

- Created a symbolic link from adaptors to adaptor-framework so it still
  compiles on target for legacy systems

Change-Id: Ieee931cbead2417ffc33eeba07dd09a9824d1fac

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index cb68586..a9a8208 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -168,7 +168,7 @@ ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
 # the automake counterpart.
 SET( tizenadaptorpublicapidir ${INCLUDE_DIR}/dali/public-api )
 SET( tizenadaptordevelapidir ${INCLUDE_DIR}/dali/devel-api )
-SET( tizenadaptorintegrationapidir ${INCLUDE_DIR}/dali/integration-api/adaptors )
+SET( tizenadaptorintegrationapidir ${INCLUDE_DIR}/dali/integration-api/adaptor-framework )
 SET( tizenadaptorframeworkpublicapidir ${tizenadaptorpublicapidir}/adaptor-framework )
 SET( tizenadaptorframeworkdevelapidir ${tizenadaptordevelapidir}/adaptor-framework )
 SET( tizentextabstractiondevelapidir ${tizenadaptordevelapidir}/text-abstraction )

diff --git a/build/tizen/dali-adaptor-integration.pc.in b/build/tizen/dali-adaptor-integration.pc.in
index 1e989f6..fbbb3cd 100644 (file)
--- a/build/tizen/dali-adaptor-integration.pc.in
+++ b/build/tizen/dali-adaptor-integration.pc.in
@@ -9,4 +9,4 @@ Description: Integration APIs for dali-adaptor
 Version: ${apiversion}
 Requires: dali-adaptor
 Libs: -L${libdir}
-Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptors/
+Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptor-framework/

diff --git a/build/tizen/linker-test.cpp b/build/tizen/linker-test.cpp
index e10bffa..2d4a4be 100644 (file)
--- a/build/tizen/linker-test.cpp
+++ b/build/tizen/linker-test.cpp
@@ -24,7 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/adaptor-framework/application.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 
 using namespace Dali;
 

diff --git a/dali/devel-api/adaptor-framework/application-devel.cpp b/dali/devel-api/adaptor-framework/application-devel.cpp
index 98aa010..9270761 100644 (file)
--- a/dali/devel-api/adaptor-framework/application-devel.cpp
+++ b/dali/devel-api/adaptor-framework/application-devel.cpp
@@ -17,7 +17,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/application-devel.h>
-#include <dali/integration-api/adaptors/scene-holder.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 #include <dali/internal/adaptor/common/application-impl.h>
 
 namespace Dali

diff --git a/dali/integration-api/adaptors/adaptor.h b/dali/integration-api/adaptor-framework/adaptor.h
similarity index 99%
rename from dali/integration-api/adaptors/adaptor.h
rename to dali/integration-api/adaptor-framework/adaptor.h
index a18cf8a..e72fba7 100755 (executable)
--- a/dali/integration-api/adaptors/adaptor.h
+++ b/dali/integration-api/adaptor-framework/adaptor.h
@@ -32,7 +32,7 @@
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/public-api/adaptor-framework/application-configuration.h>
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/log-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/adaptors/egl-interface.h b/dali/integration-api/adaptor-framework/egl-interface.h
similarity index 100%
rename from dali/integration-api/adaptors/egl-interface.h
rename to dali/integration-api/adaptor-framework/egl-interface.h

diff --git a/dali/integration-api/adaptors/log-factory-interface.h b/dali/integration-api/adaptor-framework/log-factory-interface.h
similarity index 100%
rename from dali/integration-api/adaptors/log-factory-interface.h
rename to dali/integration-api/adaptor-framework/log-factory-interface.h

diff --git a/dali/integration-api/adaptors/native-render-surface-factory.h b/dali/integration-api/adaptor-framework/native-render-surface-factory.h
similarity index 100%
rename from dali/integration-api/adaptors/native-render-surface-factory.h
rename to dali/integration-api/adaptor-framework/native-render-surface-factory.h

diff --git a/dali/integration-api/adaptors/native-render-surface.h b/dali/integration-api/adaptor-framework/native-render-surface.h
similarity index 96%
rename from dali/integration-api/adaptors/native-render-surface.h
rename to dali/integration-api/adaptor-framework/native-render-surface.h
index dff0f26..4d4ef37 100644 (file)
--- a/dali/integration-api/adaptors/native-render-surface.h
+++ b/dali/integration-api/adaptor-framework/native-render-surface.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/adaptors/render-surface-interface.h b/dali/integration-api/adaptor-framework/render-surface-interface.h
similarity index 100%
rename from dali/integration-api/adaptors/render-surface-interface.h
rename to dali/integration-api/adaptor-framework/render-surface-interface.h

diff --git a/dali/integration-api/adaptors/scene-holder-impl.cpp b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
similarity index 99%
rename from dali/integration-api/adaptors/scene-holder-impl.cpp
rename to dali/integration-api/adaptor-framework/scene-holder-impl.cpp
index 958eda9..1a213a2 100644 (file)
--- a/dali/integration-api/adaptors/scene-holder-impl.cpp
+++ b/dali/integration-api/adaptor-framework/scene-holder-impl.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 
 // EXTERNAL INCLUDES
 #include <sys/time.h>

diff --git a/dali/integration-api/adaptors/scene-holder-impl.h b/dali/integration-api/adaptor-framework/scene-holder-impl.h
similarity index 98%
rename from dali/integration-api/adaptors/scene-holder-impl.h
rename to dali/integration-api/adaptor-framework/scene-holder-impl.h
index 8fbec83..10051b9 100644 (file)
--- a/dali/integration-api/adaptors/scene-holder-impl.h
+++ b/dali/integration-api/adaptor-framework/scene-holder-impl.h
@@ -29,8 +29,8 @@
 #include <dali/integration-api/events/touch-event-combiner.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/render-surface-interface.h>
-#include <dali/integration-api/adaptors/scene-holder.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/adaptors/scene-holder.cpp b/dali/integration-api/adaptor-framework/scene-holder.cpp
similarity index 96%
rename from dali/integration-api/adaptors/scene-holder.cpp
rename to dali/integration-api/adaptor-framework/scene-holder.cpp
index 5439d53..a51a38d 100644 (file)
--- a/dali/integration-api/adaptors/scene-holder.cpp
+++ b/dali/integration-api/adaptor-framework/scene-holder.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/adaptors/scene-holder.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/events/wheel-event.h>
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/actors/layer.h>
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/adaptors/scene-holder.h b/dali/integration-api/adaptor-framework/scene-holder.h
similarity index 100%
rename from dali/integration-api/adaptors/scene-holder.h
rename to dali/integration-api/adaptor-framework/scene-holder.h

diff --git a/dali/integration-api/adaptors/thread-synchronization-interface.h b/dali/integration-api/adaptor-framework/thread-synchronization-interface.h
similarity index 100%
rename from dali/integration-api/adaptors/thread-synchronization-interface.h
rename to dali/integration-api/adaptor-framework/thread-synchronization-interface.h

diff --git a/dali/integration-api/adaptors/trigger-event-factory-interface.h b/dali/integration-api/adaptor-framework/trigger-event-factory-interface.h
similarity index 96%
rename from dali/integration-api/adaptors/trigger-event-factory-interface.h
rename to dali/integration-api/adaptor-framework/trigger-event-factory-interface.h
index f76f7f5..3f67ebb 100644 (file)
--- a/dali/integration-api/adaptors/trigger-event-factory-interface.h
+++ b/dali/integration-api/adaptor-framework/trigger-event-factory-interface.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/signals/callback.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/trigger-event-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-interface.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/adaptors/trigger-event-factory.h b/dali/integration-api/adaptor-framework/trigger-event-factory.h
similarity index 94%
rename from dali/integration-api/adaptors/trigger-event-factory.h
rename to dali/integration-api/adaptor-framework/trigger-event-factory.h
index 54ce735..5e889a9 100644 (file)
--- a/dali/integration-api/adaptors/trigger-event-factory.h
+++ b/dali/integration-api/adaptor-framework/trigger-event-factory.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory-interface.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/adaptors/trigger-event-interface.h b/dali/integration-api/adaptor-framework/trigger-event-interface.h
similarity index 100%
rename from dali/integration-api/adaptors/trigger-event-interface.h
rename to dali/integration-api/adaptor-framework/trigger-event-interface.h

diff --git a/dali/integration-api/file.list b/dali/integration-api/file.list
index 22cb636..5b84571 100644 (file)
--- a/dali/integration-api/file.list
+++ b/dali/integration-api/file.list
@@ -1,23 +1,23 @@
 
 
 SET( adaptor_integration_api_src_files
-  ${adaptor_integration_api_dir}/adaptors/scene-holder.cpp
-  ${adaptor_integration_api_dir}/adaptors/scene-holder-impl.cpp
+  ${adaptor_integration_api_dir}/adaptor-framework/scene-holder.cpp
+  ${adaptor_integration_api_dir}/adaptor-framework/scene-holder-impl.cpp
 )
 
 
 SET( adaptor_integration_api_header_files
-  ${adaptor_integration_api_dir}/adaptors/adaptor.h
-  ${adaptor_integration_api_dir}/adaptors/egl-interface.h
-  ${adaptor_integration_api_dir}/adaptors/log-factory-interface.h
-  ${adaptor_integration_api_dir}/adaptors/native-render-surface.h
-  ${adaptor_integration_api_dir}/adaptors/native-render-surface-factory.h
-  ${adaptor_integration_api_dir}/adaptors/render-surface-interface.h
-  ${adaptor_integration_api_dir}/adaptors/scene-holder.h
-  ${adaptor_integration_api_dir}/adaptors/scene-holder-impl.h
-  ${adaptor_integration_api_dir}/adaptors/thread-synchronization-interface.h
-  ${adaptor_integration_api_dir}/adaptors/trigger-event-interface.h
-  ${adaptor_integration_api_dir}/adaptors/trigger-event-factory-interface.h
-  ${adaptor_integration_api_dir}/adaptors/trigger-event-factory.h
+  ${adaptor_integration_api_dir}/adaptor-framework/adaptor.h
+  ${adaptor_integration_api_dir}/adaptor-framework/egl-interface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/log-factory-interface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/native-render-surface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/native-render-surface-factory.h
+  ${adaptor_integration_api_dir}/adaptor-framework/render-surface-interface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/scene-holder.h
+  ${adaptor_integration_api_dir}/adaptor-framework/scene-holder-impl.h
+  ${adaptor_integration_api_dir}/adaptor-framework/thread-synchronization-interface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/trigger-event-interface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/trigger-event-factory-interface.h
+  ${adaptor_integration_api_dir}/adaptor-framework/trigger-event-factory.h
 )
 

diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
index 546e206..c151865 100755 (executable)
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -30,9 +30,9 @@
 #include <dali/public-api/adaptor-framework/tts-player.h>
 #include <dali/devel-api/adaptor-framework/clipboard.h>
 #include <dali/integration-api/scene.h>
-#include <dali/integration-api/adaptors/adaptor.h>
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
-#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 #include <dali/internal/legacy/common/tizen-platform-abstraction.h>

diff --git a/dali/internal/adaptor/common/adaptor-internal-services.h b/dali/internal/adaptor/common/adaptor-internal-services.h
index 8b1ca17..5648dca 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-internal-services.h
+++ b/dali/internal/adaptor/common/adaptor-internal-services.h
@@ -24,9 +24,9 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/render-surface.h>
-#include <dali/integration-api/adaptors/render-surface-interface.h>
-#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
-#include <dali/integration-api/adaptors/trigger-event-interface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-interface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 #include <dali/internal/graphics/gles/egl-factory-interface.h>
 #include <dali/internal/network/common/socket-factory-interface.h>

diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp
index 13bec1b..a2597e8 100755 (executable)
--- a/dali/internal/adaptor/common/adaptor.cpp
+++ b/dali/internal/adaptor/common/adaptor.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -25,7 +25,7 @@
 #include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
 #include <dali/devel-api/adaptor-framework/style-monitor.h>
 #include <dali/integration-api/render-surface.h>
-#include <dali/integration-api/adaptors/scene-holder.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/window-impl.h>
 

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 36fc133..875e545 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/platform-abstraction.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
 #include <dali/devel-api/adaptor-framework/thread-settings.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/adaptor/common/combined-update-render-controller-debug.h>

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.h b/dali/internal/adaptor/common/combined-update-render-controller.h
index 1257e86..571485b 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller.h
@@ -25,7 +25,7 @@
 #include <dali/integration-api/core.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/integration-api/adaptor-framework/thread-synchronization-interface.h>
 #include <dali/internal/adaptor/common/thread-controller-interface.h>
 #include <dali/internal/system/common/fps-tracker.h>
 #include <dali/internal/system/common/performance-interface.h>

diff --git a/dali/internal/graphics/gles/egl-graphics.h b/dali/internal/graphics/gles/egl-graphics.h
index cc23fcc..8ee45bc 100644 (file)
--- a/dali/internal/graphics/gles/egl-graphics.h
+++ b/dali/internal/graphics/gles/egl-graphics.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptor-framework/egl-interface.h>
 #include <dali/internal/graphics/common/egl-image-extensions.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 #include <dali/internal/graphics/gles/gl-implementation.h>

diff --git a/dali/internal/graphics/gles/egl-implementation.h b/dali/internal/graphics/gles/egl-implementation.h
index 187c981..ad890ed 100644 (file)
--- a/dali/internal/graphics/gles/egl-implementation.h
+++ b/dali/internal/graphics/gles/egl-implementation.h
@@ -26,7 +26,7 @@
 #include <dali/integration-api/core-enumerations.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptor-framework/egl-interface.h>
 
 namespace Dali
 {

diff --git a/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp b/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp
index 6249a6f..8319094 100755 (executable)
--- a/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp
+++ b/dali/internal/input/tizen-wayland/ecore-virtual-keyboard.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/internal/input/common/input-method-context-impl.h>
 #include <dali/internal/input/tizen-wayland/ecore-virtual-keyboard.h>
 #include <dali/internal/system/common/locale-utils.h>

diff --git a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
index 96310e4..f68c9b8 100755 (executable)
--- a/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/input-method-context-impl-ecore-wl.cpp
@@ -35,8 +35,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/input-method.h>
-#include <dali/integration-api/adaptors/adaptor.h>
-#include <dali/integration-api/adaptors/scene-holder.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
 #include <dali/internal/input/common/key-impl.h>
 #include <dali/internal/system/common/locale-utils.h>
 #include <dali/internal/system/common/singleton-service-impl.h>

diff --git a/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
index 831f848..82e2a95 100755 (executable)
--- a/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
@@ -24,7 +24,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/internal/input/linux/dali-ecore-imf.h>
 #include <dali/internal/system/common/locale-utils.h>
 #include <dali/internal/system/linux/dali-ecore.h>

diff --git a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
index 815a698..1b516c2 100755 (executable)
--- a/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/input-method-context-impl-x.cpp
@@ -25,7 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/key.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/input/common/key-impl.h>
 #include <dali/internal/input/common/virtual-keyboard-impl.h>

diff --git a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
index ecfb023..a1a46f6 100755 (executable)
--- a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
@@ -24,7 +24,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/internal/input/ubuntu-x11/input-method-context-impl-x.h>
 #include <dali/internal/system/common/locale-utils.h>
 #include <dali/internal/system/linux/dali-ecore-x.h>

diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp
index 1c3a5a0..3902cb0 100755 (executable)
--- a/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@ -25,7 +25,7 @@
 \r
 // INTERNAL INCLUDES\r
 #include <dali/public-api/adaptor-framework/key.h>\r
-#include <dali/integration-api/adaptors/adaptor.h>\r
+#include <dali/integration-api/adaptor-framework/adaptor.h>\r
 #include <dali/internal/adaptor/common/adaptor-impl.h>\r
 #include <dali/internal/input/common/key-impl.h>\r
 #include <dali/internal/input/common/virtual-keyboard-impl.h>\r

diff --git a/dali/internal/network/common/network-performance-client.h b/dali/internal/network/common/network-performance-client.h
index 17a4cc0..3ea566a 100644 (file)
--- a/dali/internal/network/common/network-performance-client.h
+++ b/dali/internal/network/common/network-performance-client.h
@@ -25,7 +25,7 @@
 #include <dali/internal/system/common/performance-marker.h>
 #include <dali/internal/network/common/client-send-data-interface.h>
 #include <dali/internal/network/common/socket-factory-interface.h>
-#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory-interface.h>
 
 
 namespace Dali

diff --git a/dali/internal/system/common/environment-options.h b/dali/internal/system/common/environment-options.h
index 02dcc29..815aae3 100644 (file)
--- a/dali/internal/system/common/environment-options.h
+++ b/dali/internal/system/common/environment-options.h
@@ -23,7 +23,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/log-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
 #include <dali/internal/adaptor/common/threading-mode.h>
 
 namespace Dali

diff --git a/dali/internal/system/common/singleton-service-impl.cpp b/dali/internal/system/common/singleton-service-impl.cpp
index 16e6969..a1c3329 100755 (executable)
--- a/dali/internal/system/common/singleton-service-impl.cpp
+++ b/dali/internal/system/common/singleton-service-impl.cpp
@@ -24,7 +24,7 @@
 #include <dali/integration-api/processor-interface.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 
 #if defined(DEBUG_ENABLED)

diff --git a/dali/internal/system/common/trigger-event-factory.cpp b/dali/internal/system/common/trigger-event-factory.cpp
index 059e350..242be5d 100644 (file)
--- a/dali/internal/system/common/trigger-event-factory.cpp
+++ b/dali/internal/system/common/trigger-event-factory.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/trigger-event.h>

diff --git a/dali/internal/system/common/trigger-event.h b/dali/internal/system/common/trigger-event.h
index ebb3958..09ef23d 100644 (file)
--- a/dali/internal/system/common/trigger-event.h
+++ b/dali/internal/system/common/trigger-event.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/trigger-event-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-interface.h>
 #include <dali/internal/system/common/file-descriptor-monitor.h>
 
 namespace Dali

diff --git a/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp
index 73bcaef..ca7f80d 100755 (executable)
--- a/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp
+++ b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp
@@ -27,7 +27,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 
 namespace
 {

diff --git a/dali/internal/system/windows/trigger-event-factory.cpp b/dali/internal/system/windows/trigger-event-factory.cpp
index 3b06129..2631202 100755 (executable)
--- a/dali/internal/system/windows/trigger-event-factory.cpp
+++ b/dali/internal/system/windows/trigger-event-factory.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
 
 // EXTERNAL INCLUDES
 #include <dali/internal/system/windows/trigger-event.h>

diff --git a/dali/internal/system/windows/trigger-event.h b/dali/internal/system/windows/trigger-event.h
index 56ee96f..4c86810 100755 (executable)
--- a/dali/internal/system/windows/trigger-event.h
+++ b/dali/internal/system/windows/trigger-event.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/trigger-event-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-interface.h>
 
 namespace Dali
 {

diff --git a/dali/internal/window-system/common/native-render-surface-factory.cpp b/dali/internal/window-system/common/native-render-surface-factory.cpp
index bf1f3ce..3b07c24 100644 (file)
--- a/dali/internal/window-system/common/native-render-surface-factory.cpp
+++ b/dali/internal/window-system/common/native-render-surface-factory.cpp
@@ -16,7 +16,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/native-render-surface.h>
+#include <dali/integration-api/adaptor-framework/native-render-surface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/render-surface-factory.h>
 

diff --git a/dali/internal/window-system/common/pixmap-render-surface.h b/dali/internal/window-system/common/pixmap-render-surface.h
index d60911a..0e4fcb1 100644 (file)
--- a/dali/internal/window-system/common/pixmap-render-surface.h
+++ b/dali/internal/window-system/common/pixmap-render-surface.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 
 namespace Dali

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 6e90e64..ec696c2 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -30,7 +30,7 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 
 // INTERNAL HEADERS
-#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
 #include <dali/internal/window-system/common/event-handler.h>
 #include <dali/internal/window-system/common/orientation-impl.h>
 #include <dali/internal/window-system/common/render-surface-factory.h>

diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h
index 7f33050..8513fb1 100644 (file)
--- a/dali/internal/window-system/common/window-impl.h
+++ b/dali/internal/window-system/common/window-impl.h
@@ -28,7 +28,7 @@
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/devel-api/adaptor-framework/window-devel.h>
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/window-system/common/event-handler.h>
 

diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp
index de98f92..6c28f12 100644 (file)
--- a/dali/internal/window-system/common/window-render-surface.cpp
+++ b/dali/internal/window-system/common/window-render-surface.cpp
@@ -23,8 +23,8 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
-#include <dali/integration-api/adaptors/trigger-event-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/thread-synchronization-interface.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory-interface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/graphics/gles/egl-graphics.h>

diff --git a/dali/internal/window-system/common/window-render-surface.h b/dali/internal/window-system/common/window-render-surface.h
index fee703e..a72707e 100644 (file)
--- a/dali/internal/window-system/common/window-render-surface.h
+++ b/dali/internal/window-system/common/window-render-surface.h
@@ -23,8 +23,8 @@
 #include <dali/public-api/signals/dali-signal.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/egl-interface.h>
-#include <dali/integration-api/adaptors/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/egl-interface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 
 namespace Dali

diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
index c4f7915..250ad9e 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp
@@ -32,7 +32,7 @@
 #include <tbm_surface_internal.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/integration-api/adaptor-framework/thread-synchronization-interface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/graphics/gles/egl-graphics.h>

diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
index 6f96195..a3dec6a 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
+++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.h
@@ -25,8 +25,8 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/egl-interface.h>
-#include <dali/integration-api/adaptors/native-render-surface.h>
+#include <dali/integration-api/adaptor-framework/egl-interface.h>
+#include <dali/integration-api/adaptor-framework/native-render-surface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 
 namespace Dali

diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
index 755905d..21d84d0 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
@@ -29,7 +29,7 @@
 #include <dali/devel-api/threading/mutex.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/thread-synchronization-interface.h>
+#include <dali/integration-api/adaptor-framework/thread-synchronization-interface.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/adaptor/common/adaptor-internal-services.h>
 #include <dali/internal/graphics/gles/egl-graphics.h>

diff --git a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
index 8e578f7..a96bcdc 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
+++ b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
-#include <dali/integration-api/adaptors/egl-interface.h>
+#include <dali/integration-api/adaptor-framework/egl-interface.h>
 #include <dali/internal/graphics/common/graphics-interface.h>
 #include <dali/internal/graphics/gles/egl-implementation.h>
 #include <dali/internal/system/linux/dali-ecore-x.h>

diff --git a/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp
index 0c91ed9..b8b1f7e 100644 (file)
--- a/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/render-surface-factory-ecore-x.cpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 // INTERNAL HEADERS
-#include <dali/integration-api/adaptors/native-render-surface.h>
+#include <dali/integration-api/adaptor-framework/native-render-surface.h>
 #include <dali/internal/window-system/common/display-utils.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
 #include <dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h>

diff --git a/dali/internal/window-system/windows/render-surface-factory-win.cpp b/dali/internal/window-system/windows/render-surface-factory-win.cpp
index fdb32bb..efb6714 100755 (executable)
--- a/dali/internal/window-system/windows/render-surface-factory-win.cpp
+++ b/dali/internal/window-system/windows/render-surface-factory-win.cpp
@@ -22,7 +22,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL HEADERS
-#include <dali/integration-api/adaptors/native-render-surface.h>
+#include <dali/integration-api/adaptor-framework/native-render-surface.h>
 #include <dali/internal/window-system/common/display-utils.h>
 #include <dali/internal/window-system/common/pixmap-render-surface.h>
 #include <dali/internal/window-system/common/window-render-surface.h>

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 1f9f3e1..8054f9a 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -236,7 +236,6 @@ Feedback plugin to play haptic and audio feedback for Dali
 
 %define user_shader_cache_dir    %{dali_data_ro_dir}/core/shaderbin/
 %define dali_plugin_sound_files  /plugins/sounds/
-%define dev_include_path %{_includedir}
 
 ##############################
 # Build
@@ -449,6 +448,11 @@ ln -sf libdali-adaptor.so libdali-adaptor-cxx11.so.0
 ln -sf libdali-adaptor.so libdali-adaptor-cxx11.so.0.0.0
 popd
 
+# Create a symbolic link in integration-api to preserve legacy repo build
+pushd %{buildroot}%{_includedir}/dali/integration-api
+ln -sf adaptor-framework adaptors
+popd
+
 ##############################
 # Upgrade order:
 # 1 - Pre Install new package
@@ -617,13 +621,14 @@ exit 0
 
 %files devel
 %defattr(-,root,root,-)
-%{dev_include_path}/dali/dali.h
-%{dev_include_path}/dali/public-api/*
-%{dev_include_path}/dali/devel-api/*
-%{dev_include_path}/dali/doc/*
+%{_includedir}/dali/dali.h
+%{_includedir}/dali/public-api/*
+%{_includedir}/dali/devel-api/*
+%{_includedir}/dali/doc/*
 %{_libdir}/pkgconfig/dali-adaptor.pc
 
 %files integration-devel
 %defattr(-,root,root,-)
-%{dev_include_path}/dali/integration-api/adaptors/*
+%{_includedir}/dali/integration-api/adaptor-framework/*
+%{_includedir}/dali/integration-api/adaptors
 %{_libdir}/pkgconfig/dali-adaptor-integration.pc