Update: Add Travis CI check.

Change: Move a Makefile into MQTTSNGateway directory.

How to build
$ git clone -b gateway
https://github.com/eclipse/paho.mqtt-sn.embedded-c 
$ cd paho.mqtt-sn.embedded-c/MQTTSNGateway       
$ make   
$ make install   
$ make clean        


Signed-off-by: tomoaki <tomoaki@tomy-tech.com>

MQTTSNGateway/Makefile

@@ -0,0 +1,142 @@
+PROGNAME := MQTT-SNGateway
+APPL := mainGateway
+
+LPROGNAME := MQTT-SNLogmonitor
+LAPPL := mainLogmonitor
+
+TESTPROGNAME := testPFW
+TESTAPPL := mainTestProcess
+
+CONFIG := gateway.conf
+CLIENTS := clients.conf
+
+SRCDIR := src
+SUBDIR := ../MQTTSNPacket/src
+
+OS := linux
+SENSORNET := udp
+TEST := tests
+
+CPPSRCS :=  \
+$(SRCDIR)/MQTTGWConnectionHandler.cpp \
+$(SRCDIR)/MQTTGWPacket.cpp \
+$(SRCDIR)/MQTTGWPublishHandler.cpp \
+$(SRCDIR)/MQTTGWSubscribeHandler.cpp \
+$(SRCDIR)/MQTTSNGateway.cpp \
+$(SRCDIR)/MQTTSNGWBrokerRecvTask.cpp \
+$(SRCDIR)/MQTTSNGWBrokerSendTask.cpp \
+$(SRCDIR)/MQTTSNGWClient.cpp \
+$(SRCDIR)/MQTTSNGWClientRecvTask.cpp \
+$(SRCDIR)/MQTTSNGWClientSendTask.cpp \
+$(SRCDIR)/MQTTSNGWConnectionHandler.cpp \
+$(SRCDIR)/MQTTSNGWLogmonitor.cpp \
+$(SRCDIR)/MQTTSNGWPacket.cpp \
+$(SRCDIR)/MQTTSNGWPacketHandleTask.cpp \
+$(SRCDIR)/MQTTSNGWProcess.cpp \
+$(SRCDIR)/MQTTSNGWPublishHandler.cpp \
+$(SRCDIR)/MQTTSNGWSubscribeHandler.cpp \
+$(SRCDIR)/$(OS)/$(SENSORNET)/SensorNetwork.cpp \
+$(SRCDIR)/$(OS)/Timer.cpp  \
+$(SRCDIR)/$(OS)/Network.cpp \
+$(SRCDIR)/$(OS)/Threading.cpp \
+$(SRCDIR)/$(TEST)/TestProcess.cpp \
+$(SRCDIR)/$(TEST)/TestQue.cpp \
+$(SRCDIR)/$(TEST)/TestTree23.cpp \
+$(SRCDIR)/$(TEST)/TestTopics.cpp \
+$(SRCDIR)/$(TEST)/TestTopicIdMap.cpp \
+$(SRCDIR)/$(TEST)/TestTask.cpp
+
+
+CSRCS := $(SUBDIR)/MQTTSNConnectClient.c \
+$(SUBDIR)/MQTTSNConnectServer.c \
+$(SUBDIR)/MQTTSNDeserializePublish.c \
+$(SUBDIR)/MQTTSNPacket.c \
+$(SUBDIR)/MQTTSNSearchClient.c \
+$(SUBDIR)/MQTTSNSearchServer.c \
+$(SUBDIR)/MQTTSNSerializePublish.c \
+$(SUBDIR)/MQTTSNSubscribeClient.c \
+$(SUBDIR)/MQTTSNSubscribeServer.c \
+$(SUBDIR)/MQTTSNUnsubscribeClient.c \
+$(SUBDIR)/MQTTSNUnsubscribeServer.c 
+
+CXX := g++
+CPPFLAGS += 
+
+INCLUDES += -I$(SRCDIR) \
+-I$(SRCDIR)/$(OS) \
+-I$(SRCDIR)/$(OS)/$(SENSORNET) \
+-I$(SUBDIR) \
+-I$(SRCDIR)/$(TEST)
+
+DEFS :=
+LIBS += -L/usr/local/lib
+LDFLAGS := 
+CXXFLAGS := -Wall -O3 -std=c++11
+LDADD := -lpthread -lssl -lcrypto -lrt
+OUTDIR := Build
+
+PROG := $(OUTDIR)/$(PROGNAME)
+LPROG := $(OUTDIR)/$(LPROGNAME)
+TPROG := $(OUTDIR)/$(TESTPROGNAME)
+
+OBJS := $(CPPSRCS:%.cpp=$(OUTDIR)/%.o)
+OBJS += $(CSRCS:%.c=$(OUTDIR)/%.o) 
+DEPS := $(CPPSRCS:%.cpp=$(OUTDIR)/%.d)
+DEPS += $(CSRCS:%.c=$(OUTDIR)/%.d)
+
+.PHONY: install clean exectest
+
+all: $(PROG) $(LPROG) $(TPROG)
+
+monitor: $(LPROG)
+
+test: $(TPROG) $(LPROG) exectest
+	
+
+-include $(DEPS)
+
+$(PROG): $(OBJS) $(OUTDIR)/$(SRCDIR)/$(APPL).o
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDADD)
+
+$(LPROG): $(OBJS) $(OUTDIR)/$(SRCDIR)/$(LAPPL).o
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDADD)
+
+$(TPROG): $(OBJS) $(OUTDIR)/$(SRCDIR)/$(TEST)/$(TESTAPPL).o
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDADD)
+
+
+$(OUTDIR)/$(SRCDIR)/%.o:$(SRCDIR)/%.cpp
+	@if [ ! -e `dirname $@` ]; then mkdir -p `dirname $@`; fi
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -o $@ -c -MMD -MP -MF $(@:%.o=%.d) $<
+
+$(OUTDIR)/$(SRCDIR)/$(APPL).o:$(SRCDIR)/$(APPL).cpp
+	@if [ ! -e `dirname $@` ]; then mkdir -p `dirname $@`; fi
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -o $@ -c -MMD -MP -MF $(@:%.o=%.d) $<
+
+$(OUTDIR)/$(SRCDIR)/$(TEST)/$(TESTAPPL).o:$(SRCDIR)/$(TEST)/$(TESTAPPL).cpp
+	@if [ ! -e `dirname $@` ]; then mkdir -p `dirname $@`; fi
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -o $@ -c -MMD -MP -MF $(@:%.o=%.d) $<
+
+$(OUTDIR)/$(SRCDIR)/$(LAPPL).o:$(SRCDIR)/$(LAPPL).cpp
+	@if [ ! -e `dirname $@` ]; then mkdir -p `dirname $@`; fi
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -o $@ -c -MMD -MP -MF $(@:%.o=%.d) $<
+
+$(OUTDIR)/$(SUBDIR)/%.o:$(SUBDIR)/%.c
+	@if [ ! -e `dirname $@` ]; then mkdir -p `dirname $@`; fi
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) $(DEFS) -o $@ -c -MMD -MP -MF $(@:%.o=%.d) $<
+
+clean:
+	rm -rf $(OUTDIR)
+
+install:
+	cp -pf $(PROG) ../../
+	cp -pf $(LPROG) ../../
+	cp -pf $(CONFIG) ../../
+	cp -pf $(CLIENTS) ../../
+
+exectest:
+	cp -pf $(CONFIG) $(OUTDIR)
+	cd $(OUTDIR)
+	./$(TESTPROGNAME) -f ./gateway.conf
+
+	

