- Fix hardcoding path.
- Use %cmake to set default paths.
- Fix type casting between pointer and int.
Change-Id: I5159910913c5ff582579bbc6982dd6d7f1166186
INSTALL(FILES ${RINGTONE-FILES} DESTINATION /usr/share/media/)
CONFIGURE_FILE(msg-service.pc.in msg-service.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/msg-service.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/msg-service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
SET(RC_LOCAL_SCRIPT msg-server)
INSTALL(PROGRAMS ${RC_LOCAL_SCRIPT} DESTINATION /etc/rc.d/init.d)
ADD_LIBRARY(${PLUGIN-MANAGER-LIB} SHARED ${PLUGIN-MANAGER-SRCS})
TARGET_LINK_LIBRARIES(${PLUGIN-MANAGER-LIB} ${plugin_manager_pkgs_LDFLAGS} ${UTILS-LIB} dl)
-INSTALL(TARGETS ${PLUGIN-MANAGER-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${PLUGIN-MANAGER-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
##########################################################
# Define Messaging Framework Handler
ADD_LIBRARY(${FW-HANDLER-LIB} SHARED ${FW-HANDLER-SRCS})
TARGET_LINK_LIBRARIES(${FW-HANDLER-LIB} ${fw_handler_pkgs_LDFLAGS} ${UTILS-LIB} ${PLUGIN-MANAGER-LIB})
-INSTALL(TARGETS ${FW-HANDLER-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${FW-HANDLER-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
##########################################################
# Define Transaction Manager
ADD_LIBRARY(${TRANS-MANAGER-LIB} SHARED ${TRANS-MANAGER-SRCS})
TARGET_LINK_LIBRARIES(${TRANS-MANAGER-LIB} ${trans_manager_pkgs_LDFLAGS} ${UTILS-LIB} ${FW-HANDLER-LIB})
-INSTALL(TARGETS ${TRANS-MANAGER-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${TRANS-MANAGER-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
##########################################################
# Define Execute File
mainloop = g_main_loop_new(NULL, FALSE);
- g_type_init();
+#if !GLIB_CHECK_VERSION(2,35,0)
+ g_type_init ();
+#endif
g_idle_add(InitThreadFunc, NULL);
return MsgMakeEvent(NULL, 0, MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);
}
+#ifdef __x86_64__
+ uint64_t ret[3] = {0}; //3// reqid, status, object
+#else
unsigned int ret[3] = {0}; //3// reqid, status, object
+#endif
ret[0] = pStatus->reqId;
ret[1] = pStatus->status;
return MsgMakeEvent(NULL, 0, MSG_EVENT_PLG_SENT_STATUS_CNF, MSG_SUCCESS, (void**)ppEvent);
}
+#ifdef __x86_64__
+ uint64_t ret[3] = {0}; //3// reqid, status, object
+#else
unsigned int ret[3] = {0}; //3// reqid, status, object
+#endif
ret[0] = reqID;
ret[1] = msgInfo.networkStatus;
INCLUDE FILES
==================================================================================================*/
#include "MsgMmsTypes.h"
-
+#include <inttypes.h>
/*==================================================================================================
DEFINES
typedef struct
{
int listenerFd; /**< Rx fd for status cnf */
+#ifdef __x86_64__
+ uint64_t handleAddr; /**< Handle address for status cnf */
+#else
unsigned int handleAddr; /**< Handle address for status cnf */
+#endif
msg_message_id_t sentMsgId; /**< The ID of a sent message for updating message status */
-} MSG_PROXY_INFO_S;
+} MSG_PROXY_INFO_S;
/**
* @brief Aux data structure for MSG_CMD_REG_INCOMING_MSG_CB. \n
msg_error_t _MsgMmsReleaseMetaList(MMS_MESSAGE_DATA_S *pMsgData);
msg_error_t _MsgMmsReleaseTransitionList(MMS_MESSAGE_DATA_S *pMsgData);
-char *_MsgMmsSerializeMessageData(const MMS_MESSAGE_DATA_S *pMsgData, unsigned int *pSize);
+char *_MsgMmsSerializeMessageData(const MMS_MESSAGE_DATA_S *pMsgData, size_t *pSize);
bool _MsgMmsDeserializeMessageData(MMS_MESSAGE_DATA_S *pBody, char *pFileData);
bool _MsgMmsSetRootLayout(MMS_MESSAGE_DATA_S *pMmsMsg, MMS_SMIL_ROOTLAYOUT *pRootlayout);
SET_TARGET_PROPERTIES(${MAPI-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
SET_TARGET_PROPERTIES(${MAPI-LIB} PROPERTIES VERSION ${VERSION})
-INSTALL(TARGETS ${MAPI-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${MAPI-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
prefix=/usr
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
includedir=${prefix}/include
Name: MESSAGE-FRAMEWORK
%build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
make %{?jobs:-j%jobs}
%install
%make_install
-mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants
-install -m 0644 %SOURCE101 %{buildroot}%{_libdir}/systemd/user/
-ln -s ../msg-service.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/msg-service.service
+mkdir -p %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants
+install -m 0644 %SOURCE101 %{buildroot}/usr/lib/systemd/user/
+ln -s ../msg-service.service %{buildroot}/usr/lib/systemd/user/tizen-middleware.target.wants/msg-service.service
mkdir -p %{buildroot}%{_sysconfdir}/rc.d/rc3.d
ln -s %{_sysconfdir}/rc.d/init.d/msg-server %{buildroot}%{_sysconfdir}/rc.d/rc3.d/S70msg-server
%{_sysconfdir}/rc.d/init.d/msg-server
%{_sysconfdir}/rc.d/rc3.d/S70msg-server
%{_sysconfdir}/rc.d/rc5.d/S70msg-server
-%{_libdir}/systemd/user/msg-service.service
-%{_libdir}/systemd/user/tizen-middleware.target.wants/msg-service.service
+/usr/lib/systemd/user/msg-service.service
+/usr/lib/systemd/user/tizen-middleware.target.wants/msg-service.service
/usr/share/license/msg-service/LICENSE.Flora
%files -n sms-plugin
ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "")
MESSAGE("Build type: ${CMAKE_BUILD_TYPE}")
-
##########################################################
# Define MMS Plugin
##########################################################
ADD_LIBRARY(${MMS-PLUGIN-LIB} SHARED ${MMS-PLUGIN-SRCS})
TARGET_LINK_LIBRARIES(${MMS-PLUGIN-LIB} ${mms_plugin_pkgs_LDFLAGS} ${UTILS-LIB})
-INSTALL(TARGETS ${MMS-PLUGIN-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${MMS-PLUGIN-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
msg_error_t err = MSG_SUCCESS;
int partCnt = 0;
- unsigned int nSize = 0;
+ size_t nSize = 0;
MsgType partHeader;
MmsAttrib pMmsAttrib;
ADD_LIBRARY(${SMS-PLUGIN-LIB} SHARED ${SMS-PLUGIN-SRCS})
TARGET_LINK_LIBRARIES(${SMS-PLUGIN-LIB} ${sms_plugin_pkgs_LDFLAGS} ${UTILS-LIB})
-INSTALL(TARGETS ${SMS-PLUGIN-LIB} LIBRARY DESTINATION lib)
+INSTALL(TARGETS ${SMS-PLUGIN-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR})
ADD_LIBRARY(${TRANS-PROXY-LIB} SHARED ${TRANS-PROXY-SRCS})
TARGET_LINK_LIBRARIES(${TRANS-PROXY-LIB} ${trans_proxy_pkgs_LDFLAGS} ${UTILS-LIB} ${FW-HANDLER-LIB})
-INSTALL(TARGETS ${TRANS-PROXY-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${TRANS-PROXY-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
chInfo.listenerFd = MsgProxyListener::instance()->getRemoteFd();
+#ifdef __x86_64__
+ chInfo.handleAddr = (uint64_t) this;
+#else
chInfo.handleAddr = (unsigned int) this;
+#endif
/* Allocate Memory to Command Data */
int cmdSize = sizeof(MSG_CMD_S) + sizeof(MSG_REQUEST_INFO_S) + sizeof(MSG_PROXY_INFO_S);
ADD_LIBRARY(${UTILS-LIB} SHARED ${UTILS-SRCS})
TARGET_LINK_LIBRARIES(${UTILS-LIB} ${utils_pkgs_LDFLAGS} rt ${VOBJECT-LIB})
-INSTALL(TARGETS ${UTILS-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${UTILS-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
}
-char* _MsgMmsSerializeMessageData(const MMS_MESSAGE_DATA_S* pMsgData, unsigned int *pSize)
+char* _MsgMmsSerializeMessageData(const MMS_MESSAGE_DATA_S* pMsgData, size_t *pSize)
{
MSG_DEBUG("MsgMmsSerializeMessageData");
memcpy(p, &count, sizeof(int));
- p = (void*)((int)p + sizeof(int));
+ p = (void*)(p + sizeof(int));
memcpy(p, pReportStatus, sizeof(MSG_REPORT_STATUS_INFO_S)*count);
ADD_LIBRARY(${VOBJECT-LIB} SHARED ${VOBJECT-SRCS})
TARGET_LINK_LIBRARIES(${VOBJECT-LIB} ${vobject_pkgs_LDFLAGS})
-INSTALL(TARGETS ${VOBJECT-LIB} DESTINATION lib)
+INSTALL(TARGETS ${VOBJECT-LIB} DESTINATION ${LIB_INSTALL_DIR})