1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index 96a28f1..471bb77 100644
5 @@ -18,6 +18,8 @@ SET(LIBDIR ${LIB_INSTALL_DIR})
6 SET(INCLUDEDIR "\${prefix}/include")
9 +ADD_DEFINITIONS("-DNDEBUG")
11 set(CMAKE_SKIP_BUILD_RPATH true)
14 @@ -28,16 +28,16 @@ INCLUDE(FindPkgConfig)
15 OPTION(X11_SUPPORT "Enable X support" ON)
17 ADD_DEFINITIONS("-DHAVE_X11")
18 - pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-x ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config)
19 + pkg_check_modules(pkgs REQUIRED security-server elementary evas ecore appcore-efl ecore-x ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config)
21 - pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-wayland ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config)
22 + pkg_check_modules(pkgs REQUIRED security-server elementary evas ecore appcore-efl ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config)
25 FOREACH(flag ${pkgs_CFLAGS})
26 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
29 -pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config xdgmime)
30 +pkg_check_modules(libpkgs REQUIRED dbus-glib-1 ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config xdgmime)
32 FOREACH(flag ${libpkgs_CFLAGS})
33 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
34 diff --git a/client/include/pkgmgr-debug.h b/client/include/pkgmgr-debug.h
35 index 7ec0523..7599fd1 100644
36 --- a/client/include/pkgmgr-debug.h
37 +++ b/client/include/pkgmgr-debug.h
39 #ifndef __PKGMGR_DEBUG_H__
40 #define __PKGMGR_DEBUG_H__
44 -#define _LOGE(fmt, arg...) LOGE(fmt, ##arg)
45 -#define _LOGD(fmt, arg...) LOGD(fmt, ##arg)
47 +#define NATIVEFAKELOG(fmt, ...) \
50 + printf("\n [%s: %s(): %d] " fmt"\n", rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__, ##__VA_ARGS__);\
52 +#define _LOGE(fmt, arg...) NATIVEFAKELOG(fmt, ##arg)
53 +#define _LOGD(fmt, arg...) NATIVEFAKELOG(fmt, ##arg)
56 #define COLOR_RED "\033[0;31m"
58 #define PKGMGR_DEBUG(fmt, ...)\
61 - LOGD("[%s(): %d]" fmt, __FUNCTION__, __LINE__,##__VA_ARGS__);\
64 #define PKGMGR_DEBUG_ERR(fmt, ...)\
67 - LOGE(COLOR_RED"[%s(): %d]" fmt COLOR_END, __FUNCTION__, __LINE__,##__VA_ARGS__);\
70 #define PKGMGR_BEGIN() \
73 - LOGD(COLOR_BLUE"[%s(): %d] BEGIN >>>>"COLOR_END, __FUNCTION__ ,__LINE__);\
76 #define PKGMGR_END() \
79 - LOGD(COLOR_BLUE"[%s(): %d] END <<<<"COLOR_END, __FUNCTION__,__LINE__ );\
83 diff --git a/comm/CMakeLists.txt b/comm/CMakeLists.txt
84 index 7378df5..fd5a714 100755
85 --- a/comm/CMakeLists.txt
86 +++ b/comm/CMakeLists.txt
87 @@ -25,7 +25,7 @@ message(STATUS "version/major : ${VERSION} / ${VERSION_MAJOR}")
88 ### Get required CFLAGS, LDFLAGS from pkg-config
90 include(FindPkgConfig)
91 -pkg_check_modules(comm_pkgs REQUIRED dbus-1 dbus-glib-1 dlog pkgmgr-info)
92 +pkg_check_modules(comm_pkgs REQUIRED dbus-1 dbus-glib-1 pkgmgr-info)
94 foreach(flag ${comm_pkgs_CFLAGS})
95 set(comm_pkgs_CFLAGS_str "${comm_pkgs_CFLAGS_str} ${flag}")
96 diff --git a/comm/comm_config.h b/comm/comm_config.h
97 index 6fa50a9..7570b93 100755
98 --- a/comm/comm_config.h
99 +++ b/comm/comm_config.h
103 /* Debug message macro */
104 -#define USE_DLOG 1 /* Use dlog! */
105 +//#define USE_DLOG 1 /* Use dlog! */
110 #include <sys/types.h>
112 #define dbg(fmtstr, args...) \
115 fprintf(stdout, "[%d:comm]%s:%d:%s(): " \
116 fmtstr "\n", getpid(),\
117 basename(__FILE__), __LINE__, __func__, ##args);\
120 #define ERR(fmtstr, args...) \
123 fprintf(stderr, "[%d:comm]%s:%d:%s(): " \
124 fmtstr "\n", getpid(),\
125 basename(__FILE__), __LINE__, __func__, ##args);\
127 #endif /* USE_DLOG */
129 #define dbg(fmtstr, args...)
130 +#define NATIVEFAKELOG(fmt, ...) \
133 + printf("\n [%s: %s(): %d] " fmt"\n", rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__, ##__VA_ARGS__);\
135 +#define ERR(fmt, arg...) NATIVEFAKELOG(fmt, ##arg)
136 +#define LOGD(fmt, arg...) NATIVEFAKELOG(fmt, ##arg)
137 +#define LOGE(fmt, arg...) NATIVEFAKELOG(fmt, ##arg)
140 /* from comm_pkg_mgr.xml
141 diff --git a/comm/pkgmgr_installer.h b/comm/pkgmgr_installer.h
142 index 661249b..126b893 100755
143 --- a/comm/pkgmgr_installer.h
144 +++ b/comm/pkgmgr_installer.h
145 @@ -40,7 +40,7 @@ extern "C" {
154 diff --git a/comm/test/CMakeLists.txt b/comm/test/CMakeLists.txt
155 index 016aca7..48c547e 100755
156 --- a/comm/test/CMakeLists.txt
157 +++ b/comm/test/CMakeLists.txt
159 include(FindPkgConfig)
160 -pkg_check_modules(test_pkgs REQUIRED dbus-glib-1 glib-2.0 dlog)
161 +pkg_check_modules(test_pkgs REQUIRED dbus-glib-1 glib-2.0 )
163 add_definitions(${test_pkgs_CFLAGS})
165 diff --git a/installers/sample/CMakeLists.txt b/installers/sample/CMakeLists.txt
166 index 162c8f4..6a027a1 100755
167 --- a/installers/sample/CMakeLists.txt
168 +++ b/installers/sample/CMakeLists.txt
170 include(FindPkgConfig)
171 -pkg_check_modules(parser_pkgs REQUIRED dlog libxml-2.0)
172 +pkg_check_modules(parser_pkgs REQUIRED libxml-2.0)
174 foreach(flag ${parser_pkgs_CFLAGS})
175 set(parser_pkgs_CFLAGS_str "${parser_pkgs_CFLAGS_str} ${flag}")
176 diff --git a/installers/sample/sample_parserlib.c b/installers/sample/sample_parserlib.c
177 index 4eb175b..d017318 100755
178 --- a/installers/sample/sample_parserlib.c
179 +++ b/installers/sample/sample_parserlib.c
181 #include <libxml/xmlreader.h>
187 #define LOG_TAG "PKGMGR_PARSER"
189 diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
190 index 0eeb65b..f2f951b 100755
191 --- a/tool/CMakeLists.txt
192 +++ b/tool/CMakeLists.txt
193 @@ -17,7 +17,7 @@ FOREACH(flag ${pkgs_test_CFLAGS})
194 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
197 -pkg_check_modules(toolpkgs REQUIRED appcore-efl dlog bundle glib-2.0 pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config)
198 +pkg_check_modules(toolpkgs REQUIRED appcore-efl bundle glib-2.0 pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config)
199 FOREACH(flag ${libpkgs_CFLAGS})
200 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
202 diff --git a/server/src/pkgmgr-server.c b/server/src/pkgmgr-server.c
203 index 8865c2f..45a775f 100755
204 --- a/server/src/pkgmgr-server.c
205 +++ b/server/src/pkgmgr-server.c
210 +#define DBGE(fmt, args...)
211 #define DBG(fmt, args...)
212 #define __SET_DBG_OUTPUT(fp)