diff options
author | Eunki, Hong <eunkiki.hong@samsung.com> | 2021-11-02 19:09:32 +0900 |
---|---|---|
committer | Eunki, Hong <eunkiki.hong@samsung.com> | 2021-11-03 15:03:47 +0900 |
commit | c43f5c1bdf517c01fb0dd76b7df2c91c9b23021e (patch) | |
tree | 93a253cb2663c996cce09f89e7e07509d3bfd47e /build | |
parent | d9b72be5a5dbcdf6bdb545ba8dfcfa8e0f3549d7 (diff) | |
download | dali-demo-c43f5c1bdf517c01fb0dd76b7df2c91c9b23021e.tar.gz dali-demo-c43f5c1bdf517c01fb0dd76b7df2c91c9b23021e.tar.bz2 dali-demo-c43f5c1bdf517c01fb0dd76b7df2c91c9b23021e.zip |
Fix dali-demo SIGKILL issue
Use capi-appfw-appcontrol instead of unix default fork().
If process group is connected, AMD check whole of them as same process.
So even if child process call ecore_shutdown, it's parent process also killed after 5 seconds later.
That's why dali-examples / com.samsung.dali-demo got SIGKILL from amd.
This patch separate execute logic between unix and tizen by -DTIZEN:BOOL=ON option.
TIZEN will be set ON only at packaging/com.samsung.dali-demo.spec
NOTE. app_control_send_launch_request need privilege 'http://tizen.org/privilege/appmanager.launch'.
Change-Id: I1d37a21f0d3091c0dc2fcbb4806900256e464aa5
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
Diffstat (limited to 'build')
-rw-r--r-- | build/tizen/CMakeLists.txt | 26 | ||||
-rw-r--r-- | build/tizen/demo/CMakeLists.txt | 5 | ||||
-rw-r--r-- | build/tizen/examples-reel/CMakeLists.txt | 5 | ||||
-rw-r--r-- | build/tizen/tests-reel/CMakeLists.txt | 5 |
4 files changed, 41 insertions, 0 deletions
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index df31de60..e3bda7d8 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -227,6 +227,19 @@ IF( ENABLE_PKG_CONFIGURE ) SET( ENABLE_SCENE_LOADER "ON" ) ENDIF() + + # if build as tizen platform, use capi-appfw-app-control + IF( TIZEN ) + pkg_check_modules(CAPI_APPFW_APP_CONTROL capi-appfw-app-control) + IF( CAPI_APPFW_APP_CONTROL_FOUND) + FOREACH(flag ${CAPI_APPFW_APP_CONTROL_CFLAGS}) + SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}") + ENDFOREACH(flag) + FOREACH(flag ${CAPI_APPFW_APP_CONTROL_LDFLAGS}) + SET(REQUIRED_PKGS_LDFLAGS "${REQUIRED_PKGS_LDFLAGS} ${flag}") + ENDFOREACH(flag) + ENDIF() + ENDIF() ENDIF() SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") @@ -417,6 +430,18 @@ ADD_SUBDIRECTORY(examples-reel) ADD_SUBDIRECTORY(tests-reel) ADD_SUBDIRECTORY(builder) +# Setup CURRENT_BUILD_PLATFORM to use at message +IF(ANDROID) + SET(CURRENT_BUILD_PLATFORM "Android") +ELSEIF(WIN32) + SET(CURRENT_BUILD_PLATFORM "Windows") +ELSEIF(APPLE) + SET(CURRENT_BUILD_PLATFORM "MacOS") +ELSEIF(TIZEN) + SET(CURRENT_BUILD_PLATFORM "Tizen") +ELSE() + SET(CURRENT_BUILD_PLATFORM "Ubuntu") +ENDIF() MESSAGE( " Folder DEMO_IMAGE_DIR : [" ${DEMO_IMAGE_DIR} "]" ) MESSAGE( " Folder DEMO_STYLE_DIR : [" ${DEMO_STYLE_DIR} "]" ) @@ -429,4 +454,5 @@ MESSAGE( " Folder DEMO_SCRIPT_DIR : [" ${DEMO_SCRIPT_DIR} "]" ) MESSAGE( " Folder DEMO_LOCALE_DIR : [" ${DEMO_LOCALE_DIR} "]" ) MESSAGE( " Folder DEMO_EXAMPLE_BIN : [" ${DEMO_EXAMPLE_BIN} "]" ) MESSAGE( " Folder DEMO_LANG : [" ${DEMO_LANG} "]" ) +MESSAGE( " Current Build Platform : [" ${CURRENT_BUILD_PLATFORM} "]" ) MESSAGE( " Scene Loader Enabled : [" ${ENABLE_SCENE_LOADER} "]" ) diff --git a/build/tizen/demo/CMakeLists.txt b/build/tizen/demo/CMakeLists.txt index 855b82c4..53684934 100644 --- a/build/tizen/demo/CMakeLists.txt +++ b/build/tizen/demo/CMakeLists.txt @@ -19,6 +19,11 @@ ELSEIF(ANDROID) ${DEMO_SRCS} "${ROOT_SRC_DIR}/shared/execute-process-android.cpp" ) +ELSEIF(TIZEN) + SET(DEMO_SRCS + ${DEMO_SRCS} + "${ROOT_SRC_DIR}/shared/execute-process-tizen.cpp" + ) ELSE() SET(DEMO_SRCS ${DEMO_SRCS} diff --git a/build/tizen/examples-reel/CMakeLists.txt b/build/tizen/examples-reel/CMakeLists.txt index 8b392e71..853e1c6d 100644 --- a/build/tizen/examples-reel/CMakeLists.txt +++ b/build/tizen/examples-reel/CMakeLists.txt @@ -19,6 +19,11 @@ ELSEIF(ANDROID) ${EXAMPLES_REEL_SRCS} "${ROOT_SRC_DIR}/shared/execute-process-android.cpp" ) +ELSEIF(TIZEN) + SET(EXAMPLES_REEL_SRCS + ${EXAMPLES_REEL_SRCS} + "${ROOT_SRC_DIR}/shared/execute-process-tizen.cpp" + ) ELSE() SET(EXAMPLES_REEL_SRCS ${EXAMPLES_REEL_SRCS} diff --git a/build/tizen/tests-reel/CMakeLists.txt b/build/tizen/tests-reel/CMakeLists.txt index a4d0af88..a4a04d95 100644 --- a/build/tizen/tests-reel/CMakeLists.txt +++ b/build/tizen/tests-reel/CMakeLists.txt @@ -19,6 +19,11 @@ ELSEIF(ANDROID) ${TESTS_REEL_SRCS} "${ROOT_SRC_DIR}/shared/execute-process-android.cpp" ) +ELSEIF(TIZEN) + SET(TESTS_REEL_SRCS + ${TESTS_REEL_SRCS} + "${ROOT_SRC_DIR}/shared/execute-process-tizen.cpp" + ) ELSE() SET(TESTS_REEL_SRCS ${TESTS_REEL_SRCS} |