packaging: Build weston-clients to weston-ivi-shell

In order to run weston-clients on weston-ivi-shell, weston-clients
should be built in weston-ivi-shell package.

Change-Id: Ic4ac3cd9896bf3dbf112919226d55516605de994
Signed-off-by: Xiong Zhang <xiong.y.zhang@intel.com>

3 files changed, 69 insertions, 24 deletions

diff --git a/packaging/weston-ivi-shell.changes b/packaging/weston-ivi-shell.changes
index 318a82e0..954f1c02 100644
--- a/packaging/weston-ivi-shell.changes
+++ b/packaging/weston-ivi-shell.changes
@@ -1,3 +1,8 @@
+* Tue Aug 12 2014 Ossama Othman <ossama.othman@intel.com> accepted/tizen/ivi/20140701.104524-1-gf53cf2f
+- packaging: ship weston-ivi-shell-user-interface and resources
+- packaging: share protocol file and stubs
+- Build weston-clients to weston-ivi-shell
+
 * Tue Jun 24 2014 Ossama Othman <ossama.othman@intel.com> 1aa3fe8
 - Update to latest version that supports Weston 1.5.
 
diff --git a/packaging/weston-ivi-shell.spec b/packaging/weston-ivi-shell.spec
index 853fa292..c3b16442 100644
--- a/packaging/weston-ivi-shell.spec
+++ b/packaging/weston-ivi-shell.spec
@@ -35,10 +35,18 @@ Requires:  %{name} = %{version}-%{release}
 This package provides header files and other developer releated files
 for package %{name}.
 
+%package clients
+Summary: Sample clients for package %{name}
+Group:   Graphics & UI Framework/Development
+%description clients
+This package provides a set of example ivi wayland clients useful for
+validating the functionality of wayland with very little dependencies
+on other system components.
+
 %package config
 Summary:    Tizen IVI Weston configuration for package %{name}
 Group:      Automotive/Configuration
-Requires:   weston-clients
+Requires:   weston-ivi-shell-clients
 Requires:   weekeyboard
 Requires:   genivi-shell
 Conflicts:  weston-ivi-config
@@ -55,7 +63,6 @@ cp %{SOURCE1001} .
 # unrelated.
 %autogen \
     --disable-static \
-    --disable-egl \
     --disable-libunwind \
     --disable-xwayland \
     --disable-xwayland-test \
@@ -66,9 +73,10 @@ cp %{SOURCE1001} .
     --disable-wayland-compositor \
     --disable-headless-compositor \
     --disable-weston-launch \
+    --enable-simple-clients \
     --enable-clients \
     --disable-wcap-tools \
-    --disable-demo-clients-install \
+    --enable-demo-clients-install \
     --disable-libinput-backend \
     --disable-fullscreen-shell \
     --disable-desktop-shell \
@@ -81,6 +89,26 @@ cp %{SOURCE1001} .
 %install
 %make_install
 
