summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt20
-rw-r--r--NOTICE1
-rw-r--r--data/CMakeLists.txt10
-rw-r--r--data/crash-worker.edc (renamed from data/crash-worker-sdk.edc)16
-rw-r--r--org.tizen.crash-worker-sdk.desktop.in8
-rwxr-xr-xorg.tizen.crash-worker.png (renamed from org.tizen.crash-worker-sdk.png)bin9181 -> 9181 bytes
-rw-r--r--org.tizen.crash-worker.xml9
-rw-r--r--packaging/crash-worker-sdk.spec49
-rw-r--r--packaging/org.tizen.crash-worker-sdk.spec45
-rw-r--r--po/CMakeLists.txt2
-rw-r--r--po/crash-worker.pot (renamed from po/crash-worker-sdk.pot)0
-rwxr-xr-xpo/update-po.sh2
-rw-r--r--src/_logic.c1
-rw-r--r--src/crash-worker-sdk.c34
-rw-r--r--src/crash-worker-sdk.h4
15 files changed, 109 insertions, 92 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 973adda..0259847 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,16 +8,16 @@ SET(SRCS
)
SET(VENDOR "tizen")
-SET(PACKAGE ${PROJECT_NAME})
-SET(PKGNAME "org.${VENDOR}.${PACKAGE}")
+SET(PACKAGE "crash-worker")
+SET(PKGNAME "org.tizen.crash-worker")
SET(EXENAME "crash-worker")
SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(BINDIR "${PREFIX}/bin")
-SET(RESDIR "${PREFIX}/res")
+SET(BINDIR "${PREFIX}/apps/${PKGNAME}/bin")
+SET(RESDIR "${PREFIX}/apps/${PKGNAME}/res")
SET(DATADIR "${PREFIX}/data")
SET(LOCALEDIR "${RESDIR}/locale")
-SET(ICONDIR "${RESDIR}/icons/default/small")
-SET(IMAGEDIR "${RESDIR}/images/${PACKAGE}")
+SET(ICONDIR "${PREFIX}/share/icons/default/small")
+SET(IMAGEDIR "${RESDIR}/images/crash-worker")
SET(EDJDIR "${RESDIR}/edje")
IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -73,12 +73,10 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
ADD_EXECUTABLE(${EXENAME} ${SRCS})
TARGET_LINK_LIBRARIES(${EXENAME} ${pkgs_LDFLAGS})
+INSTALL(TARGETS ${EXENAME} DESTINATION ${BINDIR})
-INSTALL(TARGETS ${EXENAME} DESTINATION /usr/bin)
-
-# install desktop file & icon
-CONFIGURE_FILE(${PKGNAME}.desktop.in ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop DESTINATION /opt/share/applications)
+# install xml file & icon
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION ${PREFIX}/share/packages)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.png DESTINATION ${ICONDIR})
# data
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index fd4209d..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-Copyright (c) 2010 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 91b18be..6112b0b 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,14 +1,14 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
# install edj
-ADD_CUSTOM_COMMAND(OUTPUT crash-worker-sdk.edj
+ADD_CUSTOM_COMMAND(OUTPUT crash-worker.edj
COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/private
- ${CMAKE_CURRENT_SOURCE_DIR}/crash-worker-sdk.edc ${CMAKE_BINARY_DIR}/crash-worker-sdk.edj
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/crash-worker-sdk.edc
+ ${CMAKE_CURRENT_SOURCE_DIR}/crash-worker.edc ${CMAKE_BINARY_DIR}/crash-worker.edj
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/crash-worker.edc
)
-ADD_CUSTOM_TARGET(edj_build DEPENDS crash-worker-sdk.edj)
+ADD_CUSTOM_TARGET(edj_build DEPENDS crash-worker.edj)
ADD_DEPENDENCIES(${EXENAME} edj_build)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/crash-worker-sdk.edj DESTINATION ${EDJDIR})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/crash-worker.edj DESTINATION ${EDJDIR})
# install images
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/images/public/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
diff --git a/data/crash-worker-sdk.edc b/data/crash-worker.edc
index 4fc6adc..40abbd4 100644
--- a/data/crash-worker-sdk.edc
+++ b/data/crash-worker.edc
@@ -1,19 +1,3 @@
- /*
- * Copyright 2012 Samsung Electronics Co., Ltd
- *
- * Licensed under the Flora License, Version 1.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.tizenopensource.org/license
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
#define FONT_NAME "GP45_ArabCJK_TouchWiz"
collections {
diff --git a/org.tizen.crash-worker-sdk.desktop.in b/org.tizen.crash-worker-sdk.desktop.in
deleted file mode 100644
index 88cd225..0000000
--- a/org.tizen.crash-worker-sdk.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-Name=@PROJECT_NAME@
-Exec=/usr/bin/crash-worker
-Icon=@PKGNAME@.png
-Type=Application
-Version=0.1.0-0
-NoDisplay=true
-X-TIZEN-TaskManage=false
-X-TIZEN-Removable=false
diff --git a/org.tizen.crash-worker-sdk.png b/org.tizen.crash-worker.png
index 5e2ed60..5e2ed60 100755
--- a/org.tizen.crash-worker-sdk.png
+++ b/org.tizen.crash-worker.png
Binary files differ
diff --git a/org.tizen.crash-worker.xml b/org.tizen.crash-worker.xml
new file mode 100644
index 0000000..df1fef8
--- /dev/null
+++ b/org.tizen.crash-worker.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.crash-worker" version="0.1.0" install-location="internal-only">
+ <label>crash-worker</label>
+ <description>Crash-worker Application</description>
+ <ui-application appid="org.tizen.crash-worker" exec="/usr/apps/org.tizen.crash-worker/bin/crash-worker" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+ <icon>org.tizen.crash-worker.png</icon>
+ <label>crash-worker</label>
+ </ui-application>
+</manifest>
diff --git a/packaging/crash-worker-sdk.spec b/packaging/crash-worker-sdk.spec
new file mode 100644
index 0000000..0539c00
--- /dev/null
+++ b/packaging/crash-worker-sdk.spec
@@ -0,0 +1,49 @@
+
+Name: crash-worker-sdk
+Summary: crash-worker-sdk
+Version: 0.1.1
+Release: 4
+Group: devel
+License: TO_BE_FILLED
+Source0: crash-worker-sdk-0.1.1.tar.gz
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(ecore-file)
+BuildRequires: pkgconfig(ecore-x)
+BuildRequires: pkgconfig(ecore)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(edje)
+BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(utilX)
+BuildRequires: pkgconfig(heynoti)
+BuildRequires: pkgconfig(iniparser)
+
+BuildRequires: cmake
+BuildRequires: edje-tools
+BuildRequires: gettext-devel
+
+%description
+crash-worker-sdk.
+
+%prep
+%setup -q
+
+%build
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf %{buildroot}
+%make_install
+
+
+
+%files
+%defattr(-,root,root,-)
+/usr/share/packages/org.tizen.crash-worker.xml
+/usr/share/icons/default/small/org.tizen.crash-worker.png
+/usr/apps/org.tizen.crash-worker/bin/crash-worker
+/usr/apps/org.tizen.crash-worker/res/edje/crash-worker.edj
+/usr/apps/org.tizen.crash-worker/res/locale/*/LC_MESSAGES/crash-worker.mo
diff --git a/packaging/org.tizen.crash-worker-sdk.spec b/packaging/org.tizen.crash-worker-sdk.spec
deleted file mode 100644
index e415922..0000000
--- a/packaging/org.tizen.crash-worker-sdk.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-Name: org.tizen.crash-worker-sdk
-Summary: crash-worker-sdk
-Version: 0.1.1
-Release: 1
-Group: devel
-License: Flora Software License
-Source0: %{name}-%{version}.tar.gz
-BuildRequires: pkgconfig(appcore-efl)
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(utilX)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(heynoti)
-
-
-BuildRequires: cmake
-BuildRequires: edje-bin
-BuildRequires: embryo-bin
-BuildRequires: gettext-devel
-
-%description
-crash-worker-sdk.
-
-
-%prep
-%setup -q -n %{name}-%{version}
-
-
-%build
-RPM_OPT=`echo $CFLAGS|sed -n 's/-Wp,-D_FORTIFY_SOURCE=2//'`
-export CFLAGS=$RPM_OPT
-%define PREFIX "/opt/apps/org.tizen.crash-worker-sdk"
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX}
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*
-/opt/share/applications/*
-/opt/apps/org.tizen.crash-worker-sdk/*
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index c3c6486..bae371e 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -16,7 +16,7 @@ FOREACH(pofile ${POFILES})
DEPENDS ${absPofile}
)
INSTALL(FILES ${moFile}
- DESTINATION ${LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+ DESTINATION ${LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PACKAGE}.mo)
SET(moFiles ${moFiles} ${moFile})
ENDFOREACH(pofile)
diff --git a/po/crash-worker-sdk.pot b/po/crash-worker.pot
index db48796..db48796 100644
--- a/po/crash-worker-sdk.pot
+++ b/po/crash-worker.pot
diff --git a/po/update-po.sh b/po/update-po.sh
index 365312b..5267a1b 100755
--- a/po/update-po.sh
+++ b/po/update-po.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-PACKAGE=crash-worker-sdk
+PACKAGE=crash-worker
SRCROOT=../src
POTFILES=POTFILES.in
diff --git a/src/_logic.c b/src/_logic.c
index 8b4eb43..5e29d54 100644
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -16,7 +16,6 @@
#include <Ecore_X.h>
#include <heynoti.h>
-#include <appcore-common.h>
#include "crash-worker-sdk.h"
#include "_util_log.h"
diff --git a/src/crash-worker-sdk.c b/src/crash-worker-sdk.c
index fd233ca..115753c 100644
--- a/src/crash-worker-sdk.c
+++ b/src/crash-worker-sdk.c
@@ -65,6 +65,38 @@ static int lang_changed(void *data)
return 0;
}
+static int rotate(enum appcore_rm m, void *data)
+{
+ struct appdata *ad = data;
+ int r;
+
+ if (ad == NULL || ad->win == NULL)
+ return 0;
+
+ switch(m) {
+ case APPCORE_RM_PORTRAIT_NORMAL:
+ r = 0;
+ break;
+ case APPCORE_RM_PORTRAIT_REVERSE:
+ r = 180;
+ break;
+ case APPCORE_RM_LANDSCAPE_NORMAL:
+ r = 270;
+ break;
+ case APPCORE_RM_LANDSCAPE_REVERSE:
+ r = 90;
+ break;
+ default:
+ r = -1;
+ break;
+ }
+
+ if (r >= 0)
+ elm_win_rotation_with_resize_set(ad->win, r);
+
+ return 0;
+}
+
static int app_create(void *data)
{
struct appdata *ad = data;
@@ -78,6 +110,8 @@ static int app_create(void *data)
appcore_set_event_callback(APPCORE_EVENT_LANG_CHANGE,
lang_changed, ad);
+ appcore_set_rotation_cb(rotate, ad);
+
_app_create(ad);
/* appcore measure time example */
diff --git a/src/crash-worker-sdk.h b/src/crash-worker-sdk.h
index 7f4909d..01cb68c 100644
--- a/src/crash-worker-sdk.h
+++ b/src/crash-worker-sdk.h
@@ -25,7 +25,7 @@
#endif
#if !defined(RESDIR)
-# define RESDIR "/opt/apps/org.tizen.crash-worker-sdk/res"
+# define RESDIR "/usr/apps/org.tizen.crash-worker/res"
#endif
#if !defined(LOCALEDIR)
@@ -42,8 +42,6 @@
#define CRASH_VIEWER_UPDATE "crash_viewer_update"
#define _DEBUG_DIR "/opt/share/hidden_storage/SLP_debug"
-#define D_(str) dgettext("sys_string", str)
-
struct appdata
{
Evas_Object *win;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 16:32:53 +0000