From eb5efc0ac68a4545decb199f5ec2c28dfa2820a3 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Thu, 28 Dec 2017 19:20:18 +0900 Subject: [PATCH] Divide image files into each profile Change-Id: Iaf4ad7796b3dcd118ebd64a278992505b94888d6 --- CMakeLists.txt | 18 +----------------- packaging/boot-animation.spec | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74889df..ad24b40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,20 +80,6 @@ ADD_CUSTOM_COMMAND(OUTPUT 360x360_PowerOff.edj ${CMAKE_SOURCE_DIR}/res/edje/360x360/360x360_PowerOff_image.h ${CMAKE_SOURCE_DIR}/res/edje/360x360/360x360_PowerOff_part.h ) -ADD_CUSTOM_COMMAND(OUTPUT 360x480_PowerOn.edj - COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images/ - ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOn.edc ${CMAKE_BINARY_DIR}/360x480_PowerOn.edj - DEPENDS ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOn.edc - ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOn_image.h - ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOn_part.h -) -ADD_CUSTOM_COMMAND(OUTPUT 360x480_PowerOff.edj - COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images/ - ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOff.edc ${CMAKE_BINARY_DIR}/360x480_PowerOff.edj - DEPENDS ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOff.edc - ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOff_image.h - ${CMAKE_SOURCE_DIR}/res/edje/360x480/360x480_PowerOff_part.h -) ADD_CUSTOM_COMMAND(OUTPUT 480x800_PowerOn.edj COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/res/images/ ${CMAKE_SOURCE_DIR}/res/edje/480x800/480x800_PowerOn.edc ${CMAKE_BINARY_DIR}/480x800_PowerOn.edj @@ -122,15 +108,13 @@ ADD_CUSTOM_COMMAND(OUTPUT 720x1280_PowerOff.edj ${CMAKE_SOURCE_DIR}/res/edje/720x1280/720x1280_PowerOff_image.h ${CMAKE_SOURCE_DIR}/res/edje/720x1280/720x1280_PowerOff_part.h ) -ADD_CUSTOM_TARGET(edj_build DEPENDS 360x360_PowerOn.edj 360x360_PowerOff.edj 360x480_PowerOn.edj 360x480_PowerOff.edj 480x800_PowerOn.edj 480x800_PowerOff.edj 720x1280_PowerOn.edj 720x1280_PowerOff.edj) +ADD_CUSTOM_TARGET(edj_build DEPENDS 360x360_PowerOn.edj 360x360_PowerOff.edj 480x800_PowerOn.edj 480x800_PowerOff.edj 720x1280_PowerOn.edj 720x1280_PowerOff.edj) ADD_DEPENDENCIES(${PROJECT_NAME} edj_build) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) INSTALL(FILES ${CMAKE_BINARY_DIR}/360x360_PowerOn.edj DESTINATION share/edje) INSTALL(FILES ${CMAKE_BINARY_DIR}/360x360_PowerOff.edj DESTINATION share/edje) -INSTALL(FILES ${CMAKE_BINARY_DIR}/360x480_PowerOn.edj DESTINATION share/edje) -INSTALL(FILES ${CMAKE_BINARY_DIR}/360x480_PowerOff.edj DESTINATION share/edje) INSTALL(FILES ${CMAKE_BINARY_DIR}/480x800_PowerOn.edj DESTINATION share/edje) INSTALL(FILES ${CMAKE_BINARY_DIR}/480x800_PowerOff.edj DESTINATION share/edje) INSTALL(FILES ${CMAKE_BINARY_DIR}/720x1280_PowerOn.edj DESTINATION share/edje) diff --git a/packaging/boot-animation.spec b/packaging/boot-animation.spec index 5486a39..7585628 100644 --- a/packaging/boot-animation.spec +++ b/packaging/boot-animation.spec @@ -51,7 +51,7 @@ Conflicts: boot-animation-sound-file-profile_common Conflicts: boot-animation-extension-emulator %description sound-file-profile_wearable -Boot-up sound file from B2 device. +Boot-up sound file from Wearable device. %package extension_emulator Summary: Boot Sound for SDK Emulator @@ -60,7 +60,7 @@ Conflicts: boot-animation-sound-file-profile_wearable Conflicts: boot-animation-sound-file-profile_common %description extension_emulator -Boot-up sound file for SDK emulator. +Boot-up sound file for Tizen emulator. %prep %setup -q @@ -101,12 +101,6 @@ mv /usr/share/keysound/poweron.wav /usr/share/keysound/poweron.sdk.wav %files %manifest boot-animation.manifest -/usr/share/edje/360x360_PowerOn.edj -/usr/share/edje/360x360_PowerOff.edj -/usr/share/edje/360x480_PowerOn.edj -/usr/share/edje/360x480_PowerOff.edj -/usr/share/edje/480x800_PowerOn.edj -/usr/share/edje/480x800_PowerOff.edj /usr/share/edje/720x1280_PowerOn.edj /usr/share/edje/720x1280_PowerOff.edj %license LICENSE @@ -118,9 +112,19 @@ mv /usr/share/keysound/poweron.wav /usr/share/keysound/poweron.sdk.wav %files sound-file-profile_common /usr/share/keysound/poweron.ogg +/usr/share/edje/720x1280_PowerOn.edj +/usr/share/edje/720x1280_PowerOff.edj %files sound-file-profile_wearable /usr/share/keysound/poweron.wearable.ogg +/usr/share/edje/360x360_PowerOn.edj +/usr/share/edje/360x360_PowerOff.edj %files extension_emulator /usr/share/keysound/poweron.sdk.wav +/usr/share/edje/360x360_PowerOn.edj +/usr/share/edje/360x360_PowerOff.edj +/usr/share/edje/480x800_PowerOn.edj +/usr/share/edje/480x800_PowerOff.edj +/usr/share/edje/720x1280_PowerOn.edj +/usr/share/edje/720x1280_PowerOff.edj -- 2.7.4