MQTTSNGateway/README.md

@@ -3,7 +3,7 @@
 ### **step1. Build the gateway**   
 ````
 $ git clone -b gateway https://github.com/eclipse/paho.mqtt-sn.embedded-c 
-$ cd paho.mqtt-sn.embedded-c       
+$ cd paho.mqtt-sn.embedded-c/MQTTSNGateway       
 $ make   
 $ make install   
 $ make clean

MQTTSNGateway/src/MQTTSNGWProcess.h

@@ -40,6 +40,7 @@ namespace MQTTSNGW
  ==================================*/
 #define WRITELOG theProcess->putLog
 #define CHK_SIGINT (theProcess->checkSignal() == SIGINT)
+#define UNUSED(x) ((void)(x))
 /*=================================
  Class Process
  ==================================*/

MQTTSNGateway/src/MQTTSNGWVersion.h

@@ -0,0 +1,22 @@
+/**************************************************************************************
+ * Copyright (c) 2017, Tomoaki Yamaguchi
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Tomoaki Yamaguchi - initial version
+ **************************************************************************************/
+
+#ifndef MQTTSNGWVERSION_H_IN_
+#define MQTTSNGWVERSION_H_IN_
+
+#define PAHO_GATEWAY_VERSION "1.1.0"
+
+#endif /* MQTTSNGWVERSION_H_IN_ */

MQTTSNGateway/src/MQTTSNGWVersion.h.in

@@ -0,0 +1,22 @@
+/**************************************************************************************
+ * Copyright (c) 2017, Tomoaki Yamaguchi
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Tomoaki Yamaguchi - initial version
+ **************************************************************************************/
+
+#ifndef MQTTSNGWVERSION_H_IN_
+#define MQTTSNGWVERSION_H_IN_
+
+#define PAHO_GATEWAY_VERSION "@GATEWAY_VERSION@"
+
+#endif /* MQTTSNGWVERSION_H_IN_ */

MQTTSNGateway/src/MQTTSNGateway.cpp

@@ -17,6 +17,7 @@
 #include "MQTTSNGateway.h"
 #include "SensorNetwork.h"
 #include "MQTTSNGWProcess.h"
+#include "MQTTSNGWVersion.h"
 #include <string.h>
 using namespace MQTTSNGW;
 
@@ -218,7 +219,7 @@ void Gateway::run(void)
 	WRITELOG("%s\n", PAHO_COPYRIGHT1);
 	WRITELOG("%s\n", PAHO_COPYRIGHT2);
 	WRITELOG(" *\n%s\n", PAHO_COPYRIGHT3);
-	WRITELOG("%s\n", GATEWAY_VERSION);
+	WRITELOG(" * Version: %s\n", PAHO_GATEWAY_VERSION);
 	WRITELOG("%s\n", PAHO_COPYRIGHT4);
 	WRITELOG("\n%s %s has been started.\n\n", currentDateTime(), _params.gatewayName);
 	WRITELOG(" ConfigFile: %s\n", _params.configName);

MQTTSNGateway/src/MQTTSNGateway.h

@@ -25,8 +25,6 @@ namespace MQTTSNGW
 /*=================================
  *    Starting prompt
  ==================================*/
-#define GATEWAY_VERSION " * Version: 0.9.7"
-
 #define PAHO_COPYRIGHT0 " * MQTT-SN Transparent Gateway"
 #define PAHO_COPYRIGHT1 " * Part of Project Paho in Eclipse"
 #define PAHO_COPYRIGHT2 " * (http://git.eclipse.org/c/paho/org.eclipse.paho.mqtt-sn.embedded-c.git/)"