Make home can eable/diable App

Change-Id: I39d8fedf19ea59e4e7c0c5dbed2b15cdd6d8fa15

diff --git a/.cproject b/.cproject
index 2e3c45f..e307377 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-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.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;"/>
@@ -131,6 +131,7 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.cpp.compiler.option.include.paths.1857385470" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -145,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-emulator.core.public.20161215_1_llvm37.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core_llvm37.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;"/>
@@ -186,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;"/>
@@ -204,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;"/>
@@ -224,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;"/>
@@ -249,6 +250,7 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.c.compiler.option.include.paths.1774757534" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -279,7 +281,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1815664769" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.88475890" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.304005350" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>

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_package_manager.h b/inc/apps_package_manager.h
index 0c123c3..b2196f0 100755 (executable)
--- a/inc/apps_package_manager.h
+++ b/inc/apps_package_manager.h
@@ -27,6 +27,7 @@
 #include "apps_data.h"
 
 void apps_package_manager_init();
+void apps_package_manager_init_app_manager_event();
 Eina_Bool apps_package_manager_get_internal_list(Eina_List **list);
 Eina_Bool apps_package_manager_get_external_list(Eina_List **list);
 void apps_package_manager_update_label(const char *app_id, app_data_t *item);

diff --git a/inc/util.h b/inc/util.h
index b54d36d..baa1ef3 100755 (executable)
--- a/inc/util.h
+++ b/inc/util.h
@@ -48,7 +48,6 @@ enum app_subdir {
        APP_DIR_SHARED_TRUSTED,
        APP_DIR_EXTERNAL_DATA,
        APP_DIR_EXTERNAL_CACHE,
-       APP_DIR_EXTERNAL_SHARED_DATA,
 };
 
 const char *util_get_file_path(enum app_subdir dir, const char *relative);
@@ -62,6 +61,5 @@ const char *util_to_string(int num);
 #define util_get_trusted_file_path(x) util_get_file_path(APP_DIR_SHARED_TRUSTED, (x))
 #define util_get_external_data_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_DATA, (x))
 #define util_get_external_cache_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_CACHE, (x))
-#define util_get_external_shared_data_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_SHARED_DATA, (x))
 
 #endif /* __UTIL_H__ */

diff --git a/project_def.prop b/project_def.prop
index a027382..963fc12 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 f721a7e..8f4cba5 100755 (executable)
--- a/src/apps_data.c
+++ b/src/apps_data.c
@@ -48,6 +48,7 @@ void apps_data_init(void *data, Ecore_Thread *th)
        apps_package_manager_init();
        apps_package_manager_get_internal_list(&pkg_list);
        apps_package_manager_get_external_list(&pkg_list);
