Clean up buildscript and directory hierachy

Top level CMakeLists files and directory herachy were massed up.

1. Separate files and move into subdirectories (top -> server, client)
2. Move configuration files into appropriate subdirectories
3. Remove unnecessary files

Change-Id: I6c601e5ba9627128b76edfe2be7827b2ca60dced
Signed-off-by: Wonguk Jeong <wonguk.jeong@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 229d49a680044a48967385c82ee81de940711d38..01630e9759489f5b6e49c56c2e7ec8f531116aaf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,108 +1,28 @@
-# 
-# Copyright (c) 2008 ~ 2010 Samsung Electronics Co., Ltd.
-# All rights reserved
-#
-
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+SET(CMAKE_SKIP_BUILD_RPATH true)
 
 PROJECT(package-manager C)
 INCLUDE(TizenCommon)
-
-SET(VERSION 0.1.68)
 SET(VERSION_MAJOR 0)
+SET(VERSION ${VERSION_MAJOR}.1.68)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include")
 
-
-set(CMAKE_SKIP_BUILD_RPATH true)
-
-#Verbose
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/comm )
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED security-server dlog ecore ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification)
-
-FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification)
-
-FOREACH(flag ${libpkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(pm_dir "${CMAKE_SOURCE_DIR}")
-SET(pm_inc_dir "${pm_dir}/include")
-SET(pm_c_src_dir "${pm_dir}/client/src")
-SET(pm_c_inc_dir "${pm_dir}/client/include")
-SET(pm_s_src_dir "${pm_dir}/server/src")
-SET(pm_s_inc_dir "${pm_dir}/server/include")
-SET(pm_t_inc_dir "${pm_dir}/types/include")
-
-## About debug
-SET(debug_type "-DPM_CONSOLE_USE")             # for debug - use console window
-
-## Additional flag
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -Wall")
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-##################
-## build comm libraries
-add_subdirectory(comm)
-add_subdirectory(tool)
-add_subdirectory(types)
-
-###################################################################################################
-## for libpkgmgr-client.so (library)
 SET(PKGMGR_CLIENT "pkgmgr-client")
-SET(libpkgmgr-client_SOURCES ${pm_c_src_dir}/pkgmgr-internal.c ${pm_c_src_dir}/pkgmgr.c ${pm_c_src_dir}/pkgmgr-dbinfo.c)
-SET(libpkgmgr-client_LDFLAGS " -module -avoid-version ")
-SET(libpkgmgr-client_CFLAGS  " ${CFLAGS} -fPIC -I${pm_c_inc_dir} -I${pm_inc_dir} -I${pm_t_inc_dir} ${debug_type}")
-
-ADD_LIBRARY(${PKGMGR_CLIENT} SHARED ${libpkgmgr-client_SOURCES})
-SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${VERSION_MAJOR})
-SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES COMPILE_FLAGS "${libpkgmgr-client_CFLAGS}")
-TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS})
-###################################################################################################
 
-###################################################################################################
-## for pkgmgr-server (binary)
-SET(pkgmgr-server_SOURCES ${pm_s_src_dir}/pkgmgr-server.c ${pm_s_src_dir}/pm-queue.c)
-SET(pkgmgr-server_CFLAGS " -I. -I${pm_inc_dir} -I${pm_s_inc_dir} -I${pm_dir}/comm ${debug_type} -D_GNU_SOURCE ")
-SET(pkgmgr-server_LDFLAGS ${pkgs_LDFLAGS})
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -g -Wall")
 
-ADD_EXECUTABLE(pkgmgr-server ${pkgmgr-server_SOURCES})
-TARGET_LINK_LIBRARIES(pkgmgr-server pkgmgr_installer pkgmgr_installer_pkg_mgr_server)
-TARGET_LINK_LIBRARIES(pkgmgr-server ${pkgs_LDFLAGS})
-SET_TARGET_PROPERTIES(pkgmgr-server PROPERTIES COMPILE_FLAGS "${pkgmgr-server_CFLAGS}")
-####################################################################################################
+INCLUDE_DIRECTORIES(include)
+INCLUDE_DIRECTORIES(comm)
 
