From 2c23a90e5de1cbc41e0ee974db53e97330a7ead3 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Thu, 25 Jun 2020 11:24:28 +0900 Subject: [PATCH] [Tizen] Change target share directory from dali to dali-legacy Change-Id: I854e6e6f307708af3f7ec5e64f3fde930fd2e34e Signed-off-by: Seungho, Baek --- CMakeLists.txt | 10 +++++----- build/tizen/CMakeLists.txt | 12 ++++++------ packaging/dali-toolkit.spec | 20 ++++++++++++++++++-- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbd38b4..eba4398 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,11 @@ PROJECT (dali-toolkit) ADD_DEFINITIONS( -DDALI_ENV="../../dali-env" --DDALI_DATA_READ_ONLY_DIR=DALI_ENV"/opt/share/dali" --DDALI_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/images/" --DDALI_STYLE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/" --DDALI_SOUND_DIR=DALI_ENV"/opt/share/dali/toolkit/sounds/" --DDALI_STYLE_IMAGE_DIR=DALI_ENV"/opt/share/dali/toolkit/styles/images/" +-DDALI_DATA_READ_ONLY_DIR=DALI_ENV"/opt/share/dali-legacy" +-DDALI_IMAGE_DIR=DALI_ENV"/opt/share/dali-legacy/toolkit/images/" +-DDALI_STYLE_DIR=DALI_ENV"/opt/share/dali-legacy/toolkit/styles/" +-DDALI_SOUND_DIR=DALI_ENV"/opt/share/dali-legacy/toolkit/sounds/" +-DDALI_STYLE_IMAGE_DIR=DALI_ENV"/opt/share/dali-legacy/toolkit/styles/images/" -DCURL_STATICLIB=0 /DBUILDING_DALI_TOOLKIT /vmg diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 25edb06..fde4eb2 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -79,13 +79,13 @@ SET( toolkit_style_images_dir ${STYLE_DIR}/images ) IF( DEFINED ENV{DALI_DATA_RW_DIR} ) SET( dataReadWriteDir $ENV{DALI_DATA_RW_DIR} ) ELSE() - SET( dataReadWriteDir ${CMAKE_INSTALL_PREFIX}/share/dali/ ) + SET( dataReadWriteDir ${CMAKE_INSTALL_PREFIX}/share/dali-legacy/ ) ENDIF() IF( DEFINED ENV{DALI_DATA_RO_DIR} ) SET( dataReadOnlyDir $ENV{DALI_DATA_RO_DIR} ) ELSE() - SET( dataReadOnlyDir ${CMAKE_INSTALL_PREFIX}/share/dali/ ) + SET( dataReadOnlyDir ${CMAKE_INSTALL_PREFIX}/share/dali-legacy/ ) ENDIF() # Set up compiler definitions @@ -115,10 +115,10 @@ IF( WIN32 ) SET( INSTALL_SHARE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share" ) ENDIF() - ADD_DEFINITIONS( -DDALI_IMAGE_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/images/\" - -DDALI_SOUND_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/sounds/\" - -DDALI_STYLE_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/styles/\" - -DDALI_STYLE_IMAGE_DIR=\"${INSTALL_SHARE_DIR}/dali/toolkit/styles/images/\" + ADD_DEFINITIONS( -DDALI_IMAGE_DIR=\"${INSTALL_SHARE_DIR}/dali-legacy/toolkit/images/\" + -DDALI_SOUND_DIR=\"${INSTALL_SHARE_DIR}/dali-legacy/toolkit/sounds/\" + -DDALI_STYLE_DIR=\"${INSTALL_SHARE_DIR}/dali-legacy/toolkit/styles/\" + -DDALI_STYLE_IMAGE_DIR=\"${INSTALL_SHARE_DIR}/dali-legacy/toolkit/styles/images/\" -DDALI_DATA_READ_ONLY_DIR=\"${INSTALL_SHARE_DIR}/\" ) ENDIF() ELSEIF( UNIX ) diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 6c2f417..71dced0 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -88,8 +88,8 @@ Application development package for Dali 3D engine toolkit - headers and package %prep %setup -q -%define dali_data_rw_dir %TZ_SYS_SHARE/dali/ -%define dali_data_ro_dir %TZ_SYS_RO_SHARE/dali/ +%define dali_data_rw_dir %TZ_SYS_SHARE/dali-legacy/ +%define dali_data_ro_dir %TZ_SYS_RO_SHARE/dali-legacy/ %define dali_toolkit_image_files %{dali_data_ro_dir}/toolkit/images/ %define dali_toolkit_sound_files %{dali_data_ro_dir}/toolkit/sounds/ @@ -194,6 +194,7 @@ popd %pre resources_360x360 case "$1" in 2) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf ./* popd @@ -203,6 +204,7 @@ esac %pre resources_480x800 case "$1" in 2) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf ./* popd @@ -212,6 +214,7 @@ esac %pre resources_720x1280 case "$1" in 2) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf ./* popd @@ -221,6 +224,7 @@ esac %pre resources_1920x1080 case "$1" in 2) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf ./* popd @@ -235,21 +239,25 @@ esac exit 0 %post resources_360x360 +mkdir -p %{dali_toolkit_style_files}/360x360 pushd %{dali_toolkit_style_files}/360x360 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done popd %post resources_480x800 +mkdir -p %{dali_toolkit_style_files}/480x800 pushd %{dali_toolkit_style_files}/480x800 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done popd %post resources_720x1280 +mkdir -p %{dali_toolkit_style_files}/720x1280 pushd %{dali_toolkit_style_files}/720x1280 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done popd %post resources_1920x1080 +mkdir -p %{dali_toolkit_style_files}/1920x1080 pushd %{dali_toolkit_style_files}/1920x1080 for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done popd @@ -262,6 +270,7 @@ popd case "$1" in 0) %preun resources_360x360 + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} mv images ./360x360 mv dali-toolkit-default-theme.json ./360x360 @@ -273,6 +282,7 @@ esac case "$1" in 0) %preun resources_480x800 + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} mv images ./480x800 mv dali-toolkit-default-theme.json ./480x800 @@ -284,6 +294,7 @@ esac case "$1" in 0) %preun resources_720x1280 + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} mv images ./720x1280 mv dali-toolkit-default-theme.json ./720x1280 @@ -295,6 +306,7 @@ esac case "$1" in 0) %preun resources_1920x1080 + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} mv images ./1920x1080 mv dali-toolkit-default-theme.json ./1920x1080 @@ -312,6 +324,7 @@ exit 0 %postun resources_360x360 case "$1" in 0) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf * popd @@ -321,6 +334,7 @@ esac %postun resources_480x800 case "$1" in 0) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf * popd @@ -330,6 +344,7 @@ esac %postun resources_720x1280 case "$1" in 0) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf * popd @@ -339,6 +354,7 @@ esac %postun resources_1920x1080 case "$1" in 0) + mkdir -p %{dali_toolkit_style_files} pushd %{dali_toolkit_style_files} rm -rf * popd -- 2.7.4