TSAM-10406 using correct way to get package-id

Change-Id: Id82be46aeebbb6a845d7b4bd6ce43e1214393b3e
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82..a762983 100644 (file)
--- a/Build/basedef.mk
+++ b/Build/basedef.mk
@@ -22,7 +22,7 @@ PROJ_PATH ?= $(PROJPATH)
 #endif
 
 #ifeq ($(strip $(OUTPUT_DIR)),)
-OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
+#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG)
 #endif
 
 #ifeq ($(strip $(BUILD_ARCH)),)

diff --git a/Build/build_c.mk b/Build/build_c.mk
index 81940cd..d818ab6 100644 (file)
--- a/Build/build_c.mk
+++ b/Build/build_c.mk
@@ -31,7 +31,7 @@ $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7)
        @echo '  Building file: $$<'
        @echo '  Invoking: $(3) Compiler'
        $$(call MAKEDIRS,$$(@D))
-       $(5) -c "$$<" -o "$$@" $(6) @$(7)
+       $(5) -c "$$<" -o "$$@" $(6) -Wp,@$(7)
        @echo '  Finished building: $$<'
 $(8) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4))
 endef

diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 6f85fdd..2270b84 100644 (file)
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -1,12 +1,12 @@
 # EDC build script
 
 
-FUNC_EDC2EDJ = $(patsubst %.edc,$(2)/%.edj,$(1))
+FUNC_EDC2EDJ = $(patsubst %.edc,%.edj,$(1))
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
-CONVERT_ESC_EDC_TO_EDJ = $(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1),$(2)))
+CONVERT_ESC_EDC_TO_EDJ = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call FUNC_EDC2EDJ,$(1)))
 
 
 # parameter :

diff --git a/Build/build_po.mk b/Build/build_po.mk
index d88d71a..514116b 100644 (file)
--- a/Build/build_po.mk
+++ b/Build/build_po.mk
@@ -1,14 +1,14 @@
 # PO build script
 
 
-_FUNC_PO2MO = $(patsubst %.po,$(2)/res/locale/%/LC_MESSAGES/$(3).mo,$(notdir $(1)))
+_FUNC_PO2MO = $(patsubst %.po,res/locale/%/LC_MESSAGES/$(2).mo,$(notdir $(1)))
 
 
 # parameter :
 #  $(1) - C/C++ soruce file
 #  $(2) - output path
 #  $(3) - app name
-CONVERT_ESC_PO_TO_MO = $(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(2),$(3)))
+CONVERT_ESC_PO_TO_MO = $(2)/$(call CONVERT_4MAKE_TO_OUT,$(call _FUNC_PO2MO,$(1),$(3)))
 
 
 # parameter :

diff --git a/Build/makefile b/Build/makefile
index 9348c50..3c3f61e 100644 (file)
--- a/Build/makefile
+++ b/Build/makefile
@@ -14,7 +14,8 @@ clean : app_clean
 version : build_version
 
 #PROJ_ROOT = .
-BUILD_ROOT := $(PROJ_PATH)/Build#
+PROJ_PATH ?= .#
+BUILD_ROOT ?= $(PROJ_PATH)/Build#
 
 ifeq ($(MAKE_NAME),mingw32-make)
 ifneq ($(SHELL),)

diff --git a/Build/makefile.mk b/Build/makefile.mk
index c95b4b4..fd5349d 100644 (file)
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -15,8 +15,8 @@ version : build_version
 
 
 #PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH))
-PROJ_ROOT := .
-BUILD_ROOT := $(PROJ_ROOT)/Build
+PROJ_ROOT ?= .#
+BUILD_ROOT ?= $(PROJ_ROOT)/Build
 
 include $(BUILD_ROOT)/basedef.mk
 
@@ -32,8 +32,11 @@ include $(BUILD_ROOT)/funcs.mk
 
 APPTYPE := $(type)
 
-OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG)
-OBJ_OUTPUT := $(OUTPUT_DIR)/objs
+OUTPUT_BASE ?= $(PROJ_ROOT)
+#OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)/$(BUILD_ARCH)
+OUTPUT_DIR ?= $(OUTPUT_BASE)/$(BUILD_CONFIG)
+OUTPUT_DIR := $(call BSLASH2SLASH,$(OUTPUT_DIR))
+OBJ_OUTPUT ?= $(OUTPUT_DIR)/objs
 
 LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME))
 APPID2 := $(subst $(basename $(APPID)).,,$(APPID))