-CONFIGURE_FILE(pkgmgr.pc.in pkgmgr.pc @ONLY)
-configure_file(org.tizen.slp.pkgmgr.service.in org.tizen.slp.pkgmgr.service @ONLY)
-configure_file(org.tizen.slp.pkgmgr.conf.in org.tizen.slp.pkgmgr.conf @ONLY)
-configure_file(pkg_path.conf.in pkg_path.conf @ONLY)
-configure_file(pkgmgr.patch.sh.in pkgmgr.patch.sh @ONLY)
-
-#INSTALL(FILES ${CMAKE_BINARY_DIR}/libpkgmgr-client.so DESTINATION ${LIB_INSTALL_DIR})
-INSTALL(TARGETS ${PKGMGR_CLIENT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/pkgmgr-server DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/client/include/package-manager.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/client/include/pkgmgr-dbinfo.h DESTINATION include)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.slp.pkgmgr.service DESTINATION ${PREFIX}/share/dbus-1/system-services/)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.slp.pkgmgr.conf DESTINATION ${SYSCONFDIR}/dbus-1/system.d/)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkg_path.conf DESTINATION ${SYSCONFDIR}/package-manager/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/queue_status DESTINATION ${SYSCONFDIR}/package-manager/server/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pkgmgr.patch.sh DESTINATION ${SYSCONFDIR}/opt/upgrade/)
+INCLUDE(FindPkgConfig)
 
-####################################################################################################
-add_subdirectory(installers)
-# i18n
-add_subdirectory(po)
+ADD_SUBDIRECTORY(comm)
+ADD_SUBDIRECTORY(server)
+ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(tool)
+ADD_SUBDIRECTORY(types)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fe92867
--- /dev/null
+++ b/client/CMakeLists.txt
@@ -0,0 +1,37 @@
+# package manager client library
+
+SET(SRCS src/pkgmgr-internal.c src/pkgmgr.c src/pkgmgr-dbinfo.c)
+
+pkg_check_modules(CLIENT_DEPS REQUIRED
+               dbus-glib-1
+               dlog
+               ail
+               pkgmgr-parser
+               pkgmgr-info
+               iniparser
+               libtzplatform-config
+               security-server)
+FOREACH(CLIENT_FLAGS ${CLIENT_DEPS_CFLAGS})
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CLIENT_FLAGS}")
+ENDFOREACH(CLIENT_FLAGS)
+
+INCLUDE_DIRECTORIES(include)
+
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+
+ADD_LIBRARY(${PKGMGR_CLIENT} SHARED ${SRCS})
+SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${VERSION_MAJOR})
+SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${VERSION})
+TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT}
+               pkgmgr_installer_client
+               pkgmgr_installer_status_broadcast_server pkgmgr-info
+               ${CLIENT_DEPS_LDFLAGS})
+
+CONFIGURE_FILE(pkgmgr.pc.in pkgmgr.pc @ONLY)
+CONFIGURE_FILE(pkg_path.conf.in pkg_path.conf @ONLY)
+
+INSTALL(TARGETS ${PKGMGR_CLIENT} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager.h DESTINATION include)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/pkgmgr-dbinfo.h DESTINATION include)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkg_path.conf DESTINATION ${SYSCONFDIR}/package-manager/)

diff --git a/client/pkg_path.conf.in b/client/pkg_path.conf.in
new file mode 100644 (file)
index 0000000..d02790b
--- /dev/null
+++ b/client/pkg_path.conf.in
@@ -0,0 +1,6 @@
+# usage 
+# backend:directory_path
+# backendlib:directory_path
+
+backend:/etc/package-manager/backend/
+backendlib:/etc/package-manager/backendlib/

diff --git a/client/pkgmgr.pc.in b/client/pkgmgr.pc.in
new file mode 100644 (file)
index 0000000..c9157b6
--- /dev/null
+++ b/client/pkgmgr.pc.in
@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2008 ~ 2010 Samsung Electronics Co., Ltd.
+# All rights reserved.
+#
+
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
+
+Name: package manager 
+Description: SLP Package Manager Package
+Version: @VERSION@
+Requires: security-server dlog pkgmgr-types pkgmgr-installer-client pkgmgr-installer-status-broadcast-server
+Libs: -L${libdir} -L${libdir}/pkgmgr -lpkgmgr-client
+Cflags: -I${includedir}

