summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Wu <zhiwen.wu@linux.intel.com>2014-01-20 09:46:44 +0800
committerAlex Wu <zhiwen.wu@linux.intel.com>2014-01-20 09:52:21 +0800
commit783ee57e3962d2510162bf4b1352e0868b1c6c81 (patch)
tree50dca12c09f236c58993dfb04d55ba7efe76f892
parent45cb90a39a08c7159a1fc18987f7def8c09a5cae (diff)
downloadweston-mobile-shell-783ee57e3962d2510162bf4b1352e0868b1c6c81.tar.gz
weston-mobile-shell-783ee57e3962d2510162bf4b1352e0868b1c6c81.tar.bz2
weston-mobile-shell-783ee57e3962d2510162bf4b1352e0868b1c6c81.zip
Transfer wayland environment into weston.shsubmit/devel/wayland/20140120.033126
Intent to maintain one copy of wayland environment configuration. If any program need wayland enviroment, it should introduce /run/tizen-mobile-ui which includes enviroment provided by weston.sh Change-Id: Ie8631f8d01af447fbd8dbbe47bed6558ed0c2281 Signed-off-by: Alex Wu <zhiwen.wu@linux.intel.com>
-rw-r--r--packaging/mobile-shell.spec2
-rwxr-xr-xsettings/weston-client-env11
-rwxr-xr-xsettings/weston.sh7
3 files changed, 7 insertions, 13 deletions
diff --git a/packaging/mobile-shell.spec b/packaging/mobile-shell.spec
index 31c617a..d14906b 100644
--- a/packaging/mobile-shell.spec
+++ b/packaging/mobile-shell.spec
@@ -53,7 +53,6 @@ install -m 777 settings/weston.sh $RPM_BUILD_ROOT/etc/profile.d/weston.sh
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/
ln -sf /run/tizen-mobile-ui $RPM_BUILD_ROOT/etc/sysconfig/launchpad
-install -m 755 settings/weston-client-env $RPM_BUILD_ROOT/etc/sysconfig/
mkdir -p $RPM_BUILD_ROOT/%{_udev_libdir}/rules.d
install -m 644 settings/99-tty.rules $RPM_BUILD_ROOT/%{_udev_libdir}/rules.d/
@@ -73,7 +72,6 @@ install -m 644 settings/99-tty.rules $RPM_BUILD_ROOT/%{_udev_libdir}/rules.d/
%{_unitdir_user}/weston.target
%{_unitdir_user}/weston.target.wants/weston.service
/etc/profile.d/weston.sh
-/etc/sysconfig/weston-client-env
/etc/sysconfig/launchpad
%attr(0644,root,root) %{_udev_libdir}/rules.d/99-tty.rules
diff --git a/settings/weston-client-env b/settings/weston-client-env
deleted file mode 100755
index 4cff9c4..0000000
--- a/settings/weston-client-env
+++ /dev/null
@@ -1,11 +0,0 @@
-XDG_CONFIG_HOME=/etc
-XDG_RUNTIME_DIR=/run/user/app
-ELM_SCALE=0.7
-ELM_FPS=120
-ECORE_IMF_MODULE=wayland
-ELM_THUMBSCROLL_THRESHOLD=1
-ELM_PROFILE=mobile
-ELM_ENGINE=wayland_egl
-ECORE_EVAS_ENGINE=wayland_egl
-ELM_THEME=/usr/share/elementary/themes/tizen-hd.edj
-ELM_SCROLL_SMOOTH_TIME_INTERVAL=0.008
diff --git a/settings/weston.sh b/settings/weston.sh
index a4c1a40..38c748a 100755
--- a/settings/weston.sh
+++ b/settings/weston.sh
@@ -3,3 +3,10 @@ export ECORE_EVAS_ENGINE=wayland_egl
# Make EFL apps use the wayland-based input method.
export ECORE_IMF_MODULE=wayland
+
+export ELM_SCALE=0.7
+export ELM_FPS=120
+export ELM_THUMBSCROLL_THRESHOLD=1
+export ELM_PROFILE=mobile
+export ELM_THEME=/usr/share/elementary/themes/tizen-hd.edj
+export ELM_SCROLL_SMOOTH_TIME_INTERVAL=0.008