Rename package.

Add CLI build.

Change-Id: Ie9072943a7a1a7cedad973a1e7a0284bd4f8037a
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/.gitignore b/.gitignore
index 65a06db93394cd9a2f1d5598e9387e7999743b60..417846be831ebae30b6d04d142e64b3f95ca80a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ crash-info
 .rds_delta
 .sdk_delta.info
 .settings/
-org.tizen.message-Test-result.xml
+org.tizen.w-message-Test-result.xml
 .package-stamp
 .svace-dir
 *.edj

diff --git a/Build/build_c.mk b/Build/build_c.mk
index d818ab60863c060fd236ec1ec69b6a7a9a04acb7..5fffeea1e3aa3585c73d5dd50d3cc762b9f0dda5 100644 (file)
--- 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 fded35b84fe9b3bb17de5ed900aeb83422bece9e..c62243c3abd95299a04a7c8dcedcd387eea89dda 100644 (file)
--- 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/Config.h b/inc/Config.h
index 86366680b5a633ce59d6c4723f75d8eed10f2c7d..4cd5c2c904ff17d971a978df9607a1b014928e1e 100644 (file)
--- a/inc/Config.h
+++ b/inc/Config.h
@@ -18,11 +18,11 @@
 #define Config_h_
 
 #if !defined(PACKAGE_NAME)
-#define PACKAGE_NAME "org.tizen.message"
+#define PACKAGE_NAME "org.tizen.w-message"
 #endif
 
 #if !defined(PROJECT_NAME)
-#define PROJECT_NAME "message"
+#define PROJECT_NAME "w-message"
 #endif
 
 #ifdef  LOGGER_TAG

diff --git a/project_def.prop b/project_def.prop
index c1357f88ba5481b816b61a723270e02f96b1cc81..787ea7e46fa45c8ef97d9a7258ffb46981ebc7ef 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -9,17 +9,17 @@ type = app
 profile = wearable-3.0
 
 # C/CPP Sources
