TizenRefApp-8052 Fix ABS build for tizen 4.0

Change-Id: Ib76fa961e772143295849aee1e7b295149d2785b
Signed-off-by: Oleksander Kostenko <o.kostenko@samsung.com>

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

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

diff --git a/Build/funcs.mk b/Build/funcs.mk
index 8297d1800ce08bf82e33bfd70ee837e22f4d745d..3ba778b3949fb7d2df9f4516fb94883b73f15a50 100644 (file)
--- a/Build/funcs.mk
+++ b/Build/funcs.mk
@@ -45,6 +45,6 @@ CONVERT_4MAKE_TO_OUT = $(subst $(DOTDOT),$(DOTDOT_OUT),$(subst $(COLON),$(COLON_
 PROC_NO_EXIST = $(if $(wildcard $(1)),,$(call $(2),$(1)))
 define MAKEDIRS0
        @echo '  Building directory: $(1)'
-       @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1)) 
+       @$(MKDIR) $(MKDIR_OP) $(subst $(BSLASH),/,$(1))
 endef
 MAKEDIRS = $(call PROC_NO_EXIST,$(1),MAKEDIRS0)

diff --git a/Build/makefile b/Build/makefile
index 3c3f61efb7ca742472df04985f8c1039b5c47bdf..f491b50b962ab78873a8262f00314974b5515978 100644 (file)
--- a/Build/makefile
+++ b/Build/makefile
@@ -14,8 +14,7 @@ clean : app_clean
 version : build_version
 
 #PROJ_ROOT = .
-PROJ_PATH ?= .#
-BUILD_ROOT ?= $(PROJ_PATH)/Build#
+BUILD_ROOT := $(PROJ_PATH)/Build#
 
 ifeq ($(MAKE_NAME),mingw32-make)
 ifneq ($(SHELL),)
@@ -25,7 +24,7 @@ endif
 
 app_build :
        @echo $(MAKE) -f "$(BUILD_ROOT)/makefile.mk"
-       @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
+       @$(MAKE_BIN) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS)
 
 app_clean :
        @$(MAKE) -f "$(BUILD_ROOT)/makefile.mk" -C "$(PROJ_PATH)" $(OPTIONS) clean

diff --git a/Build/makefile.mk b/Build/makefile.mk
index fd5349da5999bb66345b20bea2a0b4f394316692..205a3ad3c05a62d241f9341cbc3766f2f955dcbb 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,11 +32,8 @@ include $(BUILD_ROOT)/funcs.mk
 
 APPTYPE := $(type)
 
-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
+OUTPUT_DIR := $(PROJ_ROOT)/$(BUILD_CONFIG)
+OBJ_OUTPUT := $(OUTPUT_DIR)/objs
 
 LOWER_APPNAME := $(call LOWER_CASE,$(APPNAME))
 APPID2 := $(subst $(basename $(APPID)).,,$(APPID))
@@ -147,13 +144,14 @@ 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/project_def.prop b/project_def.prop
index 5657163d3d7a6102022cc56e96a76e5289acd907..edc7d2da6dd9aa7ad3fa124583c275cca79bb66a 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -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 = TIZEN_DEPRECATION 
+USER_DEFS = TIZEN_DEPRECATION DEPRECATION_WARNING 
 USER_CPP_DEFS = 
 
 # User Undefines

diff --git a/src/main.c b/src/main.c
index 4889d89f809a5429113bcf040b7cfb02327e8b3b..a6ba3899b4d9014c7c62abfefd0c7c75deb53dbb 100755 (executable)
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,7 @@
 #include <package_manager.h>
 #include <system_settings.h>
 #include <assert.h>
-#include <utils_i18n_ulocale.h>
+#include <utils_i18n.h>
 #include "do-not-disturb-efl.h"
 #include "app-setting-info.h"
 #include "excepted-apps-efl.h"

diff --git a/src/set-schedule-info.c b/src/set-schedule-info.c
index afdd1869ba77f40c232f5b505c2bc894ff0641ea..79caff7a747c4b84ea2d2fdf7a0ce010a3211a4f 100755 (executable)
--- a/src/set-schedule-info.c
+++ b/src/set-schedule-info.c
@@ -19,11 +19,7 @@
 #include <time.h>
 #include <notification_setting_internal.h>
 #include "notification-setting-info.h"
-#include <cleaned/utils_i18n_ustring.h>
-#include <utils_i18n_ulocale.h>
-#include <utils_i18n_udatepg.h>
-#include <utils_i18n_udate.h>
-#include <utils_i18n_ucalendar.h>
+#include <utils_i18n.h>
 
 enum TimeFormat {
        time_format_unknown,