diff --git a/comm/CMakeLists.txt b/comm/CMakeLists.txt
index ba3d115a75207592851446061b7fcdfec0894681..cbf3f655ccbdb4cd2a796bf58c3d2b04dc570cb5 100644 (file)
--- a/comm/CMakeLists.txt
+++ b/comm/CMakeLists.txt
@@ -25,7 +25,7 @@ message(STATUS "version/major : ${VERSION} / ${VERSION_MAJOR}")
 ### Get required CFLAGS, LDFLAGS from pkg-config
 
 include(FindPkgConfig)
-pkg_check_modules(comm_pkgs REQUIRED dbus-1 glib-2.0 dbus-glib-1 gio-2.0 gio-unix-2.0 dlog pkgmgr-info)
+pkg_check_modules(comm_pkgs REQUIRED dbus-1 glib-2.0 dbus-glib-1 gio-2.0 gio-unix-2.0 dlog pkgmgr-info db-util)
 
 foreach(flag ${comm_pkgs_CFLAGS})
        set(comm_pkgs_CFLAGS_str "${comm_pkgs_CFLAGS_str} ${flag}")

diff --git a/org.tizen.slp.pkgmgr.conf.in b/org.tizen.slp.pkgmgr.conf.in
deleted file mode 100644 (file)
index e5f4c7f..0000000
--- a/org.tizen.slp.pkgmgr.conf.in
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-        <policy context="default">
-                <allow own="org.tizen.slp.pkgmgr"/>
-                <allow own="org.tizen.slp.pkgmgr_status"/>
-                <allow receive_sender="org.tizen.slp.pkgmgr"/>
-                <allow send_destination="org.tizen.slp.pkgmgr"/>
-        </policy>
-</busconfig>

diff --git a/org.tizen.slp.pkgmgr.service.in b/org.tizen.slp.pkgmgr.service.in
deleted file mode 100644 (file)
index 31d9e2d..0000000
--- a/org.tizen.slp.pkgmgr.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-User=root
-Name=org.tizen.slp.pkgmgr
-Exec=@PREFIX@/bin/pkgmgr-server

diff --git a/packaging/pkgmgr.spec b/packaging/pkgmgr.spec
index 61e47110e4d22496fc15941c2f9e3af8b1b4b73d..f7a0c966ac0c6f8cc0c61ce5aa1348f5144cc6d8 100644 (file)
--- a/packaging/pkgmgr.spec
+++ b/packaging/pkgmgr.spec
@@ -30,6 +30,7 @@ BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgmgr-info-parser-devel
 BuildRequires:  pkgmgr-info-parser
 BuildRequires:  libsmack

diff --git a/pkg_path.conf.in b/pkg_path.conf.in
deleted file mode 100644 (file)
index d02790b..0000000
--- a/pkg_path.conf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# usage 
-# backend:directory_path
-# backendlib:directory_path
-
-backend:/etc/package-manager/backend/
-backendlib:/etc/package-manager/backendlib/

diff --git a/pkgmgr.patch.sh.in b/pkgmgr.patch.sh.in
deleted file mode 100644 (file)
index d0c2da0..0000000
--- a/pkgmgr.patch.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "--------------------------------------"
-echo "Update package database..............."
-echo "--------------------------------------"
-
-source /etc/tizen-platform.conf
-
-/bin/rm $TZ_SYS_DB/.pkgmgr_parser.db
-$TZ_SYS_BIN/pkg_initdb