@@ -65,8 +68,8 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
-CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_C_OPTS)
+CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT) $(USER_CPP_OPTS)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
 OBJS := #
@@ -81,7 +84,7 @@ $(foreach ext,cpp cxx cc c++ C,$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_SRC
 # Individual C/C++
 ifneq ($(strip $(USER_EXT_C_KEYS)),)
 $(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_INC_FILES),$(USER_EXT_$(var)_DEFS),$(USER_EXT_$(var)_UNDEFS),$(C_OPT),$(C_OPT_FILE),C,c,$(CC),OBJS)))
-$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(C_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
+$(foreach ext,cpp cxx cc c++ C,$(foreach var,$(USER_EXT_C_KEYS),$(eval $(call C_PROC_RAW,$(OBJ_OUTPUT),$(USER_EXT_$(var)_SRCS),$(USER_EXT_$(var)_INC_DIRS),$(USER_EXT_$(var)_CPP_INC_FILES),$(USER_EXT_$(var)_CPP_DEFS),$(USER_EXT_$(var)_CPP_UNDEFS),$(CPP_OPT),$(C_OPT_FILE),C++,$(ext),$(CXX),OBJS))))
 endif
 
 
@@ -109,7 +112,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
        @echo '  Building target: $@'
        @echo '  Invoking: C/C++ Linker'
        $(call MAKEDIRS,$(@D))
-       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration
+       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -pie -lpthread --sysroot="$(SYSROOT)" -Xlinker --version-script="$(PROJ_ROOT)/.exportMap" $(RS_LIB_PATHS) $(RS_LIBRARIES) -Xlinker -rpath="/opt/usr/apps/$(APPID)/lib" -Werror-implicit-function-declaration $(USER_LINK_OPTS)
        @echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),staticLib)
@@ -117,7 +120,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
        @echo '  Building target: $@'
        @echo '  Invoking: Archive utility'
        $(call MAKEDIRS,$(@D))
-       $(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS)
+       $(AR) -r $(APPFILE) $(OBJS) $(UOBJS) $(AR_FLAGS) $(USER_LINK_OPTS)
        @echo '  Finished building target: $@'
 endif
 ifeq ($(strip $(APPTYPE)),sharedLib)
@@ -125,7 +128,7 @@ $(APPFILE) : $(OBJS) $(UOBJS)
        @echo '  Building target: $@'
        @echo '  Invoking: C/C++ Linker'
        $(call MAKEDIRS,$(@D))
-       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES)
+       $(CXX) -o $(APPFILE) $(OBJS) $(UOBJS) $(LIBPATHS) -Xlinker --as-needed $(LIBS) $(LINK_FLAGS) $(TC_LINKER_MISC) $(RS_LINKER_MISC) -shared -lpthread --sysroot="$(SYSROOT)" $(RS_LIB_PATHS) $(RS_LIBRARIES) $(USER_LINK_OPTS)
        @echo '  Finished building target: $@'
 endif
 
@@ -144,14 +147,13 @@ ifneq ($(findstring Windows,$(OS)),)
 ifneq ($(findstring 3.82,$(MAKE_VERSION)),)
        $(file > $@,$(PLATFORM_INCS))
 else
-       @echo $(PLATFORM_INCS) > $@
+       @echo $(PLATFORM_INCS) > "$@"
 endif
 else
-       @echo $(PLATFORM_INCS) > $@
+       @echo $(PLATFORM_INCS) > "$@"
 endif
 endif
 
-
 include $(BUILD_ROOT)/build_edc.mk
 
 #ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),)

diff --git a/inc/pkgmgr-setting-info.h b/inc/app-setting-info.h
similarity index 95%
rename from inc/pkgmgr-setting-info.h
rename to inc/app-setting-info.h
index 6cfcbb7..225e936 100755 (executable)
--- a/inc/pkgmgr-setting-info.h
+++ b/inc/app-setting-info.h
@@ -15,8 +15,8 @@
 */
 
 
-#ifndef __PKGMGR_SETTING_INFO_H__
-#define __PKGMGR_SETTING_INFO_H__
+#ifndef __APP_SETTING_INFO_H__
+#define __APP_SETTING_INFO_H__
 
 #include <tizen.h>
 #include "log.h"