-USER_SRCS = src/Common/View/src/ListItem.cpp src/Conversation/View/src/BubbleImageViewItem.cpp src/Common/MsgEngine/src/dummy/MsgStorageDummy.cpp src/Common/MsgEngine/src/MsgThreadItem.cpp src/Common/View/src/SearchBar.cpp src/Conversation/Controller/src/BubbleVideoEntity.cpp src/Common/MsgEngine/src/dummy/MsgComposerDummy.cpp src/Composer/View/src/ContactListViewItem.cpp src/Common/MsgEngine/src/private/MsgReportPrivate.cpp src/Common/AppControl/src/ContactEditor.cpp src/Common/ContactManager/src/ContactRecord.cpp src/Common/MsgEngine/src/MsgSettings.cpp src/Conversation/View/src/BubbleSubjectViewItem.cpp src/Common/ContactManager/src/ContactVCardGenerator.cpp src/Common/MsgEngine/src/private/MsgConvMediaPrivate.cpp src/Common/MsgEngine/src/MessageSMS.cpp src/Common/MsgEngine/src/dummy/MessageDummy.cpp src/Common/View/src/CtxPopup.cpp src/MainApp/main.cpp src/Conversation/View/src/BubbleIconTextLayoutItem.cpp src/Conversation/View/src/BubbleTextViewItem.cpp src/Common/MsgEngine/src/MessageMms.cpp src/Common/View/src/InputLayout.cpp src/Common/MsgEngine/src/private/MsgAddressPrivate.cpp src/Common/MsgEngine/src/MsgTransport.cpp src/Conversation/Controller/src/ConvFrame.cpp src/Common/View/src/IconTextPopup.cpp src/Common/View/src/ToastPopup.cpp src/Common/View/src/MoreOption.cpp src/Common/View/src/View.cpp src/Conversation/View/src/BubbleItemContainer.cpp src/Common/MsgEngine/src/dummy/MsgConversationItemDummy.cpp src/Common/Utils/src/PathUtils.cpp src/Common/MsgEngine/src/MsgUtils.cpp src/Common/AppControl/src/VoiceCall.cpp src/Common/MsgEngine/src/private/MsgConversationItemPrivate.cpp src/Common/Utils/src/PhoneNumberUtils.cpp src/Common/MsgEngine/src/private/MessagePrivate.cpp src/Common/View/src/PopupListItem.cpp src/Common/View/src/StandardPopup.cpp src/Common/MsgEngine/src/MsgEngine.cpp src/Common/Utils/src/ThumbnailMaker.cpp src/Conversation/View/src/ConvDateLineListItem.cpp src/Common/View/src/MbeRecipientsView.cpp src/Common/View/src/Entry.cpp src/Composer/View/src/MsgBodyView.cpp src/MsgThread/Controller/src/ThreadListItem.cpp src/Common/MsgEngine/src/dummy/MsgPageDummy.cpp src/Common/MsgEngine/src/dummy/MessageSMSDummy.cpp src/Conversation/View/src/ConvListViewItem.cpp src/Common/MsgEngine/src/dummy/MessageMmsDummy.cpp src/Common/View/src/BottomButton.cpp src/Composer/Controller/src/ComposerFrame.cpp src/Conversation/View/src/ConvReplyListItem.cpp src/Common/Utils/src/WorkingDir.cpp src/Conversation/Controller/src/BubbleSubjectEntity.cpp src/Common/AppControl/src/AppControlParser.cpp src/Common/MsgEngine/src/private/MessageSMSPrivate.cpp src/Common/AppControl/src/AppControlDefault.cpp src/Common/AppControl/src/AppControlCommand.cpp src/Common/View/src/DefaultLayout.cpp src/Common/View/src/StandardWindow.cpp src/Common/MsgEngine/src/dummy/MsgAddressDummy.cpp src/Common/Controller/src/FrameController.cpp src/Common/MsgEngine/src/Message.cpp src/Common/MsgEngine/src/private/MsgTransportPrivate.cpp src/Common/View/src/ListView.cpp src/Conversation/Controller/src/ConvList.cpp src/Composer/View/src/RecipFieldView.cpp src/MsgThread/Controller/src/ThreadList.cpp src/Common/AppControl/src/Share.cpp src/MsgThread/Controller/src/MsgThreadFrame.cpp src/Common/MsgEngine/src/MsgStorage.cpp src/Common/Controller/src/InputFrame.cpp src/Common/MsgEngine/src/private/MsgAttachmentPrivate.cpp src/Conversation/View/src/BubbleVoiceViewItem.cpp src/Common/Utils/src/LoggerImpl.cpp src/Common/View/src/SelectButton.cpp src/Conversation/Controller/src/BubbleEntityFactory.cpp src/Common/View/src/SelectAllListItem.cpp src/Common/AppControl/src/AppControlUtils.cpp src/Common/AppControl/src/AppControlLauncher.cpp src/Common/MsgEngine/src/dummy/MsgTransportDummy.cpp src/Common/AppControl/src/ContactViewer.cpp src/Common/View/src/NaviFrameView.cpp src/Conversation/Controller/src/ConvListItem.cpp src/Common/Controller/src/NaviFrameController.cpp src/Common/MsgEngine/src/private/MsgThreadItemPrivate.cpp src/Common/Utils/src/TextDecorator.cpp src/Composer/Controller/src/RecipFrame.cpp src/Common/ContactManager/src/ContactVCardParser.cpp src/Conversation/View/src/ConvTitleListItem.cpp src/Common/AppControl/src/FileViewer.cpp src/Common/MsgEngine/src/dummy/MsgUtilsDummy.cpp src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp src/Common/View/src/ViewItem.cpp src/Common/View/src/LineListViewItem.cpp src/Common/MsgEngine/src/dummy/MsgMediaDummy.cpp src/Common/MsgEngine/src/private/MsgMediaPrivate.cpp src/Conversation/Controller/src/BubbleCalEventEntity.cpp src/Common/AppControl/src/AppControlCompose.cpp src/Common/Recipient/src/Recipient.cpp src/Composer/Controller/src/RecipInputFrame.cpp src/Common/MsgEngine/src/dummy/MsgThreadItemDummy.cpp src/Common/Controller/src/App.cpp src/Common/View/src/Popup.cpp src/Common/View/src/PopupAttachmentListItem.cpp src/Common/View/src/BasePopup.cpp src/Viewer/Controller/src/Viewer.cpp src/Common/View/src/PopupManager.cpp src/Common/MsgEngine/src/private/MsgPagePrivate.cpp src/Common/View/src/NaviFrameItem.cpp src/Common/View/src/PopupList.cpp src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp src/Common/MsgEngine/src/private/MsgStoragePrivate.cpp src/Common/MsgEngine/src/dummy/MsgAttachmentDummy.cpp src/MsgThread/View/src/ThreadListViewItem.cpp src/Common/MsgEngine/src/dummy/MsgReportDummy.cpp src/Common/MsgEngine/src/dummy/MsgSettingsDummy.cpp src/Common/Utils/src/TimeUtils.cpp src/Common/Utils/src/FileUtils.cpp src/MainApp/MainApp.cpp src/Settings/Controller/src/SettingsFrame.cpp src/Common/MsgEngine/src/private/MsgUtilsPrivate.cpp src/Conversation/View/src/BubbleViewItem.cpp src/Common/Utils/src/MediaUtils.cpp src/Common/MsgEngine/src/dummy/MsgConvMediaDummy.cpp src/Composer/Controller/src/ContactFrame.cpp src/MsgThread/View/src/ThreadComposeListViewItem.cpp src/Common/MsgEngine/src/MsgPage.cpp src/Conversation/Controller/src/BubbleContactEntity.cpp src/Common/MsgEngine/src/MsgConversationItem.cpp src/Common/View/src/NoContentLayout.cpp src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp src/Common/MsgEngine/src/private/MsgSettingsPrivate.cpp src/Common/ContactManager/src/ContactManager.cpp 
+USER_SRCS = src/Common/MsgEngine/src/MsgThreadItem.cpp src/Common/Utils/src/VCalendarParser.cpp src/Common/MsgEngine/src/dummy/MsgStorageDummy.cpp src/Composer/View/src/ContactListViewItem.cpp src/Conversation/Controller/src/ConvFrame.cpp src/Common/MsgEngine/src/dummy/MessageDummy.cpp src/Common/MsgEngine/src/private/MsgAddressPrivate.cpp src/MainApp/MainApp.cpp src/Conversation/View/src/BubbleIconTextLayoutItem.cpp src/Common/MsgEngine/src/private/MsgReportPrivate.cpp src/Conversation/View/src/BubbleTextViewItem.cpp src/Composer/Controller/src/ContactFrame.cpp src/Common/Utils/src/MediaPlayer.cpp src/Conversation/Controller/src/BubbleVideoEntity.cpp src/Common/View/src/ListItem.cpp src/Common/MsgEngine/src/dummy/MsgConvMediaDummy.cpp src/Common/MsgEngine/src/private/MsgTransportPrivate.cpp src/Common/Utils/src/MediaPlayerProvider.cpp src/Conversation/View/src/BubbleViewItem.cpp src/Conversation/Controller/src/BubbleContactEntity.cpp src/Common/View/src/MoreOption.cpp src/Common/MsgEngine/src/Message.cpp src/Conversation/View/src/BubbleItemContainer.cpp src/Common/AppControl/src/AppControlDefault.cpp src/Common/View/src/ListView.cpp src/Common/MsgEngine/src/MessageMms.cpp src/Common/MsgEngine/src/private/MsgConvMediaPrivate.cpp src/Common/MsgEngine/src/MsgTransport.cpp src/Common/ContactManager/src/ContactRecord.cpp src/Common/MsgEngine/src/private/MsgSentStatusPrivate.cpp src/Common/Utils/src/WorkingDir.cpp src/Common/View/src/BasePopup.cpp src/Settings/Controller/src/BlockedMsgListItem.cpp src/Common/Utils/src/FileUtils.cpp src/Settings/Controller/src/SettingsFrame.cpp src/Conversation/View/src/BubbleImageViewItem.cpp src/Settings/View/src/BlockedMsgListViewItem.cpp src/Conversation/View/src/BubbleSubjectViewItem.cpp src/Common/MsgEngine/src/MessageSMS.cpp src/Settings/Controller/src/SettingsBlockListFrame.cpp src/Common/MsgEngine/src/private/MessagePrivate.cpp src/Conversation/Controller/src/ConvList.cpp src/Common/View/src/InputLayout.cpp src/Common/View/src/MbeRecipientsView.cpp src/MsgThread/Controller/src/ThreadListItem.cpp src/Common/View/src/Entry.cpp src/Common/View/src/Popup.cpp src/Common/ContactManager/src/ContactVCardParser.cpp src/Viewer/Controller/src/Viewer.cpp src/Conversation/Controller/src/ConvListItem.cpp src/Common/AppControl/src/AppControlCompose.cpp src/Common/MsgEngine/src/MsgUtils.cpp src/Common/Recipient/src/Recipient.cpp src/Common/Utils/src/PhoneNumberUtils.cpp src/Common/MsgEngine/src/private/MessageSMSPrivate.cpp src/Conversation/View/src/ConvReplyListItem.cpp src/Common/View/src/ToastPopup.cpp src/Common/View/src/View.cpp src/Common/MsgEngine/src/private/MsgConversationItemPrivate.cpp src/Common/Controller/src/FrameController.cpp src/Common/AppControl/src/AppControlCommand.cpp src/Composer/View/src/MsgBodyView.cpp src/Common/MsgEngine/src/dummy/MsgAddressDummy.cpp src/Conversation/Controller/src/BubbleSubjectEntity.cpp src/Common/MsgEngine/src/dummy/MsgComposerDummy.cpp src/Common/MsgEngine/src/private/MsgThreadItemPrivate.cpp src/Common/View/src/StandardPopup.cpp src/Common/MsgEngine/src/MsgEngine.cpp src/Common/AppControl/src/AppControlParser.cpp src/Common/AppControl/src/ContactPicker.cpp src/Common/View/src/NaviFrameView.cpp src/Common/AppControl/src/FileViewer.cpp src/Conversation/View/src/ConvDateLineListItem.cpp src/Common/MsgEngine/src/dummy/MsgPageDummy.cpp src/Common/Utils/src/PathUtils.cpp src/Common/View/src/CtxPopup.cpp src/Common/AppControl/src/VoiceCall.cpp src/Common/MsgEngine/src/MsgSettings.cpp src/Common/MsgEngine/src/dummy/MsgConversationItemDummy.cpp src/Common/ContactManager/src/ContactVCardGenerator.cpp src/Common/AppControl/src/AppControlLauncher.cpp src/Common/Utils/src/LoggerImpl.cpp src/Common/ContactManager/src/ContactManager.cpp src/Common/View/src/SelectButton.cpp src/Conversation/Controller/src/BubbleEntityFactory.cpp src/Settings/View/src/BlockedNumberListViewItem.cpp src/Common/MsgEngine/src/private/MsgAttachmentPrivate.cpp src/Settings/View/src/SettingsMenuListItem.cpp src/Common/View/src/ViewItem.cpp src/Common/MsgEngine/src/private/MsgMediaPrivate.cpp src/Conversation/Controller/src/BubbleAudioEntity.cpp src/Common/Controller/src/InputFrame.cpp src/Conversation/View/src/BubbleAudioViewItem.cpp src/Composer/View/src/RecipFieldView.cpp src/Common/AppControl/src/Share.cpp src/MsgThread/Controller/src/MsgThreadFrame.cpp src/Common/View/src/StandardWindow.cpp src/Common/MsgEngine/src/MsgConversationItem.cpp src/Common/MsgEngine/src/dummy/MsgUtilsDummy.cpp src/Common/View/src/LineListViewItem.cpp src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp src/Settings/Controller/src/SettingsBlockedMsgDetailFrame.cpp src/Common/MsgEngine/src/dummy/MsgMediaDummy.cpp src/Common/View/src/DefaultLayout.cpp src/Composer/Controller/src/RecipFrame.cpp src/Settings/Controller/src/SettingsMenuBlockListFrame.cpp src/Common/MsgEngine/src/dummy/MsgSettingsDummy.cpp src/Common/View/src/PopupListItem.cpp src/Common/MsgEngine/src/dummy/MsgAttachmentDummy.cpp src/Common/MsgEngine/src/dummy/MessageSMSDummy.cpp src/Common/View/src/BottomButton.cpp src/Common/Controller/src/NaviFrameController.cpp src/Common/MsgEngine/src/dummy/MsgTransportDummy.cpp src/MsgThread/Controller/src/ThreadList.cpp src/Common/Utils/src/TextDecorator.cpp src/Common/MsgEngine/src/dummy/MessageMmsDummy.cpp src/Common/MsgEngine/src/MsgStorage.cpp src/Common/View/src/SelectAllListItem.cpp src/Common/AppControl/src/ContactViewer.cpp src/Conversation/View/src/ConvListViewItem.cpp src/Common/Utils/src/ThumbnailMaker.cpp src/Common/View/src/NaviFrameItem.cpp src/Composer/Controller/src/MsgBodyFrame.cpp src/Common/View/src/PopupList.cpp src/Settings/View/src/SettingsBlockedMsgDetailView.cpp src/Common/Controller/src/App.cpp src/Common/View/src/PopupAttachmentListItem.cpp src/Common/MsgEngine/src/private/MsgComposerPrivate.cpp src/Common/Utils/src/MediaUtils.cpp src/Common/MsgEngine/src/dummy/MsgThreadItemDummy.cpp src/Common/View/src/TitleListItem.cpp src/Common/Utils/src/TimeUtils.cpp src/Conversation/Controller/src/BubbleCalEventEntity.cpp src/Common/MsgEngine/src/private/MsgSettingsPrivate.cpp src/Composer/Controller/src/RecipInputFrame.cpp src/Common/View/src/IconTextPopup.cpp src/MainApp/main.cpp src/Settings/Controller/src/BlockedNumberListItem.cpp src/Common/View/src/NoContentLayout.cpp src/Common/SystemSettingsManager/src/SystemSettingsManager.cpp src/Common/MsgEngine/src/dummy/MsgReportDummy.cpp src/Composer/Controller/src/ContactListItem.cpp src/Common/MsgEngine/src/MsgPage.cpp src/Common/AppControl/src/ContactEditor.cpp src/Common/MsgEngine/src/private/MsgUtilsPrivate.cpp src/Common/View/src/PopupManager.cpp src/MsgThread/View/src/ThreadComposeListViewItem.cpp src/Common/MsgEngine/src/private/MsgStoragePrivate.cpp src/Common/View/src/SearchBar.cpp src/MsgThread/View/src/ThreadListViewItem.cpp src/Common/MsgEngine/src/private/MsgPagePrivate.cpp src/Common/AppControl/src/AppControlUtils.cpp 
 
 # EDC Sources
 USER_EDCS =  
 
 # PO Sources
