[GitHub] duhengforever closed pull request #19: Update deploy script

[GitBox <gi...@apache.org>]

duhengforever closed pull request #19: Update deploy script
URL: https://github.com/apache/rocketmq-client-cpp/pull/19
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/README.md b/README.md
index 38154986..32b797ce 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ build.sh script will automatic download and build the dependency libraries inclu
 
 if you can't get to internet to download three library source files by build.sh script, you can copy three library source files (release-2.0.22-stable.zip  0.10.6.zip and boost_1_58_0.tar.gz) to rocketmq-client-cpp root dir, then build.sh will auto use these three library source files to build rocketmq-client-cpp.
 
-    sudo sh build.sh
+    sh build.sh
 
 Finally, both librocketmq.a and librocketmq.so are saved in rocketmq-client-cpp/bin. when use them to build application or library, besides rocketmq you also should link with following libraries -lpthread -lz -ldl -lrt.
 
diff --git a/deploy.sh b/deploy.sh
index c2f5ffd8..746db347 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -21,22 +21,20 @@ CWD_DIR=$(cd "$(dirname "$0")"; pwd)
 DEPLOY_BUILD_HOME=${CWD_DIR}/${VERSION}
 
 # ##====================================================================
-make
+#make
 # ##====================================================================
 # # deploy
 rm -rf   ${DEPLOY_BUILD_HOME}
 mkdir -p ${DEPLOY_BUILD_HOME}/lib
-mkdir -p ${DEPLOY_BUILD_HOME}/logs
-rm -rf ${CWD_DIR}/bin/*.log
-cp -rf ${CWD_DIR}/bin/*.a   ${DEPLOY_BUILD_HOME}/lib/
-cp -rf ${CWD_DIR}/bin/*.so  ${DEPLOY_BUILD_HOME}/lib/
-cp -rf ${CWD_DIR}/include ${DEPLOY_BUILD_HOME}/
-cp -rf ${CWD_DIR}/example ${DEPLOY_BUILD_HOME}/
-cp -rf ${CWD_DIR}/doc 	  ${DEPLOY_BUILD_HOME}/
-cp -rf ${CWD_DIR}/readme  ${DEPLOY_BUILD_HOME}/
-
+cp -rf ${CWD_DIR}/bin/*.a    ${DEPLOY_BUILD_HOME}/lib/
+cp -rf ${CWD_DIR}/bin/*.so   ${DEPLOY_BUILD_HOME}/lib/
+cp -rf ${CWD_DIR}/include    ${DEPLOY_BUILD_HOME}/
+cp -rf ${CWD_DIR}/example    ${DEPLOY_BUILD_HOME}/
+cp -rf ${CWD_DIR}/doc 	     ${DEPLOY_BUILD_HOME}/
+cp -rf ${CWD_DIR}/changelog  ${DEPLOY_BUILD_HOME}/
+cp -rf ${CWD_DIR}/README.md  ${DEPLOY_BUILD_HOME}/
 
 cd ${CWD_DIR} && tar -cvzf ./${VERSION}.tar.gz ./${VERSION}  >/dev/null 2>&1
 rm -rf ${DEPLOY_BUILD_HOME}
 # # ##====================================================================
-make clean
+#make clean
diff --git a/src/extern/CPushConsumer.cpp b/src/extern/CPushConsumer.cpp
index 1607069f..39e516aa 100644
--- a/src/extern/CPushConsumer.cpp
+++ b/src/extern/CPushConsumer.cpp
@@ -158,6 +158,7 @@ int RegisterMessageCallbackOrderly(CPushConsumer *consumer, MessageCallBack pCal
     MessageListenerOrderlyInner *messageListenerOrderlyInner = new MessageListenerOrderlyInner(consumer,pCallback);
     ((DefaultMQPushConsumer *) consumer)->registerMessageListener(messageListenerOrderlyInner);
     g_OrderListenerMap[consumer] = messageListenerOrderlyInner;
+    return OK;
 }
 
 
@@ -195,7 +196,7 @@ int UnregisterMessageCallback(CPushConsumer *consumer) {
 }
 
 int SetPushConsumerMessageModel(CPushConsumer *consumer, CMessageModel messageModel){
-    if(conusmer == NULL){
+    if(consumer == NULL){
         return NULL_POINTER;
     }
     ((DefaultMQPushConsumer *) consumer)->setMessageModel(MessageModel((int)messageModel));


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services