From: Denis Dolzhenko Date: Thu, 27 Apr 2017 11:05:02 +0000 (+0300) Subject: Rename package X-Git-Tag: submit/tizen/20170505.073957^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bfcd52faf3075847f8f62602309c20fe112b82a;p=profile%2Fwearable%2Fapps%2Fnative%2Ftimer.git Rename package Update CLI build Add gitignore Change-Id: Ib950d807655d4342c27cbc21e35098ecd2d875f4 Signed-off-by: Denis Dolzhenko --- diff --git a/.cproject b/.cproject index 64a6e2c..4d5111d 100755 --- a/.cproject +++ b/.cproject @@ -22,22 +22,24 @@ - + - + - + - @@ -290,17 +301,19 @@ @@ -389,17 +406,19 @@ @@ -491,7 +514,6 @@ - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9fdd029 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +Debug/ +Release/ +crash-info +.sign +.checkers +*~ +/SA_Report +.rds_delta +.sdk_delta.info +.settings/ +.package-stamp +.svace-dir +*.edj diff --git a/Build/build_c.mk b/Build/build_c.mk index d818ab6..5fffeea 100755 --- a/Build/build_c.mk +++ b/Build/build_c.mk @@ -10,10 +10,11 @@ _FUNC_CPP2O = $(call _FUNC_EXT2O,$(1),$(2),cpp) # $(1) - C/C++ soruce file # $(2) - output path # $(3) - .ext -CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(call CONVERT_4MAKE_TO_OUT,$(patsubst %.$(3),%.o,$(1)))) +# $(4) - unique id +CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(notdir $(patsubst %.$(3),%-$(4).o,$(1)))) -CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) -CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) +#CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) +#CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) # parameter : @@ -27,13 +28,13 @@ CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) # output : # $(8) - output files list define C_BUILD_PROC_RAW -$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7) +$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) : $(call DECODE_4MAKE,$(1)) $(7) @echo ' Building file: $$<' @echo ' Invoking: $(3) Compiler' $$(call MAKEDIRS,$$(@D)) $(5) -c "$$<" -o "$$@" $(6) -Wp,@$(7) @echo ' Finished building: $$<' -$(8) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) +$(9) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) endef @@ -50,17 +51,17 @@ endef # $(10) - ext (c/cpp) # $(11) - compiler ($(CC)/$(CXX)) # output : -# $(12) - OBJS +# $(12) - OBJS # return : # none define C_PROC_RAW _OUTPUT_DIR := $$(strip $(1))# -_SRCS := $(2)# -_INCS := $(3)# -_INC_FILES := $(4)# -_DEFS := $(5)# -_UNDEFS := $(6)# +_SRCS := $(2)# +_INCS := $(3)# +_INC_FILES := $(4)# +_DEFS := $(5)# +_UNDEFS := $(6)# _OPT := $(7) _OPT_FILE := $(8) @@ -71,7 +72,7 @@ _COMPILER := $(11) #_OUTPUT_FILES := $(12) -_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) _ENC_SRCS := $$(filter %.$$(_EXT),$$(_ENC_SRCS)) ifneq ($$(strip $$(_SRCS)),) @@ -84,7 +85,7 @@ _ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \ ifneq ($$(strip $$(_ALL_SRCS)),) -_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) _CDEFS := $$(CDEFS) _CDEFS += $$(addprefix -D,$$(_DEFS)) @@ -92,15 +93,17 @@ _CDEFS += $$(addprefix -U,$$(_UNDEFS)) _ENC_C_INCS := $$(call ENCODE_4MAKE,$$(_INCS)) _ENC_C_INCS := $$(addprefix -I,$$(_ENC_C_INCS)) - -_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) + +_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) _ENC_INC_FILES += $$(addprefix -include,$$(_ENC_INC_FILES)) _C_INCS := $$(call DECODE_4MAKE,$$(_ENC_C_INCS) $$(_ENC_C_INC_FILES)) _DEFS := $$(_CDEFS) $$(_C_INCS) -I"pch" $$(_OPT) -$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$(12)))) +_UNIQUE_ID = $$(firstword $$(shell echo $$(var) | $$(CKSUM))) + +$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$$(_UNIQUE_ID),$(12)))) endif # (_(strip _(_ALL_SRCS)),) diff --git a/Build/tooldef.mk b/Build/tooldef.mk index fded35b..c62243c 100755 --- a/Build/tooldef.mk +++ b/Build/tooldef.mk @@ -61,3 +61,10 @@ MSGFMT = $(MSGFMT_BIN) else MSGFMT = msgfmt endif + +ifneq ($(strip $(CKSUM_BIN)),) +CKSUM = $(CKSUM_BIN) +else +CKSUM = cksum +endif + diff --git a/inc/main.h b/inc/main.h index e00e6f8..bd8ea6b 100755 --- a/inc/main.h +++ b/inc/main.h @@ -26,7 +26,7 @@ #include #if !defined(PACKAGE) -#define PACKAGE "timer" +#define PACKAGE "w-timer" #endif #define TIMER_EDJ "/edje/timer.edj" diff --git a/timer_alert/.project b/timer_alert/.project index 3061482..ec89d3c 100755 --- a/timer_alert/.project +++ b/timer_alert/.project @@ -3,6 +3,7 @@ timer_alert + timer diff --git a/timer_alert/.tproject b/timer_alert/.tproject index de5a150..7790bc5 100755 --- a/timer_alert/.tproject +++ b/timer_alert/.tproject @@ -8,5 +8,8 @@ + + + diff --git a/timer_alert/Build/basedef.mk b/timer_alert/Build/basedef.mk index 8812624..a762983 100755 --- a/timer_alert/Build/basedef.mk +++ b/timer_alert/Build/basedef.mk @@ -1,24 +1,34 @@ # Add inputs and outputs from these tool invocations to the build variables -C_DEPS += -USES_EFL = yes -USES_USR_INC = yes +OS_NAME := $(shell $(UNAME)) -SYSROOT = $(SBI_SYSROOT) -USR_INCS := $(addprefix -I $(SYSROOT),$(PLATFORM_INCS_EX)) -EFL_INCS = +#ifeq ($(origin BUILD_CONFIG), undefined) +BUILD_CONFIG ?= Debug +#endif -ifeq ($(strip $(PLATFORM_LIB_PATHS)),) -RS_LIB_PATHS := "$(SYSROOT)/usr/lib" -else -RS_LIB_PATHS := $(addprefix -L$(SYSROOT),$(PLATFORM_LIB_PATHS)) -endif +#ifeq ($(origin ARCH), undefined) +ARCH ?= i386 +#endif -RS_LIBRARIES := $(addprefix -l,$(RS_LIBRARIES_EX)) +#ifeq ($(origin PROJPATH), undefined) +PROJPATH ?= . +#endif -PLATFORM_INCS = $(USR_INCS) $(EFL_INCS) \ - -I"$(SDK_PATH)/library" -OS_NAME := $(shell $(UNAME)) +#ifeq ($(origin PROJ_PATH), undefined) +PROJ_PATH ?= $(PROJPATH) +#endif + +#ifeq ($(strip $(OUTPUT_DIR)),) +#OUTPUT_DIR ?= $(PROJ_PATH)/$(BUILD_CONFIG) +#endif + +#ifeq ($(strip $(BUILD_ARCH)),) +BUILD_ARCH ?= $(ARCH) +#endif + +#ifeq ($(strip $(ENVENTOR_PATH)),) +ENVENTOR_PATH ?= $(SDK_TOOLPATH)/enventor +#endif diff --git a/timer_alert/Build/build_c.mk b/timer_alert/Build/build_c.mk index 81940cd..5fffeea 100755 --- a/timer_alert/Build/build_c.mk +++ b/timer_alert/Build/build_c.mk @@ -10,10 +10,11 @@ _FUNC_CPP2O = $(call _FUNC_EXT2O,$(1),$(2),cpp) # $(1) - C/C++ soruce file # $(2) - output path # $(3) - .ext -CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(call CONVERT_4MAKE_TO_OUT,$(patsubst %.$(3),%.o,$(1)))) +# $(4) - unique id +CONVERT_ESC_EXT_TO_O = $(addprefix $(2)/,$(notdir $(patsubst %.$(3),%-$(4).o,$(1)))) -CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) -CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) +#CONVERT_ESC_C_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),c) +#CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) # parameter : @@ -27,13 +28,13 @@ CONVERT_ESC_CPP_TO_O = $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),cpp) # output : # $(8) - output files list define C_BUILD_PROC_RAW -$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4)) : $(call DECODE_4MAKE,$(1)) $(7) +$(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) : $(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)) +$(9) += $(call CONVERT_ESC_EXT_TO_O,$(1),$(2),$(4),$(8)) endef @@ -50,17 +51,17 @@ endef # $(10) - ext (c/cpp) # $(11) - compiler ($(CC)/$(CXX)) # output : -# $(12) - OBJS +# $(12) - OBJS # return : # none define C_PROC_RAW _OUTPUT_DIR := $$(strip $(1))# -_SRCS := $(2)# -_INCS := $(3)# -_INC_FILES := $(4)# -_DEFS := $(5)# -_UNDEFS := $(6)# +_SRCS := $(2)# +_INCS := $(3)# +_INC_FILES := $(4)# +_DEFS := $(5)# +_UNDEFS := $(6)# _OPT := $(7) _OPT_FILE := $(8) @@ -71,7 +72,7 @@ _COMPILER := $(11) #_OUTPUT_FILES := $(12) -_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_SRCS)) _ENC_SRCS := $$(filter %.$$(_EXT),$$(_ENC_SRCS)) ifneq ($$(strip $$(_SRCS)),) @@ -84,7 +85,7 @@ _ALL_SRCS := $$(call DECODE_4MAKE,$$(_NORMAL_SRCS)) \ ifneq ($$(strip $$(_ALL_SRCS)),) -_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) +_ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) _CDEFS := $$(CDEFS) _CDEFS += $$(addprefix -D,$$(_DEFS)) @@ -92,15 +93,17 @@ _CDEFS += $$(addprefix -U,$$(_UNDEFS)) _ENC_C_INCS := $$(call ENCODE_4MAKE,$$(_INCS)) _ENC_C_INCS := $$(addprefix -I,$$(_ENC_C_INCS)) - -_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) + +_ENC_INC_FILES := $$(call ENCODE_4MAKE,$$(_INC_FILES)) _ENC_INC_FILES += $$(addprefix -include,$$(_ENC_INC_FILES)) _C_INCS := $$(call DECODE_4MAKE,$$(_ENC_C_INCS) $$(_ENC_C_INC_FILES)) _DEFS := $$(_CDEFS) $$(_C_INCS) -I"pch" $$(_OPT) -$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$(12)))) +_UNIQUE_ID = $$(firstword $$(shell echo $$(var) | $$(CKSUM))) + +$$(foreach var,$$(_ENC_SRCS),$$(eval $$(call C_BUILD_PROC_RAW,$$(var),$$(_OUTPUT_DIR),$$(_EXT_TITLE),$$(_EXT),$$(_COMPILER),$$(_DEFS),$$(_OPT_FILE),$$(_UNIQUE_ID),$(12)))) endif # (_(strip _(_ALL_SRCS)),) diff --git a/timer_alert/Build/build_edc.mk b/timer_alert/Build/build_edc.mk index 8485bb2..6f85fdd 100755 --- a/timer_alert/Build/build_edc.mk +++ b/timer_alert/Build/build_edc.mk @@ -58,9 +58,9 @@ ifneq ($$(strip $$(_ALL_SRCS)),) _ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) -_COMPILER_FLAGS := -id "$$(_OUTPUT_DIR)" -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images" -_COMPILER_FLAGS += -sd "$$(_OUTPUT_DIR)" -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds" -_COMPILER_FLAGS += -fd "$$(_OUTPUT_DIR)" -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts" +_COMPILER_FLAGS := -id "$$(ENVENTOR_SHARED_RES_PATH)/images" +_COMPILER_FLAGS += -sd "$$(ENVENTOR_SHARED_RES_PATH)/sounds" +_COMPILER_FLAGS += -fd "$$(ENVENTOR_SHARED_RES_PATH)/fonts" ifneq ($$(strip $$(_IMAGE_DIRS)),) _COMPILER_FLAGS += $$(addprefix -id ,$$(_IMAGE_DIRS)) diff --git a/timer_alert/Build/build_po.mk b/timer_alert/Build/build_po.mk index 23eb0df..d88d71a 100755 --- a/timer_alert/Build/build_po.mk +++ b/timer_alert/Build/build_po.mk @@ -37,7 +37,7 @@ endef define MO_PROC_RAW -_PROJ_ROOT := $(1) +_OUTPUT_DIR := $(1) _SRCS := $(2) _APPNAME := $(3) diff --git a/timer_alert/Build/funcs.mk b/timer_alert/Build/funcs.mk index 8297d18..3ba778b 100755 --- a/timer_alert/Build/funcs.mk +++ b/timer_alert/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/timer_alert/Build/makefile b/timer_alert/Build/makefile index 9348c50..f491b50 100755 --- a/timer_alert/Build/makefile +++ b/timer_alert/Build/makefile @@ -24,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/timer_alert/Build/makefile.mk b/timer_alert/Build/makefile.mk index 7384d24..205a3ad 100755 --- a/timer_alert/Build/makefile.mk +++ b/timer_alert/Build/makefile.mk @@ -1,8 +1,8 @@ -# -# Usege : make -f /Build/makefile -C # - -BUILD_SCRIPT_VERSION := 1.2.2 +# Usege : make -f /Build/makefile -C +# + +BUILD_SCRIPT_VERSION := 1.2.3 .PHONY : app_version app_clean build_version @@ -14,18 +14,20 @@ clean : app_clean version : build_version -#PROJ_ROOT := $(call BSLASH2SLASH,$(PROJPATH)) +#PROJ_ROOT := $(call BSLASH2SLASH,$(PROJ_PATH)) PROJ_ROOT := . BUILD_ROOT := $(PROJ_ROOT)/Build +include $(BUILD_ROOT)/basedef.mk + include $(PROJ_ROOT)/project_def.prop -include $(PROJ_ROOT)/build_def.prop include $(BUILD_ROOT)/funcs.mk --include $(BUILD_ROOT)/basedef.mk -include $(BUILD_ROOT)/tooldef.mk -include $(BUILD_ROOT)/flags.mk +-include $(BUILD_ROOT)/platform.mk APPTYPE := $(type) @@ -63,11 +65,11 @@ 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 := # +OBJS := # # Global C/C++ ifeq ($(strip $(USER_ROOT)),) @@ -79,7 +81,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 @@ -107,7 +109,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 -Xlinker -rpath="/home/developer/sdk_tools/lib" --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) @@ -115,7 +117,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) @@ -123,7 +125,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 @@ -134,7 +136,7 @@ $(OBJ_OUTPUT) : $(OUTPUT_DIR) : $(call MAKEDIRS,$@) - + ifneq ($(strip $(PLATFORM_INCS)),) $(PLATFORM_INCS_FILE) : $(OBJ_OUTPUT) @echo ' Building inc file: $@' @@ -143,7 +145,7 @@ ifneq ($(findstring 3.82,$(MAKE_VERSION)),) $(file > $@,$(PLATFORM_INCS)) else @echo $(PLATFORM_INCS) > $@ -endif +endif else @echo $(PLATFORM_INCS) > $@ endif @@ -151,7 +153,11 @@ endif include $(BUILD_ROOT)/build_edc.mk - + +#ifeq ($(strip $(ENVENTOR_SHARED_RES_PATH)),) +ENVENTOR_SHARED_RES_PATH ?= $(ENVENTOR_PATH)/share/enventor +#endif + EDJ_FILES := # Global EDCs diff --git a/timer_alert/Build/platform.mk b/timer_alert/Build/platform.mk new file mode 100644 index 0000000..294a38a --- /dev/null +++ b/timer_alert/Build/platform.mk @@ -0,0 +1,15 @@ +# Add inputs and outputs from these tool invocations to the build variables + +SYSROOT = $(SBI_SYSROOT) + +USR_INCS := $(addprefix -I $(SYSROOT),$(PLATFORM_INCS_EX)) + +ifeq ($(strip $(PLATFORM_LIB_PATHS)),) +RS_LIB_PATHS := "$(SYSROOT)/usr/lib" +else +RS_LIB_PATHS := $(addprefix -L$(SYSROOT),$(PLATFORM_LIB_PATHS)) +endif + +RS_LIBRARIES := $(addprefix -l,$(RS_LIBRARIES_EX)) + +PLATFORM_INCS = $(USR_INCS) -I"$(SDK_PATH)/library" diff --git a/timer_alert/Build/tooldef.mk b/timer_alert/Build/tooldef.mk index 9df2a39..c62243c 100755 --- a/timer_alert/Build/tooldef.mk +++ b/timer_alert/Build/tooldef.mk @@ -1,17 +1,5 @@ # Add inputs and outputs from these tool invocations to the build variables -ifeq ($(strip $(BUILD_CONFIG)),) -BUILD_CONFIG = Debug -endif - -ifneq ($(strip $(PROJROOT)),) -PROJPATH := $(PROJROOT) -endif - -ifeq ($(strip $(OUTPUT_DIR)),) -OUTPUT_DIR := $(PROJPATH)/$(BUILD_CONFIG) -endif - ifneq ($(strip $(SHELL_BIN)),) SHELL = $(SHELL_BIN) else @@ -74,3 +62,9 @@ else MSGFMT = msgfmt endif +ifneq ($(strip $(CKSUM_BIN)),) +CKSUM = $(CKSUM_BIN) +else +CKSUM = cksum +endif + diff --git a/timer_alert/inc/ring.h b/timer_alert/inc/ring.h index ff259a0..4f42855 100755 --- a/timer_alert/inc/ring.h +++ b/timer_alert/inc/ring.h @@ -26,7 +26,7 @@ #if !defined(PACKAGE) -#define PACKAGE "timer" +#define PACKAGE "w-timer" #endif #define S_(x) (dgettext(PACKAGE, x)) diff --git a/timer_alert/project_def.prop b/timer_alert/project_def.prop index f069253..88c7958 100755 --- a/timer_alert/project_def.prop +++ b/timer_alert/project_def.prop @@ -18,7 +18,7 @@ USER_EDCS = USER_POS = # User Defines -USER_DEFS = +USER_DEFS = TIZEN_DEPRECATION DEPRECATION_WARNING USER_CPP_DEFS = # User Undefines @@ -42,7 +42,7 @@ USER_CPP_INC_FILES = USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS) # User Library Path -USER_LIB_DIRS = lib +USER_LIB_DIRS = # EDC Resource Path USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images diff --git a/timer_alert/tizen-manifest.xml b/timer_alert/tizen-manifest.xml index d199e05..588ebe0 100755 --- a/timer_alert/tizen-manifest.xml +++ b/timer_alert/tizen-manifest.xml @@ -1,7 +1,7 @@ - + - + ring.png diff --git a/tizen-manifest.xml b/tizen-manifest.xml index 8609396..d122991 100755 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -1,7 +1,7 @@ - + - +