-USER_POS = res/po/is.po res/po/ka.po res/po/az.po res/po/sr.po res/po/en_US.po res/po/ru_RU.po res/po/el_GR.po res/po/pt_BR.po res/po/gl.po res/po/hi.po res/po/en.po res/po/zh_HK.po res/po/zh_CN.po res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_PT.po res/po/ja_JP.po res/po/lt.po res/po/nb.po res/po/sv.po res/po/zh_TW.po res/po/hy.po res/po/es_US.po res/po/hu.po res/po/uz.po res/po/hr.po res/po/ro.po res/po/ko_KR.po res/po/it_IT.po res/po/bg.po res/po/cs.po res/po/fr_CA.po res/po/pl.po res/po/ga.po res/po/lv.po res/po/ar.po res/po/fi.po res/po/en_PH.po res/po/uk.po res/po/sl.po res/po/sk.po res/po/tr_TR.po res/po/de.po res/po/da.po res/po/et.po res/po/eu.po res/po/kk.po res/po/mk.po res/po/es_ES.po 
+USER_POS = res/po/et.po res/po/eu.po res/po/kk.po res/po/it_IT.po res/po/ga.po res/po/lv.po res/po/de.po res/po/lt.po res/po/mk.po res/po/tr_TR.po res/po/hr.po res/po/pl.po res/po/es_ES.po res/po/uz.po res/po/ko_KR.po res/po/ja_JP.po res/po/en.po res/po/fr_CA.po res/po/en_PH.po res/po/cs.po res/po/ro.po res/po/zh_HK.po res/po/ar.po res/po/ka.po res/po/zh_CN.po res/po/gl.po res/po/hy.po res/po/es_US.po res/po/ru_RU.po res/po/el_GR.po res/po/pt_BR.po res/po/az.po res/po/en_US.po res/po/ca.po res/po/nl.po res/po/pt_PT.po res/po/hu.po res/po/is.po res/po/da.po res/po/hi.po res/po/bg.po res/po/fr.po res/po/sk.po res/po/sv.po res/po/nb.po res/po/sl.po res/po/zh_TW.po res/po/uk.po res/po/sr.po res/po/fi.po 
 
 # User Defines
 USER_DEFS = 