@@ -58,4 +58,4 @@ HAPI char *get_app_name(const char *appid);
 HAPI int apps_sort_cb(const void *d1, const void *d2);
 
 
-#endif //__PKGMGR_SETTING_INFO_H__
+#endif //__APP_SETTING_INFO_H__

diff --git a/inc/common-efl.h b/inc/common-efl.h
index 28cc4e3..c3108e2 100755 (executable)
--- a/inc/common-efl.h
+++ b/inc/common-efl.h
@@ -25,7 +25,6 @@
 #include <Elementary.h>
 #include <package_manager.h>
 #include "log.h"
-#include "pkgmgr-setting-info.h"
 #include "notification-setting-info.h"
 
 #define PKGNAME NULL

diff --git a/inc/notification-setting-info.h b/inc/notification-setting-info.h
index d8a52b1..d3014e4 100755 (executable)
--- a/inc/notification-setting-info.h
+++ b/inc/notification-setting-info.h
@@ -19,7 +19,7 @@
 #define __NOTIFICATION_SETTING_INFO_H__
 
 #include <Elementary.h>
-#include "pkgmgr-setting-info.h"
+#include "app-setting-info.h"
 #include <notification_setting_internal.h>
 #include "sys_setting.h"
 

diff --git a/project_def.prop b/project_def.prop
index 8d1f84b..5657163 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -9,7 +9,7 @@ type = app
 profile = mobile-3.0
 
 # C/CPP Sources
-USER_SRCS = src/excepted-apps-efl.c src/do-not-disturb-efl.c src/sys_setting.c src/set-schedule-info.c src/allowed-calls.c src/pkgmgr-setting-info.c src/app-details.c src/common-efl.c src/lock_screen_content.c src/notification-setting-info.c src/main.c 
+USER_SRCS = src/excepted-apps-efl.c src/do-not-disturb-efl.c src/sys_setting.c src/set-schedule-info.c src/allowed-calls.c src/app-details.c src/common-efl.c src/app-setting-info.c src/lock_screen_content.c src/notification-setting-info.c src/main.c 
 
 # EDC Sources
 USER_EDCS =  
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/de.po res/po/en_US.po res/po/fi.po res/po/zh_HK.po res/po/sl.po res/po/tr_TR.po res/po/pt_PT.po res/po/sr.po res/po/az.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/da.po res/po/en.po res/po/hi.po res/po/it_IT.po res/po/lt.po res/po/nb.po res/po/ja_JP.po res/po/ru_RU.po res/po/el_GR.po res/po/bg.po res/po/zh_TW.po res/po/pt_BR.po res/po/sv.po res/po/pl.po res/po/cs.po res/po/fr_CA.po res/po/zh_CN.po res/po/ar.po res/po/hu.po res/po/eu.po res/po/kk.po res/po/et.po res/po/ca.po res/po/fr.po res/po/nl.po res/po/sk.po res/po/is.po res/po/ka.po res/po/ro.po res/po/ko_KR.po res/po/es_US.po res/po/mk.po res/po/en_PH.po res/po/es_ES.po res/po/uz.po res/po/uk.po res/po/hr.po 
 
 # User Defines
-USER_DEFS = 
+USER_DEFS = TIZEN_DEPRECATION 
 USER_CPP_DEFS = 
 
 # User Undefines

diff --git a/src/pkgmgr-setting-info.c b/src/app-setting-info.c
similarity index 98%
rename from src/pkgmgr-setting-info.c
rename to src/app-setting-info.c
index 701979e..77b74be 100755 (executable)
--- a/src/pkgmgr-setting-info.c
+++ b/src/app-setting-info.c
@@ -16,7 +16,7 @@
 
 #include <stdlib.h>
 
-#include "pkgmgr-setting-info.h"
+#include "app-setting-info.h"
 #include <app_info.h>
 #include <app_manager.h>
 

diff --git a/src/common-efl.c b/src/common-efl.c
index 1affd63..3ef9799 100755 (executable)
--- a/src/common-efl.c
+++ b/src/common-efl.c
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-#include "pkgmgr-setting-info.h"
+#include "app-setting-info.h"
 #include "common-efl.h"
 #include "set-schedule-info.h"
 #include "allowed-calls.h"

