Search the storage type on install

Change-Id: I94eed83b66744c4bcdffa5e3de9c31f99c65defc

diff --git a/.cproject b/.cproject
index a6da12c..ab7aa9b 100755 (executable)
--- a/.cproject
+++ b/.cproject
@@ -27,11 +27,17 @@
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.481743771" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.2102599528" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1070320025" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_gcc49.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.312288874" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -68,7 +74,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -86,14 +91,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -106,7 +107,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -146,11 +146,17 @@
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.247638963" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.982331969" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.1644890019" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.public.20161129_1_gcc49.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_gcc49.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1483034184" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/attach-panel&quot;"/>
@@ -187,7 +193,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efl-extension&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/efreet-1&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/EGL&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eina-1/eina&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/eio-1&quot;"/>
@@ -205,14 +210,10 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/freetype2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/geofence&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/gio-unix-2.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES2&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/GLES3&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/harfbuzz&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/iotcon&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/json-glib-1.0&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/KHR&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/location&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/maps&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/media&quot;"/>
@@ -225,7 +226,6 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/service-adaptor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/shortcut&quot;"/>
@@ -643,10 +643,10 @@
        </storageModule>
        <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
        <storageModule moduleId="refreshScope" versionNumber="2">
-               <configuration configurationName="Release">
+               <configuration configurationName="Debug">
                        <resource resourceType="PROJECT" workspacePath="/homescreen-efl"/>
                </configuration>
-               <configuration configurationName="Debug">
+               <configuration configurationName="Release">
                        <resource resourceType="PROJECT" workspacePath="/homescreen-efl"/>
                </configuration>
        </storageModule>

diff --git a/Build/basedef.mk b/Build/basedef.mk
index 64fbf82..a762983 100755 (executable)
--- 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_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 100755 (executable)
--- 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/apps_data.h b/inc/apps_data.h
index 695f792..d8984f4 100755 (executable)
--- a/inc/apps_data.h
+++ b/inc/apps_data.h
@@ -72,5 +72,6 @@ void apps_data_delete_list(Eina_List *list);
 app_data_t *apps_data_find_item_by_index(int index);
 int apps_data_get_folder_item_count(app_data_t *folder);
 void apps_data_update_item_label(void);
+storage_t apps_data_get_storage_type(const char *package);
 
 #endif /* __APPS_DATA_H__ */

diff --git a/project_def.prop b/project_def.prop
index e3e696d..b64d38e 100755 (executable)
--- a/project_def.prop
+++ b/project_def.prop
@@ -18,7 +18,7 @@ USER_EDCS =
 USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po 
 
 # User Defines
-USER_DEFS = 
+USER_DEFS = TIZEN_DEPRECATION 
 USER_CPP_DEFS = 
 
 # User Undefines

diff --git a/src/apps_data.c b/src/apps_data.c
index 83b65ee..f721a7e 100755 (executable)
--- a/src/apps_data.c
+++ b/src/apps_data.c
@@ -495,3 +495,22 @@ void apps_data_update_item_label(void)
                }
        }
 }
+
+storage_t apps_data_get_storage_type(const char *package)
+{
+       Eina_List *list = NULL;
+       Eina_List *find_list = NULL;
+       app_data_t *item = NULL;
+       storage_t storage_type = INTERNAL;
+
+       apps_package_manager_get_external_list(&list);
+
+       EINA_LIST_FOREACH(list, find_list, item) {
+               if ((strcmp(package, item->pkg_id) == 0) && item->owner && (strcmp(item->owner, TEMP_OWNER) == 0)) {
+                       storage_type = EXTERNAL;
+                       break;
+               }
+       }
+
+       return storage_type;
+}

diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c
index 82b8ada..00f2405 100755 (executable)
--- a/src/apps_package_manager.c
+++ b/src/apps_package_manager.c
@@ -268,6 +268,7 @@ static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e
        }
 
        if (__apps_data_pkg_get_apps_info(app_info, &item)) {
+               item->storage_type = apps_data_get_storage_type(item->pkg_id);
                apps_data_install(item);
        }
        app_info_destroy(app_info);
@@ -301,19 +302,10 @@ static void __apps_package_manager_uninstall(const char *package)
 
 static void __apps_package_manager_move(const char *package)
 {
-       Eina_List *list = NULL;
-       Eina_List *find_list = NULL;
-       app_data_t *item = NULL;
        storage_t storage_type = INTERNAL;
 
-       apps_package_manager_get_external_list(&list);
-
-       EINA_LIST_FOREACH(list, find_list, item) {
-               if ((strcmp(package, item->pkg_id) == 0) && item->owner && (strcmp(item->owner, TEMP_OWNER) == 0)) {
-                       storage_type = EXTERNAL;
-                       break;
-               }
-       }
+       storage_type = apps_data_get_storage_type(package);
+       LOGD("This package is installed: %d", storage_type);
 
        apps_data_move(package, storage_type);
 }