From: jooseok.park Date: Fri, 7 Sep 2012 04:52:17 +0000 (+0900) Subject: emul check logic is changed(using capi-system-info) X-Git-Tag: 2.0_alpha^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;p=platform%2Fcore%2Fappfw%2Fsppc.git emul check logic is changed(using capi-system-info) --- diff --git a/arm/bin/push_tool b/arm/bin/push_tool index 7697071..fc90f5e 100755 Binary files a/arm/bin/push_tool and b/arm/bin/push_tool differ diff --git a/arm/bin/pushd b/arm/bin/pushd index e9c7c73..83b8fe1 100755 Binary files a/arm/bin/pushd and b/arm/bin/pushd differ diff --git a/arm/etc/init.d/pushd b/arm/etc/init.d/pushd new file mode 100755 index 0000000..09f9681 --- /dev/null +++ b/arm/etc/init.d/pushd @@ -0,0 +1,59 @@ +#!/bin/sh + +DESC="Push service daemon" +NAME=pushd +DAEMON=/usr/bin/$NAME +SCRIPTNAME=/etc/init.d/$NAME + +[ -x "$DAEMON" ] || exit 0 + +do_start() { + PID=`pidof $NAME` + [ -z "$PID" ] || return 1 + $DAEMON + RETVAL=$? + return "$RETVAL" +} + +do_stop() { + PID=`pidof $NAME` + if [ -n "$PID" ]; then + kill $PID + fi + return 0 +} + +prt_res() { + RETVAL=$1 + + case "$RETVAL" in + 0|1) + echo "... done." + RETVAL=0 + ;; + *) + echo "... failed!" + RETVAL=1 + ;; + esac + + return $RETVAL +} + +case "$1" in + start) + echo "Starting $DESC" "$NAME" + do_start + prt_res $? + ;; + stop) + echo "Stopping $DESC" "$NAME" + do_stop + prt_res $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop}" >&2 + exit 3 + ;; +esac + diff --git a/arm/etc/rc.d/rc3.d/S90pushd b/arm/etc/rc.d/rc3.d/S90pushd new file mode 120000 index 0000000..70c8ff9 --- /dev/null +++ b/arm/etc/rc.d/rc3.d/S90pushd @@ -0,0 +1 @@ +/etc/init.d/pushd \ No newline at end of file diff --git a/arm/etc/rc.d/rc5.d/S90pushd b/arm/etc/rc.d/rc5.d/S90pushd new file mode 120000 index 0000000..70c8ff9 --- /dev/null +++ b/arm/etc/rc.d/rc5.d/S90pushd @@ -0,0 +1 @@ +/etc/init.d/pushd \ No newline at end of file diff --git a/arm/lib/libpush.so.0.2.12 b/arm/lib/libpush.so.0.2.12 index 0bfffe3..966a35f 100644 Binary files a/arm/lib/libpush.so.0.2.12 and b/arm/lib/libpush.so.0.2.12 differ diff --git a/arm/lib/systemd/user/pushd.service b/arm/lib/systemd/user/pushd.service new file mode 100644 index 0000000..0603ebf --- /dev/null +++ b/arm/lib/systemd/user/pushd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Pushd service + +[Service] +Type=forking +ExecStart=/usr/bin/pushd + +[Install] +WantedBy=tizen-middleware.target diff --git a/arm/lib/systemd/user/tizen-middleware.target.wants/pushd.service b/arm/lib/systemd/user/tizen-middleware.target.wants/pushd.service new file mode 120000 index 0000000..21d0bfc --- /dev/null +++ b/arm/lib/systemd/user/tizen-middleware.target.wants/pushd.service @@ -0,0 +1 @@ +../pushd.service \ No newline at end of file diff --git a/packaging/push.spec b/packaging/push.spec index 96fa394..f6ec170 100755 --- a/packaging/push.spec +++ b/packaging/push.spec @@ -1,11 +1,11 @@ Name: push Summary: Push services and client library. -Version: 0.2.21 +Version: 0.2.23 Release: 1 Group: TO_BE_FILLED License: TO_BE_FILLED Source0: %{name}-%{version}.tar.gz -Source1: push.init + %description Push services and client library. @@ -46,6 +46,8 @@ Requires: %{name}-bin = %{version}-%{release} %description tool Push service tool + + %prep %setup -q @@ -54,12 +56,15 @@ Push service tool %install rm -rf %{buildroot} -mkdir -p %{buildroot}/etc/init.d -install -m 0755 %{SOURCE1} %{buildroot}/etc/init.d/pushd + mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_libdir}/pkgconfig mkdir -p %{buildroot}%{_includedir} mkdir -p %{buildroot}/usr/share/push +mkdir -p %{buildroot}%{_sysconfdir}/init.d +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/{rc3.d,rc5.d} +mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants + %ifarch %{arm} #libpush @@ -71,6 +76,11 @@ cp -a arm/lib/libpush.so %{buildroot}%{_libdir} #push-bin cp -a arm/bin/pushd %{buildroot}%{_bindir} cp -a arm/share/push/PushServerTrust.cer %{buildroot}/usr/share/push/PushServerTrust.cer +cp -a arm/etc/init.d/pushd %{buildroot}%{_sysconfdir}/init.d/pushd +cp -a arm/etc/rc.d/rc3.d/S90pushd %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S90pushd +cp -a arm/etc/rc.d/rc5.d/S90pushd %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S90pushd +cp -a arm/lib/systemd/user/pushd.service %{buildroot}%{_libdir}/systemd/user/pushd.service +cp -a arm/lib/systemd/user/tizen-middleware.target.wants/pushd.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/pushd.service #push-tool cp -a arm/bin/push_tool %{buildroot}%{_bindir} %else @@ -83,20 +93,22 @@ cp -a x86/lib/libpush.so %{buildroot}%{_libdir} #push-bin cp -a x86/bin/pushd %{buildroot}%{_bindir} cp -a x86/share/push/PushServerTrust.cer %{buildroot}/usr/share/push/PushServerTrust.cer +cp -a x86/etc/init.d/pushd %{buildroot}%{_sysconfdir}/init.d/pushd +cp -a x86/etc/rc.d/rc3.d/S90pushd %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S90pushd +cp -a x86/etc/rc.d/rc5.d/S90pushd %{buildroot}%{_sysconfdir}/rc.d/rc5.d/S90pushd +cp -a x86/lib/systemd/user/pushd.service %{buildroot}%{_libdir}/systemd/user/pushd.service +cp -a x86/lib/systemd/user/tizen-middleware.target.wants/pushd.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/pushd.service #push-tool cp -a x86/bin/push_tool %{buildroot}%{_bindir} %endif %post bin - mkdir -p /opt/dbspace sqlite3 /opt/dbspace/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null chown root:5000 /opt/dbspace/.push.db chown root:5000 /opt/dbspace/.push.db-journal chmod 660 /opt/dbspace/.push.db chmod 660 /opt/dbspace/.push.db-journal -ln -s /etc/init.d/pushd /etc/rc.d/rc3.d/S90pushd -ln -s /etc/init.d/pushd /etc/rc.d/rc5.d/S90pushd _VER="1" @@ -133,8 +145,31 @@ vconftool unset file/private/push-bin/devtk %files bin %{_bindir}/pushd -/etc/init.d/pushd /usr/share/push/*.cer +/etc/init.d/pushd +/etc/rc.d/rc3.d/S90pushd +/etc/rc.d/rc5.d/S90pushd +/usr/lib/systemd/user/pushd.service +/usr/lib/systemd/user/tizen-middleware.target.wants/pushd.service %files tool %{_bindir}/push_tool + +%changelog +* Fri Sep 7 2012 Jooseok Park - 0.2.23 +- emul check logic is changed(using capi-system-info) +* Tue Sep 4 2012 Jooseok Park - 0.2.22 +- decoding of message with space character which is urlencoded to "+" +* Wed Aug 29 2012 Jooseok Park - 0.2.21 +- package uninstalled event added +* Fri Aug 17 2012 Jooseok Park - 0.2.20 +- debug msg added & some internal function name changed +* Wed Aug 8 2012 Jooseok Park - 0.2.19 +- push noti default action is silent, and old key is deleted +* Wed Aug 8 2012 Jooseok Park - 0.2.18 +- tapi imei api is changed for new tapi +* Tue Aug 7 2012 Jooseok Park - 0.2.17 +- emulator check func is added +* Wed Jul 25 2012 Jooseok Park - 0.2.16 +- OSP Push noti support(alertMessage,..) + diff --git a/packaging/pushd.service b/packaging/pushd.service new file mode 100644 index 0000000..0603ebf --- /dev/null +++ b/packaging/pushd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Pushd service + +[Service] +Type=forking +ExecStart=/usr/bin/pushd + +[Install] +WantedBy=tizen-middleware.target diff --git a/x86/bin/push_tool b/x86/bin/push_tool index 421bef6..8900e26 100755 Binary files a/x86/bin/push_tool and b/x86/bin/push_tool differ diff --git a/x86/bin/pushd b/x86/bin/pushd index b2d23c9..dd7b50a 100755 Binary files a/x86/bin/pushd and b/x86/bin/pushd differ diff --git a/x86/etc/init.d/pushd b/x86/etc/init.d/pushd new file mode 100755 index 0000000..09f9681 --- /dev/null +++ b/x86/etc/init.d/pushd @@ -0,0 +1,59 @@ +#!/bin/sh + +DESC="Push service daemon" +NAME=pushd +DAEMON=/usr/bin/$NAME +SCRIPTNAME=/etc/init.d/$NAME + +[ -x "$DAEMON" ] || exit 0 + +do_start() { + PID=`pidof $NAME` + [ -z "$PID" ] || return 1 + $DAEMON + RETVAL=$? + return "$RETVAL" +} + +do_stop() { + PID=`pidof $NAME` + if [ -n "$PID" ]; then + kill $PID + fi + return 0 +} + +prt_res() { + RETVAL=$1 + + case "$RETVAL" in + 0|1) + echo "... done." + RETVAL=0 + ;; + *) + echo "... failed!" + RETVAL=1 + ;; + esac + + return $RETVAL +} + +case "$1" in + start) + echo "Starting $DESC" "$NAME" + do_start + prt_res $? + ;; + stop) + echo "Stopping $DESC" "$NAME" + do_stop + prt_res $? + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop}" >&2 + exit 3 + ;; +esac + diff --git a/x86/etc/rc.d/rc3.d/S90pushd b/x86/etc/rc.d/rc3.d/S90pushd new file mode 120000 index 0000000..70c8ff9 --- /dev/null +++ b/x86/etc/rc.d/rc3.d/S90pushd @@ -0,0 +1 @@ +/etc/init.d/pushd \ No newline at end of file diff --git a/x86/etc/rc.d/rc5.d/S90pushd b/x86/etc/rc.d/rc5.d/S90pushd new file mode 120000 index 0000000..70c8ff9 --- /dev/null +++ b/x86/etc/rc.d/rc5.d/S90pushd @@ -0,0 +1 @@ +/etc/init.d/pushd \ No newline at end of file diff --git a/x86/lib/libpush.so.0.2.12 b/x86/lib/libpush.so.0.2.12 index e2097a4..ff95723 100644 Binary files a/x86/lib/libpush.so.0.2.12 and b/x86/lib/libpush.so.0.2.12 differ diff --git a/x86/lib/systemd/user/pushd.service b/x86/lib/systemd/user/pushd.service new file mode 100644 index 0000000..0603ebf --- /dev/null +++ b/x86/lib/systemd/user/pushd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Pushd service + +[Service] +Type=forking +ExecStart=/usr/bin/pushd + +[Install] +WantedBy=tizen-middleware.target diff --git a/x86/lib/systemd/user/tizen-middleware.target.wants/pushd.service b/x86/lib/systemd/user/tizen-middleware.target.wants/pushd.service new file mode 120000 index 0000000..21d0bfc --- /dev/null +++ b/x86/lib/systemd/user/tizen-middleware.target.wants/pushd.service @@ -0,0 +1 @@ +../pushd.service \ No newline at end of file