diff --git a/src/main.c b/src/main.c
index 4b3eb9d..4889d89 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,7 @@
 #include <assert.h>
 #include <utils_i18n_ulocale.h>
 #include "do-not-disturb-efl.h"
-#include "pkgmgr-setting-info.h"
+#include "app-setting-info.h"
 #include "excepted-apps-efl.h"
 #include "common-efl.h"
 #include "app-details.h"

diff --git a/src/notification-setting-info.c b/src/notification-setting-info.c
index 53c7e83..4abaa58 100755 (executable)
--- a/src/notification-setting-info.c
+++ b/src/notification-setting-info.c
@@ -108,7 +108,7 @@ void create_do_not_disturb_application_list()
        NOTISET_TRACE_BEGIN;
        int i = 0;
        int count = 0;
-       char *package_name = NULL;
+       char *package_id = NULL;
        bool allow_to_notify = false;
        bool do_not_disturb_except = false;
        notification_setting_h setting_array = NULL;
@@ -129,8 +129,8 @@ void create_do_not_disturb_application_list()
                if (item_info) {
                        temp = setting_array + i;
 
-                       notification_setting_get_package_name(temp, &package_name);
-                       item_info->appid = package_name;
+                       notification_setting_get_appid(temp, &package_id);
+                       item_info->appid = package_id;
 
                        notification_setting_get_allow_to_notify(temp, &allow_to_notify);
                        item_info->allow_to_notify = allow_to_notify;
@@ -138,30 +138,30 @@ void create_do_not_disturb_application_list()
                        notification_setting_get_do_not_disturb_except(temp, &do_not_disturb_except);
                        item_info->do_not_disturb_except = do_not_disturb_except;
 
-                       item_info->icon = get_app_icon(package_name);
+                       item_info->icon = get_app_icon(package_id);
 
-                       if (!strcmp(package_name, CALENDAR_PACKAGE))
+                       if (!strcmp(package_id, CALENDAR_PACKAGE))
                                item_info->name = strdup(APP_STRING("IDS_COM_BODY_CALENDAR_EVENTS"));
-                       else if (!strcmp(package_name, CLOCK_PACKAGE))
+                       else if (!strcmp(package_id, CLOCK_PACKAGE))
                                item_info->name = strdup(APP_STRING("IDS_ST_BODY_ALARMS"));
                        else
-                               item_info->name = get_app_name(package_name);
+                               item_info->name = get_app_name(package_id);
 
                        item_info->index = i;
 
                        if (item_info->name) {
-                               if ((allow_to_notify && !strcmp(package_name, MESSAGES_PACKAGE))
-                                               || !strcmp(package_name, CLOCK_PACKAGE)
-                                               || !strcmp(package_name, CALENDAR_PACKAGE)) {
+                               if ((allow_to_notify && !strcmp(package_id, MESSAGES_PACKAGE))
+                                               || !strcmp(package_id, CLOCK_PACKAGE)
+                                               || !strcmp(package_id, CALENDAR_PACKAGE)) {
                                        setting_info->first_allowed_list = eina_list_append(setting_info->first_allowed_list, item_info);
                                        if (do_not_disturb_except) {
                                                setting_info->first_excepted_list = eina_list_append(setting_info->first_excepted_list, item_info);
                                        }
                                }
 
-                               if (allow_to_notify && strcmp(package_name, MESSAGES_PACKAGE)
-                                                                  && strcmp(package_name, CALENDAR_PACKAGE)
-                                                                  && strcmp(package_name, CLOCK_PACKAGE)) {
+                               if (allow_to_notify && strcmp(package_id, MESSAGES_PACKAGE)
+                                                                  && strcmp(package_id, CALENDAR_PACKAGE)
+                                                                  && strcmp(package_id, CLOCK_PACKAGE)) {
                                        if (do_not_disturb_except) {
                                                setting_info->excepted_list = eina_list_append(setting_info->excepted_list, item_info);
                                        } else {
@@ -169,7 +169,7 @@ void create_do_not_disturb_application_list()
                                        }
                                }
                        } else {
-                               FREEIF(package_name);
+                               FREEIF(package_id);
                                FREEIF(item_info->name);
                                FREEIF(item_info->icon);
                                FREEIF(item_info);