Remove profile build dependency

To promote configurability and increase build performance,
we are unifying build projects, which requires to remove
the usage of macro "profile" and "repository".

This commit completely removed such macros in spec file.

Note

1. This commit is not required for Tizen 3.0 Release.
If you don't feel comfortable for Tizen 3.0 Release Schedule,
you may delay merging/SR of this commit.

2. With SR, Jira-TRE should be submitted so that
 a. Add boot-animation-sound-file-profile_wearable for wearable profile.
 b. Add boot-animation-extension-emulator for emulator images.
 c. Add boot-animation-sound-file-profile_common for common/ivi/mobile/tv profile

Change-Id: I3c3f3fa6d6ab738917dcf84f01cfd4657be60f43
CC: Changseok Oh <seok.oh@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 700b5e4b476e7ab8f3eab464fbc8c59c88e8e9ff..4d8b8f54f00d181c2550f2a1e10a2a41fad6c14d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(boot-animation C)
 
-IF("$ENV{CFLAGS}" MATCHES "-DMICRO_ANI")
-       OPTION(USE_MICRO_ANI "Use Micro Ani" ON)
-ENDIF()
-
 SET(SRCS
        src/boot.c
        src/animation.c
@@ -117,14 +113,6 @@ 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)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/720x1280_PowerOff.edj DESTINATION share/edje)
-IF("${ARCH}" STREQUAL "emulator")
-ADD_DEFINITIONS("-DEMULATOR_TYPE")
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/sound/SDK_poweron/poweron.wav DESTINATION share/keysound)
-ELSEIF("${ARCH}" STREQUAL "arm")
-ADD_DEFINITIONS("-DARM_TYPE")
-IF("${USE_MICRO_ANI}" STREQUAL "ON")
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/sound/B2_poweron/poweron.ogg DESTINATION share/keysound)
-ELSEIF("${USE_MICRO_ANI}" STREQUAL "OFF")
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/sound/poweron.sdk.wav DESTINATION share/keysound)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/sound/poweron.wearable.ogg DESTINATION share/keysound)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/sound/poweron.ogg DESTINATION share/keysound)
-ENDIF()
-ENDIF()

diff --git a/data/sound/B2_poweron/poweron.ogg b/data/sound/B2_poweron/poweron.ogg
deleted file mode 100644 (file)
index 001eb19..0000000
Binary files a/data/sound/B2_poweron/poweron.ogg and /dev/null differ

diff --git a/data/sound/SDK_poweron/poweron.wav b/data/sound/SDK_poweron/poweron.wav
deleted file mode 100755 (executable)
index 3ece28d..0000000
Binary files a/data/sound/SDK_poweron/poweron.wav and /dev/null differ

diff --git a/data/sound/poweron.sdk.wav b/data/sound/poweron.sdk.wav
new file mode 100644 (file)
index 0000000..3ece28d
Binary files /dev/null and b/data/sound/poweron.sdk.wav differ

diff --git a/data/sound/poweron.wearable.ogg b/data/sound/poweron.wearable.ogg
new file mode 100644 (file)
index 0000000..001eb19
Binary files /dev/null and b/data/sound/poweron.wearable.ogg differ

diff --git a/packaging/boot-animation.spec b/packaging/boot-animation.spec
index e6f7d53f7d364c07b3f0710e219ef565424d6e02..7eb66621f57fc09a26d76159d27e1ee95341daff 100644 (file)
--- a/packaging/boot-animation.spec
+++ b/packaging/boot-animation.spec
@@ -1,14 +1,8 @@
 #sbs-git:slp/pkgs/b/boot-animation boot-animation 0.2 d1bbca3948e4cdb6b2f9e75f176500f452fe6a33
 
-%if "%{?profile}" == "wearable"
-       %define micro_ani ON
-%else
-       %define micro_ani OFF
-%endif
-
 Name: boot-animation