-USER_CPP_DEFS = 
+USER_CPP_DEFS = MSG_PRIVATE_API 
 
 # User Undefines
 USER_UNDEFS = 
@@ -36,13 +36,13 @@ USER_OBJS =
 USER_C_INC_DIRS = 
 USER_INC_FILES = 
 ## C++ Compiler
-USER_CPP_INC_DIRS = src/Conversation/Controller/inc src/Conversation/View/inc src/Common/Recipient/inc src/Composer/View/inc src/Composer/Controller/inc src/MsgThread/View/inc src/Settings/Controller/inc src/MsgThread/Controller/inc src/Viewer/Controller/inc inc src/Common/Controller/inc src/Conversation/Controller/inc src/Conversation/View/inc src/Common/AppControl/inc src/Common/ContactManager/inc src/Common/MsgEngine/inc src/Common/SystemSettingsManager/inc src/Common/Utils/inc src/Common/View/inc 
+USER_CPP_INC_DIRS = src/Conversation/Controller/inc src/Conversation/View/inc src/Common/Recipient/inc src/Composer/View/inc src/Composer/Controller/inc src/MsgThread/View/inc src/Settings/Controller/inc src/Settings/View/inc src/MsgThread/Controller/inc src/Viewer/Controller/inc inc src/Common/Controller/inc src/Conversation/Controller/inc src/Conversation/View/inc src/Common/AppControl/inc src/Common/ContactManager/inc src/Common/MsgEngine/inc src/Common/SystemSettingsManager/inc src/Common/Utils/inc src/Common/View/inc 
 USER_CPP_INC_FILES = 
 
 USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
 
 # User Library Path