+       apps_package_manager_init_app_manager_event();
 
        if (!apps_db_create()) {
                apps_db_get_app_list(&db_list);
@@ -290,6 +291,7 @@ static int __apps_data_shortcut_request_cb(const char *package_name,
        new_item->position = INIT_VALUE;
        new_item->label_str = strdup(name);
        new_item->app_id = strdup(package_name);
+       new_item->enable = true;
 
        char* pkg_id = NULL;
        int ret = package_manager_get_package_id_by_app_id(package_name, &pkg_id);

diff --git a/src/apps_package_manager.c b/src/apps_package_manager.c
index 00f2405..7893509 100755 (executable)
--- a/src/apps_package_manager.c
+++ b/src/apps_package_manager.c
@@ -20,10 +20,14 @@
 #include "conf.h"
 
 static package_manager_h pkg_mgr = NULL;
+static app_manager_event_h app_mgr = NULL;
 
 static void __apps_package_manager_event_cb(const char *type, const char *package,
                package_manager_event_type_e event_type, package_manager_event_state_e event_state, int progress,
                package_manager_error_e error, void *user_data);
+static void __apps_app_manager_event_cb(const char *type, const char *app_id,
+               app_manager_event_type_e event_type, app_manager_event_state_e event_state,
+               app_manager_event_h handle, void *user_data);
 static bool __apps_data_pkg_get_apps_info(app_info_h app_handle, app_data_t **item);
 static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e comp_type, const char *app_id, void *data);
 static bool __apps_package_manager_get_internal_item(app_info_h app_handle, void *data);
@@ -31,8 +35,33 @@ static bool __apps_package_manager_get_external_item(app_info_h app_handle, void
 static void __apps_package_manager_install(const char *package);
 static void __apps_package_manager_uninstall(const char *package);
 static void __apps_package_manager_move(const char *package);
+static void __apps_app_manager_enable_app(const char *app_id);
+static void __apps_app_manager_disable_app(const char *app_id);
 
 
+
+void apps_package_manager_init_app_manager_event()
+{
+       int ret;
+       if (app_mgr != NULL)
+               return;
+
+       ret = app_manager_event_create(&app_mgr);
+       if (ret != APP_MANAGER_ERROR_NONE) {
+               LOGE("app_manager_event_create : failed[%d]", ret);
+       }
+
+       ret = app_manager_event_set_status(app_mgr, APP_MANAGER_EVENT_STATUS_TYPE_ALL);
+       if (ret != APP_MANAGER_ERROR_NONE) {
+               LOGE("app_manager_set_event_status : failed[%d]", ret);
+       }
+
+       ret = app_manager_set_event_cb(app_mgr, __apps_app_manager_event_cb, NULL);
+       if (ret != APP_MANAGER_ERROR_NONE) {
+               LOGE("app_manager_set_event_cb : failed[%d]", ret);
+       }
+}
+
 void apps_package_manager_init()
 {
        int ret;
@@ -55,6 +84,25 @@ void apps_package_manager_init()
        }
 }
 
+static void __apps_app_manager_event_cb(const char *type, const char *app_id,
+               app_manager_event_type_e event_type, app_manager_event_state_e event_state,
+               app_manager_event_h handle, void *user_data)
+{
+       LOGD("event_type: %d, event_state: %d", event_type, event_state);
+       if (event_state == APP_MANAGER_EVENT_STATE_STARTED) {
+               LOGI("app_id:%s type:%d state:APP_MANAGER_EVENT_STATE_STARTED", app_id, event_type);
+       } else if (event_state == APP_MANAGER_EVENT_STATE_COMPLETED) {
+               LOGI("app_id:%s type:%d APP_MANAGER_EVENT_STATE_COMPLETED", app_id, event_type);
+               if (event_type == APP_MANAGER_EVENT_ENABLE_APP) {
+                       __apps_app_manager_enable_app(app_id);
+               } else if (event_type == APP_MANAGER_EVENT_DISABLE_APP) {
+                       __apps_app_manager_disable_app(app_id);
+               }
+       } else {
+               LOGE("app_id:%s type:%d state:APP_MANAGER_EVENT_STATE_COMPLETED: FAILED", app_id, event_type);
+       }
+}
+
 static void __apps_package_manager_event_cb(const char *type, const char *package,
                package_manager_event_type_e event_type, package_manager_event_state_e event_state, int progress,
                package_manager_error_e error, void *user_data)
@@ -257,7 +305,7 @@ void apps_package_manager_update_label(const         char *app_id, app_data_t *item)
 
 static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e comp_type, const char *app_id, void *data)
 {
-       int ret = PACKAGE_MANAGER_ERROR_NONE;
+       int ret = APP_MANAGER_ERROR_NONE;
        app_info_h app_info = NULL;
        app_data_t *item = NULL;
 
@@ -276,6 +324,39 @@ static bool __apps_data_get_app_info_from_pkg(package_info_app_component_type_e
        return true;
 }
 
+static void __apps_app_manager_enable_app(const char *app_id)
+{
+       int ret = APP_MANAGER_ERROR_NONE;
+       app_info_h app_info = NULL;
+       app_data_t *item = NULL;
+
+       ret = app_manager_get_app_info(app_id, &app_info);
+       if (APP_MANAGER_ERROR_NONE != ret) {
+               LOGE("Failed to get app_info, return: [%d]", ret);
+               return;
+       }
+
+       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);
+}
+
+static void __apps_app_manager_disable_app(const char *app_id)
+{
+       Eina_List *list = apps_data_get_list();
+       app_data_t *item = NULL;
+       Eina_List *find_list;
+
+       EINA_LIST_FOREACH(list, find_list, item) {
+               if (item != NULL && !strcmp(item->app_id,app_id)) {
+                       apps_data_delete_item(item);
+                       break;
+               }
+       }
+}
+
 static void __apps_package_manager_install(const char *package)
 {
        package_info_h package_info = NULL;

diff --git a/src/cluster_page.c b/src/cluster_page.c
index 17f1072..3ac9a5a 100755 (executable)
--- a/src/cluster_page.c
+++ b/src/cluster_page.c
@@ -33,7 +33,6 @@ static struct {
 };
 
 static void __cluster_page_set(cluster_page_t *page, widget_data_t *item);
-static void __cluster_page_print_space(cluster_page_t *page);
 static void __cluster_page_get_widget_size(widget_size_type_e type, int *w, int *h);
 
 static void __cluster_page_edit_on_done(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -365,16 +364,6 @@ static void __cluster_page_set(cluster_page_t *page, widget_data_t *item)
        page->widget_list = eina_list_append(page->widget_list, item);
 }
 
-static void __cluster_page_print_space(cluster_page_t *page)
-{
-       LOGD("=========================================");
-       int i;
-       for (i = 0; i < 4; i++) {
-               LOGD("%d %d %d %d", page->space[i][0], page->space[i][1], page->space[i][2], page->space[i][3]);
-       }
-       LOGD("=========================================");
-}
-
 static void __cluster_page_get_widget_size(widget_size_type_e type, int *w, int *h)
 {
        switch (type) {

diff --git a/src/util.c b/src/util.c
index 5e911e7..9f6cdbe 100755 (executable)
--- a/src/util.c
+++ b/src/util.c
@@ -51,9 +51,6 @@ const char *util_get_file_path(enum app_subdir dir, const char *relative)
        case APP_DIR_EXTERNAL_CACHE:
                prefix = app_get_external_cache_path();
                break;
-       case APP_DIR_EXTERNAL_SHARED_DATA:
-               prefix = app_get_external_shared_data_path();
-               break;
        default:
                LOGE("Not handled directory type.");
                return NULL;