-Version: 0.3.7
-Release: 7
+Version: 0.3.8
+Release: 1
 Summary: Boot animation
 URL: http://slp-source.sec.samsung.net
 Source: %{name}-%{version}.tar.gz
@@ -29,24 +23,48 @@ BuildRequires: pkgconfig(capi-appfw-preference)
 BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(capi-ui-efl-util)
-
+Requires: boot-animation-sound-file
+Recommends: boot-animation-sound-file-profile_common
 Requires(post): /usr/bin/vconftool
 
 %description
 Shows an animation and plays a sound when the device is booted or shutdown.
 
+%package sound-file-profile_common
+Summary: Default Boot Sound
+Provides: boot-animation-sound-file-profile_mobile = %{version}-%{release}
+Provides: boot-animation-sound-file-profile_tv = %{version}-%{release}
+Provides: boot-animation-sound-file-profile_ivi = %{version}-%{release}
+Provides: boot-animation-sound-file = %{version}-%{release}
+Conflicts: boot-animation-sound-file-profile_wearable
+Conflicts: boot-animation-extension_emulator
+
+%description sound-file-profile_common
+Provides the default boot-up sound file
+
+%package sound-file-profile_wearable
+Summary: Boot Sound for Wearable Profile
+Provides: boot-animation-sound-file = %{version}-%{release}
+Conflicts: boot-animation-sound-file-profile_common
+Conflicts: boot-animation-extension-emulator
+
+%description sound-file-profile_wearable
+Boot-up sound file from B2 device.
+
+%package extension_emulator
+Summary: Boot Sound for SDK Emulator
+Provides: boot-animation-sound-file = %{version}-%{release}
+Conflicts: boot-animation-sound-file-profile_wearable
+Conflicts: boot-animation-sound-file-profile_common
+
+%description extension_emulator
+Boot-up sound file for SDK emulator.
+
 %prep
 %setup -q
 #%patch0 -p1
 
-%build
-%ifarch %{arm}
-%define ARCH arm
-%else
-%define ARCH emulator
-%endif
-
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DUSE_MICRO_ANI=%{micro_ani} -DARCH=%{ARCH}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
 
 make %{?jobs:-j%jobs}
 
@@ -69,6 +87,17 @@ make clean
 
 %post
 
+%post sound-file-profile_wearable
+mv /usr/share/keysound/poweron.wearable.ogg /usr/share/keysound/poweron.ogg
+
+%preun sound-file-profile_wearable
+mv /usr/share/keysound/poweron.ogg /usr/share/keysound/poweron.wearable.ogg
+
+%post extension_emulator
+mv /usr/share/keysound/poweron.sdk.wav /usr/share/keysound/poweron.wav
+
+%preun extension_emulator
+mv /usr/share/keysound/poweron.wav /usr/share/keysound/poweron.sdk.wav
 
 %files
 %manifest boot-animation.manifest
@@ -80,16 +109,18 @@ make clean
 /usr/share/edje/480x800_PowerOff.edj
 /usr/share/edje/720x1280_PowerOn.edj
 /usr/share/edje/720x1280_PowerOff.edj
-%if %{?ARCH} == arm
-/usr/share/keysound/poweron.ogg
-%else
-/usr/share/keysound/poweron.wav
-%endif
-%if %{?ARCH} == emulator
-%endif
 /usr/share/license/%{name}
 %{_bindir}/boot-animation
 /usr/lib/systemd/system/boot-animation.service
 /usr/lib/systemd/system/shutdown-animation.service
 /usr/lib/systemd/system/boot-animation.path
 /usr/lib/systemd/system/multi-user.target.wants/boot-animation.path
+
+%files sound-file-profile_common
+/usr/share/keysound/poweron.ogg
+
+%files sound-file-profile_wearable
+/usr/share/keysound/poweron.wearable.ogg
+
+%files extension_emulator
+/usr/share/keysound/poweron.sdk.wav