diff --git a/pkgmgr.pc.in b/pkgmgr.pc.in
deleted file mode 100644 (file)
index c9157b6..0000000
--- a/pkgmgr.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Copyright (c) 2008 ~ 2010 Samsung Electronics Co., Ltd.
-# All rights reserved.
-#
-
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: package manager 
-Description: SLP Package Manager Package
-Version: @VERSION@
-Requires: security-server dlog pkgmgr-types pkgmgr-installer-client pkgmgr-installer-status-broadcast-server
-Libs: -L${libdir} -L${libdir}/pkgmgr -lpkgmgr-client
-Cflags: -I${includedir}

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
deleted file mode 100644 (file)
index e3aebb4..0000000
--- a/po/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# for i18n
-
-SET(POFILES en_US.po en_GB.po ja_JP.po ko_KR.po zh_CN.po)
-
-SET(MSGFMT "/usr/bin/msgfmt")
-
-FOREACH(pofile ${POFILES})
-       SET(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${pofile})
-       MESSAGE("PO: ${pofile}")
-       GET_FILENAME_COMPONENT(absPofile ${pofile} ABSOLUTE)
-       GET_FILENAME_COMPONENT(lang ${absPofile} NAME_WE)
-       SET(moFile ${CMAKE_CURRENT_BINARY_DIR}/${lang}.mo)
-       ADD_CUSTOM_COMMAND(
-                       OUTPUT ${moFile}
-                       COMMAND ${MSGFMT} -o ${moFile} ${absPofile}
-                       DEPENDS ${absPofile}
-       )
-       INSTALL(FILES ${moFile}
-                       DESTINATION share/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
-       SET(moFiles ${moFiles} ${moFile})
-ENDFOREACH(pofile)
-
-MESSAGE(".mo files: ${moFiles}")
-ADD_CUSTOM_TARGET(po ALL DEPENDS ${moFiles})

diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644 (file)
index df0ed57..0000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# List of source files containing translatable strings.
-server/src/pkgmgr-server.c

diff --git a/po/en_GB.po b/po/en_GB.po
deleted file mode 100644 (file)
index af3f93a..0000000
--- a/po/en_GB.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:06+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: server/src/pkgmgr-server.c:251
-#, c-format
-msgid "Install?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:287
-#, c-format
-msgid "Uninstall?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:290
-#, c-format
-msgid "Invalid request"
-msgstr ""

diff --git a/po/en_US.po b/po/en_US.po
deleted file mode 100644 (file)
index af3f93a..0000000
--- a/po/en_US.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:06+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: server/src/pkgmgr-server.c:251
-#, c-format
-msgid "Install?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:287
-#, c-format
-msgid "Uninstall?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:290
-#, c-format
-msgid "Invalid request"
-msgstr ""

diff --git a/po/ja_JP.po b/po/ja_JP.po
deleted file mode 100644 (file)
index 1d5f6e0..0000000
--- a/po/ja_JP.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:06+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: server/src/pkgmgr-server.c:251
-#, c-format
-msgid "Install?"
-msgstr "インストールしますか？"
-
-#: server/src/pkgmgr-server.c:287
-#, c-format
-msgid "Uninstall?"
-msgstr "アンインストールしますか？"
-
-#: server/src/pkgmgr-server.c:290
-#, c-format
-msgid "Invalid request"
-msgstr "無効なリクエストです"

diff --git a/po/ko_KR.po b/po/ko_KR.po
deleted file mode 100644 (file)
index 3850a70..0000000
--- a/po/ko_KR.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:06+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: server/src/pkgmgr-server.c:251
-#, c-format
-msgid "Install?"
-msgstr "설치할까요?"
-
-#: server/src/pkgmgr-server.c:287
-#, c-format
-msgid "Uninstall?"
-msgstr "삭제할까요?"
-
-#: server/src/pkgmgr-server.c:290
-#, c-format
-msgid "Invalid request"
-msgstr "요청이 바르지 않습니다"

diff --git a/po/package-manager.pot b/po/package-manager.pot
deleted file mode 100644 (file)
index e9f371b..0000000
--- a/po/package-manager.pot
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:06+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: server/src/pkgmgr-server.c:251
-#, c-format
-msgid "Install?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:287
-#, c-format
-msgid "Uninstall?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:290
-#, c-format
-msgid "Invalid request"
-msgstr ""

diff --git a/po/update-po.sh b/po/update-po.sh
deleted file mode 100755 (executable)
index 16fbdc1..0000000
--- a/po/update-po.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-PACKAGE=package-manager
-SRCROOT=..
-POTFILES=POTFILES.in
-
-#ALL_LINGUAS= am az be ca cs da de el en_CA en_GB es et fi fr hr hu it ja ko lv mk ml ms nb ne nl pa pl pt pt_BR ru rw sk sl sr sr@Latn sv ta tr uk vi zh_CN zh_TW
-ALL_LINGUAS="en_US en_GB ja_JP ko_KR zh_CN"
-
-XGETTEXT=/usr/bin/xgettext
-MSGMERGE=/usr/bin/msgmerge
-
-echo -n "Make ${PACKAGE}.pot  "
-if [ ! -e $POTFILES ] ; then
-       echo "$POTFILES not found"
-       exit 1
-fi
-
-$XGETTEXT --default-domain=${PACKAGE} --directory=${SRCROOT} \
-               --add-comments --keyword=_ --keyword=N_ --files-from=$POTFILES
-if [ $? -ne 0 ]; then
-       echo "xgettext error"
-       exit 1
-fi
-
-if [ ! -f ${PACKAGE}.po ]; then
-       echo "No such file: ${PACKAGE}.po"
-       exit 1
-fi
-
-rm -f ${PACKAGE}.pot && mv ${PACKAGE}.po ${PACKAGE}.pot
-echo "done"
-
-for LANG in $ALL_LINGUAS; do 
-       echo "$LANG : "
-
-       if [ ! -e $LANG.po ] ; then
-               sed 's/CHARSET/UTF-8/g' ${PACKAGE}.pot > ${LANG}.po
-               echo "${LANG}.po created"
-       else
-               if $MSGMERGE ${LANG}.po ${PACKAGE}.pot -o ${LANG}.new.po ; then
-                       if cmp ${LANG}.po ${LANG}.new.po > /dev/null 2>&1; then
-                               rm -f ${LANG}.new.po
-                       else
-                               if mv -f ${LANG}.new.po ${LANG}.po; then
-                                       echo "" 
-                               else
-                                       echo "msgmerge for $LANG.po failed: cannot move $LANG.new.po to $LANG.po" 1>&2
-                                       rm -f ${LANG}.new.po
-                                       exit 1
-                               fi
-                       fi
-               else
-                       echo "msgmerge for $LANG failed!"
-                       rm -f ${LANG}.new.po
-               fi
-       fi
-       echo ""
-done
-

diff --git a/po/zh_CN.po b/po/zh_CN.po
deleted file mode 100644 (file)
index af3f93a..0000000
--- a/po/zh_CN.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:06+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: server/src/pkgmgr-server.c:251
-#, c-format
-msgid "Install?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:287
-#, c-format
-msgid "Uninstall?"
-msgstr ""
-
-#: server/src/pkgmgr-server.c:290
-#, c-format
-msgid "Invalid request"
-msgstr ""

diff --git a/queue_status b/queue_status
deleted file mode 100644 (file)
index 5baa80c..0000000
--- a/queue_status
+++ /dev/null
@@ -1 +0,0 @@
-This file is for creating required directory.

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a1cc82a
--- /dev/null
+++ b/server/CMakeLists.txt
@@ -0,0 +1,32 @@
+# package manager server
+
+SET(PKGMGR_SERVER "pkgmgr-server")
+SET(SRCS src/pkgmgr-server.c src/pm-queue.c)
+
+pkg_check_modules(SERVER_DEPS REQUIRED
+               security-server
+               dlog
+               ail
+               pkgmgr-parser
+               pkgmgr-info
+               libtzplatform-config
+               notification)
+FOREACH(SERVER_FLAGS ${SERVER_DEPS_CFLAGS})
+       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SERVER_FLAGS}")
+ENDFOREACH(SERVER_FLAGS)
+
+INCLUDE_DIRECTORIES(include)
+
+ADD_EXECUTABLE(${PKGMGR_SERVER} ${SRCS})
+TARGET_LINK_LIBRARIES(${PKGMGR_SERVER} pkgmgr_installer pkgmgr_installer_pkg_mgr_server)
+TARGET_LINK_LIBRARIES(${PKGMGR_SERVER} ${SERVER_DEPS_LDFLAGS})
+
+CONFIGURE_FILE(org.tizen.slp.pkgmgr.service.in org.tizen.slp.pkgmgr.service @ONLY)
+CONFIGURE_FILE(org.tizen.slp.pkgmgr.conf.in org.tizen.slp.pkgmgr.conf @ONLY)
+
+INSTALL(TARGETS ${PKGMGR_SERVER} DESTINATION bin)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/queue_status DESTINATION ${SYSCONFDIR}/package-manager/server/)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.slp.pkgmgr.service DESTINATION ${PREFIX}/share/dbus-1/system-services/)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tizen.slp.pkgmgr.conf DESTINATION ${SYSCONFDIR}/dbus-1/system.d/)
+
+ADD_SUBDIRECTORY(po)

