# 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 )
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/
// 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;
// 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
#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
{
// 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
{
*/
// 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>
#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
{
*/
// 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>
// 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
{
#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
{
// 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
{
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
)
#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>
// 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>
*/
// 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>
#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>
#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>
#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>
*/
// 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>
#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
{
#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>
// 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>
#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>
// 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>
#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>
\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
#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
#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
#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)
*/
// 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>
// 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
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
namespace
{
*/
// 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>
// 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
{
*/
// 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>
*/
// 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
#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>
#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>
#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>
#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
#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>
// 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
#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>
// 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>
#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>
#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>
%define user_shader_cache_dir %{dali_data_ro_dir}/core/shaderbin/
%define dali_plugin_sound_files /plugins/sounds/
-%define dev_include_path %{_includedir}
##############################
# Build
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
%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