+# install example clients
+%define ivi_shell_client_dir %{_bindir}/ivi
+mkdir -p %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-calibrator %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-simple-touch %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-simple-shm %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-simple-egl %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-flower %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-image %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-cliptest %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-dnd %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-editor %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-smoke %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-resizor %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-eventdemo %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-clickdot %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-subsurfaces %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-transformed %{buildroot}%{ivi_shell_client_dir}
+install -m 755 weston-fullscreen %{buildroot}%{ivi_shell_client_dir}
+
 install -d %{buildroot}/%{_datadir}/%{name}/protocol/
 
 install -m 644 protocol/*.xml \
@@ -105,10 +133,14 @@ cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 %manifest %{name}.manifest
 %defattr(-,root,root)
 %license COPYING
-%_libdir/weston
+%_libdir/weston/ivi-shell.so
+%_libdir/weston/ivi-layout.so
+%_libdir/weston/hmi-controller.so
 %_libexecdir/weston-ivi-shell-user-interface
 %_datadir/weston/*
 
+%exclude %_bindir/weston
+%exclude %_libdir/weston/desktop-shell.so
 
 %files devel
 %manifest %{name}.manifest
@@ -119,6 +151,24 @@ cp -rfva data/* %{buildroot}/%{_datadir}/weston/
 %_includedir/weston/ivi-layout-transition.h
 %{_datadir}/%{name}/protocol/*
 
+%files clients
+%manifest %{name}.manifest
+%{ivi_shell_client_dir}/weston-simple-touch
+%{ivi_shell_client_dir}/weston-simple-shm
+%{ivi_shell_client_dir}/weston-simple-egl
+%{ivi_shell_client_dir}/weston-flower
+%{ivi_shell_client_dir}/weston-image
+%{ivi_shell_client_dir}/weston-cliptest
+%{ivi_shell_client_dir}/weston-dnd
+%{ivi_shell_client_dir}/weston-editor
+%{ivi_shell_client_dir}/weston-smoke
+%{ivi_shell_client_dir}/weston-resizor
+%{ivi_shell_client_dir}/weston-eventdemo
+%{ivi_shell_client_dir}/weston-clickdot
+%{ivi_shell_client_dir}/weston-subsurfaces
+%{ivi_shell_client_dir}/weston-transformed
+%{ivi_shell_client_dir}/weston-fullscreen
+%{ivi_shell_client_dir}/weston-calibrator
 
 %files config
 %manifest %{name}.manifest
diff --git a/packaging/weston.ini b/packaging/weston.ini
index 07dcb2d6..b45d2602 100644
--- a/packaging/weston.ini
+++ b/packaging/weston.ini
@@ -47,68 +47,58 @@ path=/usr/libexec/weston-keyboard
 workspace-id=0
 icon-id=4001
 icon=/usr/share/weston/icon_ivi_flower.png
-path=/usr/bin/weston-editor
-setid-window-titles=
+path=/usr/bin/ivi/weston-flower
 
 [ivi-launcher]
 workspace-id=0
 icon-id=4002
 icon=/usr/share/weston/icon_ivi_clickdot.png
-path=/usr/bin/weston-dnd
-setid-window-titles=
+path=/usr/bin/ivi/weston-clickdot
 
 [ivi-launcher]
 workspace-id=1
 icon-id=4003
 icon=/usr/share/weston/icon_ivi_simple-egl.png
-path=/usr/bin/weston-simple-egl
-setid-window-titles=
+path=/usr/bin/ivi/weston-simple-egl
 
 [ivi-launcher]
 workspace-id=1
 icon-id=4004
 icon=/usr/share/weston/icon_ivi_simple-shm.png
-path=/usr/bin/weston-simple-shm
-setid-window-titles=
+path=/usr/bin/ivi/weston-simple-shm
 
 [ivi-launcher]
 workspace-id=2
 icon-id=4005
 icon=/usr/share/weston/icon_ivi_smoke.png
-path=/usr/bin/weston-smoke
-setid-window-titles=
+path=/usr/bin/ivi/weston-smoke
 
 [ivi-launcher]
 workspace-id=3
 icon-id=4006
 icon=/usr/share/weston/icon_ivi_flower.png
-path=/usr/bin/weston-flower
-setid-window-titles=
+path=/usr/bin/ivi/weston-flower
 
 [ivi-launcher]
 workspace-id=3
 icon-id=4007
 icon=/usr/share/weston/icon_ivi_clickdot.png
-path=/usr/bin/weston-clickdot
-setid-window-titles=
+path=/usr/bin/ivi/weston-clickdot
 
 [ivi-launcher]
 workspace-id=3
 icon-id=4008
 icon=/usr/share/weston/icon_ivi_simple-egl.png
-path=/usr/bin/weston-simple-egl
-setid-window-titles=
+path=/usr/bin/ivi/weston-simple-egl
 
 [ivi-launcher]
 workspace-id=3
 icon-id=4009
 icon=/usr/share/weston/icon_ivi_simple-shm.png
-path=/usr/bin/weston-simple-shm
-setid-window-titles=
+path=/usr/bin/ivi/weston-simple-shm
 
 [ivi-launcher]
 workspace-id=3
 icon-id=4010
 icon=/usr/share/weston/icon_ivi_smoke.png
-path=/usr/bin/weston-smoke
-setid-window-titles=
+path=/usr/bin/ivi/weston-smoke