diff --git a/server/org.tizen.slp.pkgmgr.conf.in b/server/org.tizen.slp.pkgmgr.conf.in
new file mode 100644 (file)
index 0000000..e5f4c7f
--- /dev/null
+++ b/server/org.tizen.slp.pkgmgr.conf.in
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+        <policy context="default">
+                <allow own="org.tizen.slp.pkgmgr"/>
+                <allow own="org.tizen.slp.pkgmgr_status"/>
+                <allow receive_sender="org.tizen.slp.pkgmgr"/>
+                <allow send_destination="org.tizen.slp.pkgmgr"/>
+        </policy>
+</busconfig>

diff --git a/server/org.tizen.slp.pkgmgr.service.in b/server/org.tizen.slp.pkgmgr.service.in
new file mode 100644 (file)
index 0000000..31d9e2d
--- /dev/null
+++ b/server/org.tizen.slp.pkgmgr.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+User=root
+Name=org.tizen.slp.pkgmgr
+Exec=@PREFIX@/bin/pkgmgr-server

diff --git a/server/po/CMakeLists.txt b/server/po/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e3aebb4
--- /dev/null
+++ b/server/po/CMakeLists.txt
@@ -0,0 +1,24 @@
+# for i18n
+
+SET(POFILES en_US.po en_GB.po ja_JP.po ko_KR.po zh_CN.po)
+
+SET(MSGFMT "/usr/bin/msgfmt")
+
+FOREACH(pofile ${POFILES})
+       SET(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${pofile})
+       MESSAGE("PO: ${pofile}")
+       GET_FILENAME_COMPONENT(absPofile ${pofile} ABSOLUTE)
+       GET_FILENAME_COMPONENT(lang ${absPofile} NAME_WE)
+       SET(moFile ${CMAKE_CURRENT_BINARY_DIR}/${lang}.mo)
+       ADD_CUSTOM_COMMAND(
+                       OUTPUT ${moFile}
+                       COMMAND ${MSGFMT} -o ${moFile} ${absPofile}
+                       DEPENDS ${absPofile}
+       )
+       INSTALL(FILES ${moFile}
+                       DESTINATION share/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
+       SET(moFiles ${moFiles} ${moFile})
+ENDFOREACH(pofile)
+
+MESSAGE(".mo files: ${moFiles}")
+ADD_CUSTOM_TARGET(po ALL DEPENDS ${moFiles})

diff --git a/server/po/POTFILES.in b/server/po/POTFILES.in
new file mode 100644 (file)
index 0000000..110dfd2
--- /dev/null
+++ b/server/po/POTFILES.in
@@ -0,0 +1,2 @@
+# List of source files containing translatable strings.
+src/pkgmgr-server.c

diff --git a/server/po/en_GB.po b/server/po/en_GB.po
new file mode 100644 (file)
index 0000000..af3f93a
--- /dev/null
+++ b/server/po/en_GB.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-14 19:06+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: server/src/pkgmgr-server.c:251
+#, c-format
+msgid "Install?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:287
+#, c-format
+msgid "Uninstall?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:290
+#, c-format
+msgid "Invalid request"
+msgstr ""

diff --git a/server/po/en_US.po b/server/po/en_US.po
new file mode 100644 (file)
index 0000000..af3f93a
--- /dev/null
+++ b/server/po/en_US.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-14 19:06+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: server/src/pkgmgr-server.c:251
+#, c-format
+msgid "Install?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:287
+#, c-format
+msgid "Uninstall?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:290
+#, c-format
+msgid "Invalid request"
+msgstr ""

diff --git a/server/po/ja_JP.po b/server/po/ja_JP.po
new file mode 100644 (file)
index 0000000..1d5f6e0
--- /dev/null
+++ b/server/po/ja_JP.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-14 19:06+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: server/src/pkgmgr-server.c:251
+#, c-format
+msgid "Install?"
+msgstr "インストールしますか？"
+
+#: server/src/pkgmgr-server.c:287
+#, c-format
+msgid "Uninstall?"
+msgstr "アンインストールしますか？"
+
+#: server/src/pkgmgr-server.c:290
+#, c-format
+msgid "Invalid request"
+msgstr "無効なリクエストです"

diff --git a/server/po/ko_KR.po b/server/po/ko_KR.po
new file mode 100644 (file)
index 0000000..3850a70
--- /dev/null
+++ b/server/po/ko_KR.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-14 19:06+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: server/src/pkgmgr-server.c:251
+#, c-format
+msgid "Install?"
+msgstr "설치할까요?"
+
+#: server/src/pkgmgr-server.c:287
+#, c-format
+msgid "Uninstall?"
+msgstr "삭제할까요?"
+
+#: server/src/pkgmgr-server.c:290
+#, c-format
+msgid "Invalid request"
+msgstr "요청이 바르지 않습니다"

diff --git a/server/po/package-manager.pot b/server/po/package-manager.pot
new file mode 100644 (file)
index 0000000..e9f371b
--- /dev/null
+++ b/server/po/package-manager.pot
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-14 19:06+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: server/src/pkgmgr-server.c:251
+#, c-format
+msgid "Install?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:287
+#, c-format
+msgid "Uninstall?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:290
+#, c-format
+msgid "Invalid request"
+msgstr ""

diff --git a/server/po/update-po.sh b/server/po/update-po.sh
new file mode 100755 (executable)
index 0000000..16fbdc1
--- /dev/null
+++ b/server/po/update-po.sh
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+PACKAGE=package-manager
+SRCROOT=..
+POTFILES=POTFILES.in
+
+#ALL_LINGUAS= am az be ca cs da de el en_CA en_GB es et fi fr hr hu it ja ko lv mk ml ms nb ne nl pa pl pt pt_BR ru rw sk sl sr sr@Latn sv ta tr uk vi zh_CN zh_TW
+ALL_LINGUAS="en_US en_GB ja_JP ko_KR zh_CN"
+
+XGETTEXT=/usr/bin/xgettext
+MSGMERGE=/usr/bin/msgmerge
+
+echo -n "Make ${PACKAGE}.pot  "
+if [ ! -e $POTFILES ] ; then
+       echo "$POTFILES not found"
+       exit 1
+fi
+
+$XGETTEXT --default-domain=${PACKAGE} --directory=${SRCROOT} \
+               --add-comments --keyword=_ --keyword=N_ --files-from=$POTFILES
+if [ $? -ne 0 ]; then
+       echo "xgettext error"
+       exit 1
+fi
+
+if [ ! -f ${PACKAGE}.po ]; then
+       echo "No such file: ${PACKAGE}.po"
+       exit 1
+fi
+
+rm -f ${PACKAGE}.pot && mv ${PACKAGE}.po ${PACKAGE}.pot
+echo "done"
+
+for LANG in $ALL_LINGUAS; do 
+       echo "$LANG : "
+
+       if [ ! -e $LANG.po ] ; then
+               sed 's/CHARSET/UTF-8/g' ${PACKAGE}.pot > ${LANG}.po
+               echo "${LANG}.po created"
+       else
+               if $MSGMERGE ${LANG}.po ${PACKAGE}.pot -o ${LANG}.new.po ; then
+                       if cmp ${LANG}.po ${LANG}.new.po > /dev/null 2>&1; then
+                               rm -f ${LANG}.new.po
+                       else
+                               if mv -f ${LANG}.new.po ${LANG}.po; then
+                                       echo "" 
+                               else
+                                       echo "msgmerge for $LANG.po failed: cannot move $LANG.new.po to $LANG.po" 1>&2
+                                       rm -f ${LANG}.new.po
+                                       exit 1
+                               fi
+                       fi
+               else
+                       echo "msgmerge for $LANG failed!"
+                       rm -f ${LANG}.new.po
+               fi
+       fi
+       echo ""
+done
+

diff --git a/server/po/zh_CN.po b/server/po/zh_CN.po
new file mode 100644 (file)
index 0000000..af3f93a
--- /dev/null
+++ b/server/po/zh_CN.po
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-14 19:06+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: server/src/pkgmgr-server.c:251
+#, c-format
+msgid "Install?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:287
+#, c-format
+msgid "Uninstall?"
+msgstr ""
+
+#: server/src/pkgmgr-server.c:290
+#, c-format
+msgid "Invalid request"
+msgstr ""

diff --git a/server/queue_status b/server/queue_status
new file mode 100644 (file)
index 0000000..5baa80c
--- /dev/null
+++ b/server/queue_status
@@ -0,0 +1 @@
+This file is for creating required directory.

diff --git a/server/src/pkgmgr-server.c b/server/src/pkgmgr-server.c
index 49854f4082a7c4e825942b4e2132de042da424a5..585658ba95eb15abefcae8b721b5288026dc5a2d 100644 (file)
--- a/server/src/pkgmgr-server.c
+++ b/server/src/pkgmgr-server.c
@@ -32,8 +32,6 @@
 #include <fcntl.h>
 #include <glib.h>
 #include <signal.h>
-#include <Ecore.h>
-#include <Ecore_File.h>
 #include <ail.h>
 #include <pkgmgr-info.h>
 #include <pkgmgr/pkgmgr_parser.h>

diff --git a/test.sh b/test.sh
deleted file mode 100644 (file)
index d63ef99..0000000
--- a/test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#export CFLAGS=""
-#export LDFLAGS=""
-
-cd `dirname $0`
-
-PREFIX=/usr
-
-rm -rf cmake_tmp
-mkdir -p cmake_tmp
-cd cmake_tmp
-
-CFLAGS="${CFLAGS} -g" LDFLAGS="${LDFLAGS}" cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_BUILD_TYPE=Debug &&
-make &&
-mkdir -p destdir &&
-make install DESTDIR=destdir
-

diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index 293adbf89af917f3bad27291dd5ba948372b3091..bcdef0033fadb7322eb89a36f5058390e07e5e74 100644 (file)
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -78,3 +78,5 @@ install(FILES ${CMAKE_BINARY_DIR}/org.tizen.pkgmgr-install.xml DESTINATION /usr/
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mime.wac.xml DESTINATION /usr/share/mime/packages/)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mime.tpk.xml DESTINATION /usr/share/mime/packages/)
 