-USER_LIB_DIRS = 
+USER_LIB_DIRS = lib 
 
 # EDC Resource Path
 USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images 
@@ -52,7 +52,7 @@ USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
 # EDC Flags
 USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/conv_list_bubble.edc res/edje/msg_body.edc res/edje/composer_layout.edc res/edje/recip_entry.edc res/edje/icons.edc res/edje/images.edc res/edje/default_layout.edc res/edje/search_bar.edc res/edje/recip_layout.edc res/edje/input_layout.edc res/edje/popup.edc res/edje/thread_compose_list_view_item.edc res/edje/conv_genlist_theme.edc res/edje/thread_genlist_theme.edc 
+USER_EXT_EDC0_EDCS = res/edje/default_layout.edc res/edje/common_genlist_theme.edc res/edje/thread_compose_list_view_item.edc res/edje/images.edc res/edje/conv_genlist_theme.edc res/edje/input_layout.edc res/edje/preview_msg_genlist_theme.edc res/edje/recip_entry.edc res/edje/icons.edc res/edje/msg_body.edc res/edje/recip_layout.edc res/edje/search_bar.edc res/edje/popup.edc res/edje/conv_list_bubble.edc 
 USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images 
 USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds 
 USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts 

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 43bb7925e77dbb0beee6147ff5e92de9b965c2f8..73f2ff64d613872eb2858694c06b6fb55a273678 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.message" version="0.0.1">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.w-message" version="0.0.1">
     <profile name="wearable"/>
-    <ui-application appid="org.tizen.message" exec="message" multiple="false" launch_mode="caller" nodisplay="false" taskmanage="true" process-pool="true" type="c++app">
+    <ui-application appid="org.tizen.w-message" exec="message" multiple="false" launch_mode="caller" nodisplay="false" taskmanage="true" process-pool="true" type="c++app">
         <label>Message</label>
         <label xml:lang="ar-ae">الرسائل</label>
         <label xml:lang="as-in">মেছেজসমূহ</label>