From: huiyu.eun Date: Wed, 11 Jun 2025 07:34:15 +0000 (+0900) Subject: Modify build config for robot profile X-Git-Tag: dali_2.4.23~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0dfe0152ab8082eca86a9fb285d2e062c97d219d;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Modify build config for robot profile Change-Id: I61ba4170b6c3353d0003590fc76472000ec3e8be Signed-off-by: huiyu.eun Update code Change-Id: I0dd905740073987740f167a967feadf4015cb345 Signed-off-by: huiyu.eun --- diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 00fcaf521..9ebd31b71 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -397,6 +397,7 @@ INSTALL( FILES ${public_api_header_files} DESTINATION ${tizenadaptorpublicapidir INSTALL( FILES ${adaptor_integration_api_header_files} DESTINATION ${tizenadaptorintegrationapidir} ) INSTALL( FILES ${adaptor_application_api_header_files} DESTINATION ${tizenadaptorapplicationapidir} ) INSTALL( FILES ${public_api_adaptor_framework_header_files} DESTINATION ${tizenadaptorframeworkpublicapidir} ) +INSTALL( FILES ${public_api_adaptor_framework_widget_header_files} DESTINATION ${tizenadaptorframeworkpublicapidir} ) INSTALL( FILES ${devel_api_adaptor_framework_header_files} DESTINATION ${tizenadaptorframeworkdevelapidir} ) INSTALL( FILES ${devel_api_adaptor_framework_egl_header_files} DESTINATION ${tizenadaptorframeworkdevelapidir} ) INSTALL( FILES ${devel_api_adaptor_framework_canvas_renderer_header_files} DESTINATION ${tizencanvasrendererdevelapidir} ) @@ -558,7 +559,12 @@ IF( enable_feedback ) ENDIF() IF( ENABLE_APPMODEL ) +IF (ROBOT_PROFILE) + ADD_SUBDIRECTORY( application-normal-model ) +ELSE() ADD_SUBDIRECTORY( application-model ) + ADD_SUBDIRECTORY( application-normal-model ) +ENDIF() ENDIF() #CLEAN_ARG_CACHE() diff --git a/build/tizen/application-model/CMakeLists.txt b/build/tizen/application-model/CMakeLists.txt index 78917b2f0..a5035873f 100644 --- a/build/tizen/application-model/CMakeLists.txt +++ b/build/tizen/application-model/CMakeLists.txt @@ -1,5 +1,4 @@ IF( (NOT UBUNTU_PROFILE) ) - SET(APPLICATION_NORMAL_TARGET dali2-adaptor-application-normal ) SET(APPLICATION_WIDGET_TARGET dali2-adaptor-application-widget ) SET(APPLICATION_WATCH_TARGET dali2-adaptor-application-watch ) SET(APPLICATION_COMPONENT_BASED_TARGET dali2-adaptor-application-component-based ) @@ -9,12 +8,10 @@ IF( (NOT UBUNTU_PROFILE) ) INCLUDE( ${appmodel_src_dir}/file.list ) - SET( APPLICATION_NORMAL_SOURCES ${app_normal_src_files} ) SET( APPLICATION_WIDGET_SOURCES ${app_widget_src_files} ) SET( APPLICATION_WATCH_SOURCES ${app_watch_src_files} ) SET( APPLICATION_COMPONENT_BASED_SOURCES ${app_component_based_src_files} ) - ADD_LIBRARY( ${APPLICATION_NORMAL_TARGET} SHARED ${APPLICATION_NORMAL_SOURCES} ) ADD_LIBRARY( ${APPLICATION_WIDGET_TARGET} SHARED ${APPLICATION_WIDGET_SOURCES} ) ADD_LIBRARY( ${APPLICATION_WATCH_TARGET} SHARED ${APPLICATION_WATCH_SOURCES} ) ADD_LIBRARY( ${APPLICATION_COMPONENT_BASED_TARGET} SHARED ${APPLICATION_COMPONENT_BASED_SOURCES} ) @@ -24,29 +21,13 @@ IF( (NOT UBUNTU_PROFILE) ) IF (ENABLE_PKG_CONFIGURE) FIND_PACKAGE(PkgConfig REQUIRED) PKG_CHECK_MODULES(APPCOREUICPP app-core-ui-cpp) + PKG_CHECK_MODULES(APPCORECOMMONCPP appcore-common) PKG_CHECK_MODULES(ELDBUS eldbus) - SET(CORE_PKG_CFG_FILE dali2-adaptor-application-normal.pc) + SET(CORE_PKG_CFG_FILE dali2-adaptor-application-model.pc) CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY) ENDIF() - TARGET_LINK_LIBRARIES( ${APPLICATION_NORMAL_TARGET} PUBLIC - ${DLOG_LDFLAGS} - ${DALICORE_LDFLAGS} - ${APPCOREUICPP_LDFLAGS} - ${ELDBUS_LDFLAGS} - dali2-adaptor - ) - - TARGET_COMPILE_OPTIONS( ${APPLICATION_NORMAL_TARGET} PUBLIC - ${DLOG_CFLAGS} - ${DALICORE_CFLAGS} - ${APPCOREUICPP_CFLAGS} - ${ELDBUS_CFLAGS} - -I../../../ - -Wall - ) - TARGET_LINK_LIBRARIES( ${APPLICATION_WIDGET_TARGET} PUBLIC ${DLOG_LDFLAGS} ${DALICORE_LDFLAGS} @@ -92,10 +73,7 @@ IF( (NOT UBUNTU_PROFILE) ) -Wall ) - - INSTALL( TARGETS ${APPLICATION_NORMAL_TARGET} DESTINATION ${LIB_DIR} ) INSTALL( TARGETS ${APPLICATION_WIDGET_TARGET} DESTINATION ${LIB_DIR} ) INSTALL( TARGETS ${APPLICATION_WATCH_TARGET} DESTINATION ${LIB_DIR} ) INSTALL( TARGETS ${APPLICATION_COMPONENT_BASED_TARGET} DESTINATION ${LIB_DIR} ) ENDIF() - diff --git a/build/tizen/application-model/dali2-adaptor-application-model.pc.in b/build/tizen/application-model/dali2-adaptor-application-model.pc.in new file mode 100644 index 000000000..6d728670e --- /dev/null +++ b/build/tizen/application-model/dali2-adaptor-application-model.pc.in @@ -0,0 +1,15 @@ +#Package Information for pkg-config + +prefix=@PREFIX@ +exec_prefix=@EXEC_PREFIX@ +apiversion=@DALI_ADAPTOR_VERSION@ +libdir=@LIB_DIR@ +includedir=@DEV_INCLUDE_PATH@ + +Name: dali-adaptor +Description: DALi adaptor for application-model +Version: ${apiversion} +Requires: dali2-adaptor +Libs: -L${libdir} -ldali2-adaptor-application-model +Cflags: -I${includedir}/dali + diff --git a/build/tizen/application-normal-model/CMakeLists.txt b/build/tizen/application-normal-model/CMakeLists.txt new file mode 100644 index 000000000..31a09e740 --- /dev/null +++ b/build/tizen/application-normal-model/CMakeLists.txt @@ -0,0 +1,46 @@ +IF( (NOT UBUNTU_PROFILE) ) + SET(APPLICATION_NORMAL_TARGET dali2-adaptor-application-normal ) + + MESSAGE(STATUS ${ROOT_SRC_DIR}/dali/internal/application-model ) + SET( appmodel_src_dir ${ROOT_SRC_DIR}/dali/internal/application-model ) + + INCLUDE( ${appmodel_src_dir}/file.list ) + + SET( APPLICATION_NORMAL_SOURCES ${app_normal_src_files} ) + + ADD_LIBRARY( ${APPLICATION_NORMAL_TARGET} SHARED ${APPLICATION_NORMAL_SOURCES} ) + + OPTION(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON) + + IF (ENABLE_PKG_CONFIGURE) + FIND_PACKAGE(PkgConfig REQUIRED) + PKG_CHECK_MODULES(APPCOREUICPP app-core-ui-cpp) + PKG_CHECK_MODULES(APPCORECOMMON appcore-common) + PKG_CHECK_MODULES(ELDBUS eldbus) + + SET(CORE_PKG_CFG_FILE dali2-adaptor-application-normal.pc) + CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY) + ENDIF() + + TARGET_LINK_LIBRARIES( ${APPLICATION_NORMAL_TARGET} PUBLIC + ${DLOG_LDFLAGS} + ${DALICORE_LDFLAGS} + ${APPCOREUICPP_LDFLAGS} + ${APPCORECOMMON_LDFLAGS} + ${ELDBUS_LDFLAGS} + dali2-adaptor + ) + + TARGET_COMPILE_OPTIONS( ${APPLICATION_NORMAL_TARGET} PUBLIC + ${DLOG_CFLAGS} + ${DALICORE_CFLAGS} + ${APPCOREUICPP_CFLAGS} + ${APPCORECOMMON_CFLAGS} + ${ELDBUS_CFLAGS} + -I../../../ + -Wall + ) + + INSTALL( TARGETS ${APPLICATION_NORMAL_TARGET} DESTINATION ${LIB_DIR} ) +ENDIF() + diff --git a/build/tizen/application-normal-model/dali2-adaptor-application-normal.pc.in b/build/tizen/application-normal-model/dali2-adaptor-application-normal.pc.in new file mode 100644 index 000000000..2edc63b71 --- /dev/null +++ b/build/tizen/application-normal-model/dali2-adaptor-application-normal.pc.in @@ -0,0 +1,15 @@ +#Package Information for pkg-config + +prefix=@PREFIX@ +exec_prefix=@EXEC_PREFIX@ +apiversion=@DALI_ADAPTOR_VERSION@ +libdir=@LIB_DIR@ +includedir=@DEV_INCLUDE_PATH@ + +Name: dali-adaptor +Description: DALi adaptor for application-normal +Version: ${apiversion} +Requires: dali2-adaptor +Libs: -L${libdir} -ldali2-adaptor-application-normal +Cflags: -I${includedir}/dali + diff --git a/build/tizen/dali2-adaptor.pc.in b/build/tizen/dali2-adaptor.pc.in index 6b69d3f1c..d82038b7f 100644 --- a/build/tizen/dali2-adaptor.pc.in +++ b/build/tizen/dali2-adaptor.pc.in @@ -9,4 +9,4 @@ Description: DALi adaptor using ecore Version: ${apiversion} Requires: dali2-core Libs: -L${libdir} -ldali2-adaptor -Cflags: -I${includedir}/dali +Cflags: -I${includedir} -I${includedir}/dali diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake index 77100ba32..ec46dc95d 100644 --- a/build/tizen/deps-check.cmake +++ b/build/tizen/deps-check.cmake @@ -136,20 +136,20 @@ CHECK_MODULE_AND_SET( XDAMAGE xdamage [] ) CHECK_MODULE_AND_SET( XFIXES xfixes [] ) CHECK_MODULE_AND_SET( XINPUT xi [] ) CHECK_MODULE_AND_SET( XRENDER xrender [] ) - CHECK_MODULE_AND_SET( CAPI_SYSTEM_INFO capi-system-info [] ) CHECK_MODULE_AND_SET( CAPI_SYSTEM_SENSOR capi-system-sensor capi_system_sensor_support ) CHECK_MODULE_AND_SET( CAPI_SYSTEM_SYSTEM_SETTINGS capi-system-system-settings [] ) CHECK_MODULE_AND_SET( CAPI_APPFW_APPLICATION capi-appfw-application [] ) CHECK_MODULE_AND_SET( COMPONENT_BASED_CORE_BASE component-based-core-base [] ) - CHECK_MODULE_AND_SET( ELEMENTARY elementary [] ) CHECK_MODULE_AND_SET( BUNDLE bundle [] ) CHECK_MODULE_AND_SET( SCREENCONNECTORPROVIDER screen_connector_provider [] ) CHECK_MODULE_AND_SET( APPFW_WATCH capi-appfw-watch-application watch_available ) CHECK_MODULE_AND_SET( APPCORE_WATCH appcore-watch [] ) -CHECK_MODULE_AND_SET( CAPI_APPFW_APPLICATION app-core-ui-cpp [] ) +CHECK_MODULE_AND_SET( CAPI_APP_CORE_UI appcore-ui [] ) +CHECK_MODULE_AND_SET( CAPI_APP_CORE_UI_CPP app-core-ui-cpp [] ) +CHECK_MODULE_AND_SET( CAPI_APP_COMMON appcore-common [] ) CHECK_MODULE_AND_SET( CAPI_APPFW_WIDGET_BASE appcore-widget-base [] ) CHECK_MODULE_AND_SET( CAPI_APPFW_COMMON capi-appfw-app-common [] ) CHECK_MODULE_AND_SET( CAPI_APPFW_CONTROL capi-appfw-app-control [] ) @@ -456,6 +456,9 @@ ELSE() IF( enable_appfw ) SET( DALI_CFLAGS ${DALI_CFLAGS} ${CAPI_APPFW_APPLICATION_CFLAGS} + ${CAPI_APP_CORE_UI_CFLAGS} + ${CAPI_APP_CORE_UI_CPP_CFLAGS} + ${CAPI_APP_COMMON_CFLAGS} ${CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS} ${CAPI_SYSTEM_INFO_CFLAGS} ${TTS_CFLAGS} @@ -472,6 +475,10 @@ ELSE() SET( DALI_LDFLAGS ${DALI_LDFLAGS} ${CAPI_APPFW_APPLICATION_LDFLAGS} + ${CAPI_APP_CORE_LDFLAGS} + ${CAPI_APP_CORE_UI_LDFLAGS} + ${CAPI_APP_CORE_UI_CPP_LDFLAGS} + ${CAPI_APP_COMMON_LDFLAGS} ${CAPI_SYSTEM_SYSTEM_SETTINGS_LDFLAGS} ${CAPI_SYSTEM_INFO_LDFLAGS} ${TTS_LDFLAGS} diff --git a/build/tizen/profiles/android-profile.cmake b/build/tizen/profiles/android-profile.cmake index d8a558ee6..3da33deaa 100644 --- a/build/tizen/profiles/android-profile.cmake +++ b/build/tizen/profiles/android-profile.cmake @@ -27,6 +27,7 @@ SET( SOURCES ${adaptor_network_common_src_files} ${adaptor_offscreen_common_src_files} ${adaptor_public_api_src_files} + ${adaptor_widget_public_api_src_files} ${adaptor_sensor_common_src_files} ${adaptor_sensor_android_src_files} ${adaptor_styling_common_src_files} diff --git a/build/tizen/profiles/common-profile.cmake b/build/tizen/profiles/common-profile.cmake index 22486ddc1..0756ad816 100644 --- a/build/tizen/profiles/common-profile.cmake +++ b/build/tizen/profiles/common-profile.cmake @@ -111,6 +111,13 @@ IF( COMPONENT_APPLICATION_SUPPORT ) ) ENDIF() +IF( NOT ROBOT_PROFILE ) + SET( SOURCES ${SOURCES} + ${adaptor_widget_public_api_src_files} + ${adaptor_system_tizen_wayland_widget_src_files} + ) +ENDIF() + # Set the linker flags SET(REQUIRED_LIBS -lhyphen diff --git a/build/tizen/profiles/glib-x11-profile.cmake b/build/tizen/profiles/glib-x11-profile.cmake index 86137d755..90bde5998 100644 --- a/build/tizen/profiles/glib-x11-profile.cmake +++ b/build/tizen/profiles/glib-x11-profile.cmake @@ -28,6 +28,7 @@ SET( SOURCES ${adaptor_network_common_src_files} ${adaptor_offscreen_common_src_files} ${adaptor_public_api_src_files} + ${adaptor_widget_public_api_src_files} ${adaptor_sensor_common_src_files} ${adaptor_styling_common_src_files} ${adaptor_system_common_src_files} diff --git a/build/tizen/profiles/ivi-profile.cmake b/build/tizen/profiles/ivi-profile.cmake index f39a538f7..d8dd058c7 100644 --- a/build/tizen/profiles/ivi-profile.cmake +++ b/build/tizen/profiles/ivi-profile.cmake @@ -111,3 +111,11 @@ IF( COMPONENT_APPLICATION_SUPPORT ) ${adaptor_adaptor_component_application_src_files} ) ENDIF() + +IF( NOT ROBOT_PROFILE ) + SET( SOURCES ${SOURCES} + ${adaptor_widget_public_api_src_files} + ${adaptor_system_tizen_wayland_widget_src_files} + ) +ENDIF() + diff --git a/build/tizen/profiles/libuv-x11-profile.cmake b/build/tizen/profiles/libuv-x11-profile.cmake index da17dd2e5..7495a8149 100644 --- a/build/tizen/profiles/libuv-x11-profile.cmake +++ b/build/tizen/profiles/libuv-x11-profile.cmake @@ -28,6 +28,7 @@ SET( SOURCES ${adaptor_network_common_src_files} ${adaptor_offscreen_common_src_files} ${adaptor_public_api_src_files} + ${adaptor_widget_public_api_src_files} ${adaptor_sensor_common_src_files} ${adaptor_styling_common_src_files} ${adaptor_system_common_src_files} diff --git a/build/tizen/profiles/macos-profile.cmake b/build/tizen/profiles/macos-profile.cmake index 0c593cb8c..7a07ca59c 100644 --- a/build/tizen/profiles/macos-profile.cmake +++ b/build/tizen/profiles/macos-profile.cmake @@ -25,6 +25,7 @@ SET( SOURCES ${adaptor_network_common_src_files} ${adaptor_offscreen_common_src_files} ${adaptor_public_api_src_files} + ${adaptor_widget_public_api_src_files} ${adaptor_sensor_common_src_files} ${adaptor_sensor_macos_src_files} ${adaptor_styling_common_src_files} diff --git a/build/tizen/profiles/mobile-profile.cmake b/build/tizen/profiles/mobile-profile.cmake index 6b9cc1837..46fb0a75d 100644 --- a/build/tizen/profiles/mobile-profile.cmake +++ b/build/tizen/profiles/mobile-profile.cmake @@ -111,6 +111,14 @@ IF( COMPONENT_APPLICATION_SUPPORT ) ) ENDIF() +IF( NOT ROBOT_PROFILE ) + SET( SOURCES ${SOURCES} + ${adaptor_widget_public_api_src_files} + ${adaptor_system_tizen_wayland_widget_src_files} + ) +ENDIF() + + # Set the linker flags SET(REQUIRED_LIBS -lhyphen diff --git a/build/tizen/profiles/tv-profile.cmake b/build/tizen/profiles/tv-profile.cmake index 7b3e4e802..bd74bf28a 100644 --- a/build/tizen/profiles/tv-profile.cmake +++ b/build/tizen/profiles/tv-profile.cmake @@ -111,6 +111,13 @@ IF( COMPONENT_APPLICATION_SUPPORT ) ) ENDIF() +IF( NOT ROBOT_PROFILE ) + SET( SOURCES ${SOURCES} + ${adaptor_widget_public_api_src_files} + ${adaptor_system_tizen_wayland_widget_src_files} + ) +ENDIF() + # Set the linker flags SET(REQUIRED_LIBS -lhyphen diff --git a/build/tizen/profiles/ubuntu-profile.cmake b/build/tizen/profiles/ubuntu-profile.cmake index 89d302372..d24671a6c 100644 --- a/build/tizen/profiles/ubuntu-profile.cmake +++ b/build/tizen/profiles/ubuntu-profile.cmake @@ -25,6 +25,7 @@ SET( SOURCES ${adaptor_network_common_src_files} ${adaptor_offscreen_common_src_files} ${adaptor_public_api_src_files} + ${adaptor_widget_public_api_src_files} ${adaptor_sensor_common_src_files} ${adaptor_sensor_ubuntu_src_files} ${adaptor_styling_common_src_files} diff --git a/build/tizen/profiles/wearable-profile.cmake b/build/tizen/profiles/wearable-profile.cmake index 80be6fac4..23f19d798 100644 --- a/build/tizen/profiles/wearable-profile.cmake +++ b/build/tizen/profiles/wearable-profile.cmake @@ -112,3 +112,11 @@ IF( COMPONENT_APPLICATION_SUPPORT ) ${adaptor_adaptor_component_application_src_files} ) ENDIF() + +IF( NOT ROBOT_PROFILE ) + SET( SOURCES ${SOURCES} + ${adaptor_widget_public_api_src_files} + ${adaptor_system_tizen_wayland_widget_src_files} + ) +ENDIF() + diff --git a/build/tizen/profiles/windows-profile.cmake b/build/tizen/profiles/windows-profile.cmake index 002788b2e..0287425c6 100644 --- a/build/tizen/profiles/windows-profile.cmake +++ b/build/tizen/profiles/windows-profile.cmake @@ -21,6 +21,7 @@ SET( SOURCES ${adaptor_network_common_src_files} ${adaptor_offscreen_common_src_files} ${adaptor_public_api_src_files} + ${adaptor_widget_public_api_src_files} ${adaptor_sensor_common_src_files} ${adaptor_styling_common_src_files} ${adaptor_system_common_src_files} diff --git a/dali/internal/system/file.list b/dali/internal/system/file.list index c6f4c5e8f..a43b7fc19 100644 --- a/dali/internal/system/file.list +++ b/dali/internal/system/file.list @@ -54,6 +54,10 @@ SET( adaptor_system_tizen_wayland_src_files ${adaptor_system_dir}/generic/system-error-print-generic.cpp ${adaptor_system_dir}/tizen-wayland/logging-tizen.cpp ${adaptor_system_dir}/tizen-wayland/system-settings-tizen.cpp +) + +# module: system, backend: tizen-wayland(widget) +SET( adaptor_system_tizen_wayland_widget_src_files ${adaptor_system_dir}/tizen-wayland/widget-application-impl-tizen.cpp ${adaptor_system_dir}/tizen-wayland/widget-controller-tizen.cpp ) diff --git a/dali/public-api/file.list b/dali/public-api/file.list index 45e2e43ed..102f0f429 100644 --- a/dali/public-api/file.list +++ b/dali/public-api/file.list @@ -9,21 +9,23 @@ SET( adaptor_public_api_src_files ${adaptor_public_api_dir}/adaptor-framework/timer.cpp ${adaptor_public_api_dir}/adaptor-framework/tts-player.cpp ${adaptor_public_api_dir}/adaptor-framework/native-image-source.cpp - ${adaptor_public_api_dir}/adaptor-framework/widget.cpp - ${adaptor_public_api_dir}/adaptor-framework/widget-application.cpp - ${adaptor_public_api_dir}/adaptor-framework/widget-impl.cpp ${adaptor_public_api_dir}/adaptor-framework/async-task-manager.cpp ${adaptor_public_api_dir}/adaptor-framework/window-data.cpp ${adaptor_public_api_dir}/capture/capture.cpp ${adaptor_public_api_dir}/dali-adaptor-version.cpp ) +SET( adaptor_widget_public_api_src_files + ${adaptor_public_api_dir}/adaptor-framework/widget.cpp + ${adaptor_public_api_dir}/adaptor-framework/widget-application.cpp + ${adaptor_public_api_dir}/adaptor-framework/widget-impl.cpp +) + SET( public_api_header_files ${adaptor_public_api_dir}/dali-adaptor-version.h ${adaptor_public_api_dir}/dali-adaptor-common.h ) - SET( public_api_adaptor_framework_header_files ${adaptor_public_api_dir}/adaptor-framework/application.h ${adaptor_public_api_dir}/adaptor-framework/device-status.h @@ -37,15 +39,18 @@ SET( public_api_adaptor_framework_header_files ${adaptor_public_api_dir}/adaptor-framework/tts-player.h ${adaptor_public_api_dir}/adaptor-framework/native-image-source.h ${adaptor_public_api_dir}/adaptor-framework/window.h - ${adaptor_public_api_dir}/adaptor-framework/widget.h - ${adaptor_public_api_dir}/adaptor-framework/widget-application.h - ${adaptor_public_api_dir}/adaptor-framework/widget-impl.h ${adaptor_public_api_dir}/adaptor-framework/window-enumerations.h ${adaptor_public_api_dir}/adaptor-framework/round-robin-container-view.h ${adaptor_public_api_dir}/adaptor-framework/async-task-manager.h ${adaptor_public_api_dir}/adaptor-framework/window-data.h ) +SET( public_api_adaptor_framework_widget_header_files + ${adaptor_public_api_dir}/adaptor-framework/widget.h + ${adaptor_public_api_dir}/adaptor-framework/widget-application.h + ${adaptor_public_api_dir}/adaptor-framework/widget-impl.h +) + SET( public_dali_capture_header_files ${adaptor_public_api_dir}/capture/capture.h ) diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 76d4ff638..c4ab2ae07 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -34,11 +34,17 @@ BuildRequires: pkgconfig(libtzplatform-config) # This is for backward-compatibility. This does not deteriorate 4.0 Configurability # if wearable || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" +%if "%{mv_prj}" != "1" BuildRequires: pkgconfig(capi-appfw-watch-application) BuildRequires: pkgconfig(appcore-watch) %endif +%endif +# if 'mv_prj' is defined, this build targets the robot profile. +%if "%{mv_prj}" != "1" BuildRequires: pkgconfig(screen_connector_provider) +%endif + BuildRequires: pkgconfig(gles20) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(ttrace) @@ -93,11 +99,18 @@ BuildRequires: pkgconfig(wayland-egl-tizen) BuildRequires: pkgconfig(libtbm) # for the adaptor +BuildRequires: pkgconfig(capi-appfw-app-control) +BuildRequires: pkgconfig(capi-appfw-app-common) BuildRequires: pkgconfig(app-core-ui-cpp) +BuildRequires: pkgconfig(app-core-cpp) +BuildRequires: pkgconfig(appcore-common) + +%if "%{mv_prj}" != "1" BuildRequires: pkgconfig(appcore-widget-base) +BuildRequires: pkgconfig(component-based-core-base) +%endif + BuildRequires: pkgconfig(bundle) -BuildRequires: pkgconfig(capi-appfw-app-common) -BuildRequires: pkgconfig(capi-appfw-app-control) BuildRequires: pkgconfig(ecore-imf) BuildRequires: pkgconfig(capi-system-system-settings) @@ -108,7 +121,6 @@ BuildRequires: pkgconfig(eldbus) # for feedback plugin BuildRequires: pkgconfig(mm-sound) BuildRequires: pkgconfig(feedback) -BuildRequires: pkgconfig(component-based-core-base) BuildRequires: pkgconfig(thorvg) @@ -331,6 +343,13 @@ cmake_flags+=" -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}" cmake_flags+=" -DENABLE_TIZEN_MAJOR_VERSION=%{tizen_version_major}" cmake_flags+=" -DENABLE_FEEDBACK=YES" cmake_flags+=" -DENABLE_APPMODEL=ON" + +%if "%{mv_prj}" != "1" +cmake_flags+=" -DROBOT_PROFILE=NO" +%else +cmake_flags+=" -DROBOT_PROFILE=YES" +%endif + cmake_flags+=" -DENABLE_APPFW=YES" cmake_flags+=" -DCOMPONENT_APPLICATION_SUPPORT=YES" @@ -623,9 +642,12 @@ exit 0 %{_libdir}/libdali2-adaptor-gles.so %{_libdir}/libdali2-adaptor-gl-window-addon.so %{_libdir}/libdali2-adaptor-application-normal.so* + +%if "%{mv_prj}" != "1" %{_libdir}/libdali2-adaptor-application-widget.so* %{_libdir}/libdali2-adaptor-application-watch.so* %{_libdir}/libdali2-adaptor-application-component-based.so* +%endif #################################################