+configure_file(pkgmgr.patch.sh.in pkgmgr.patch.sh @ONLY)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pkgmgr.patch.sh DESTINATION ${SYSCONFDIR}/opt/upgrade/)

diff --git a/tool/pkgmgr.patch.sh.in b/tool/pkgmgr.patch.sh.in
new file mode 100644 (file)
index 0000000..d0c2da0
--- /dev/null
+++ b/tool/pkgmgr.patch.sh.in
@@ -0,0 +1,8 @@
+echo "--------------------------------------"
+echo "Update package database..............."
+echo "--------------------------------------"
+
+source /etc/tizen-platform.conf
+
+/bin/rm $TZ_SYS_DB/.pkgmgr_parser.db
+$TZ_SYS_BIN/pkg_initdb

diff --git a/types/CMakeLists.txt b/types/CMakeLists.txt
index dedf25328734fa27690ae2a43dbcea1e68b74bcd..56a9dcf6903eda77538edb61f1f72101bc95a71e 100644 (file)
--- a/types/CMakeLists.txt
+++ b/types/CMakeLists.txt
@@ -1,9 +1,7 @@
-
 CONFIGURE_FILE(pkgmgr-types.pc.in ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-types.pc @ONLY)
 
-INSTALL(FILES 
-                       ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager-types.h
-                       ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager-plugin.h
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager-types.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/include/package-manager-plugin.h
                DESTINATION include)
-               
-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-types.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-types.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)