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>

.cproject

@@ -21,7 +21,7 @@
 							<builder buildPath="${workspace_loc:/MQTTSN-embedded-C}/Debug" id="cdt.managedbuild.target.gnu.builder.exe.debug.767762182" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.602829827" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.109068141" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1710260957" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1710260957" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1258567310" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.dialect.std.1678347248" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.dialect.flags.1711182709" name="Other dialect flags" superClass="gnu.cpp.compiler.option.dialect.flags" useByScannerDiscovery="true" value="-std=c++11" valueType="string"/>
@@ -66,7 +66,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="MQTTSNGateway/src/tests/mainTestProcessFramework.cpp|MQTTSNGateway/GatewayTester/samples/mainOTA.cpp|MQTTSNGateway/GatewayTester/samples/mainTest.cpp|MQTTSNGateway/src/linux/xbee|MQTTSNGateway/src/mainLogmonitor.cpp|MQTTSNPacket/test|MQTTSNPacket/samples" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="MQTTSNGateway/src/linux/udp|MQTTSNGateway/src/tests|MQTTSNGateway/GatewayTester|MQTTSNGateway/GatewayTester/samples/mainTest.cpp|MQTTSNGateway/GatewayTester/samples/mainTemplate.cpp|MQTTSNGateway/src/tests/mainTestProcessFramework.cpp|MQTTSNGateway/GatewayTester/samples/mainOTA.cpp|MQTTSNGateway/src/mainLogmonitor.cpp|MQTTSNPacket/test|MQTTSNPacket/samples" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -97,6 +97,7 @@
 								<option id="gnu.cpp.compiler.option.dialect.flags.1078302249" name="Other dialect flags" superClass="gnu.cpp.compiler.option.dialect.flags" useByScannerDiscovery="true" value="-std=c++11" valueType="string"/>
 								<option id="gnu.cpp.compiler.option.include.paths.2114194326" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="/home/tomoaki/git/paho.mqtt-sn.embedded-c/MQTTSNGateway/src/linux/udp"/>
+									<listOptionValue builtIn="false" value="/home/tomoaki/git/paho.mqtt-sn.embedded-c/MQTTSNGateway/GatewayTester/src"/>
 									<listOptionValue builtIn="false" value="/home/tomoaki/git/paho.mqtt-sn.embedded-c/MQTTSNGateway/src"/>
 									<listOptionValue builtIn="false" value="/home/tomoaki/git/paho.mqtt-sn.embedded-c/MQTTSNGateway/src/linux"/>
 									<listOptionValue builtIn="false" value="/home/tomoaki/git/paho.mqtt-sn.embedded-c/MQTTSNPacket/src"/>
@@ -116,11 +117,14 @@
 								</inputType>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1623573602" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
-								<option id="gnu.cpp.link.option.libs.68366124" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
+								<option id="gnu.cpp.link.option.libs.68366124" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" useByScannerDiscovery="false" valueType="libs">
 									<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="pthread"/>
 									<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="ssl"/>
 									<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="crypto"/>
 								</option>
+								<option id="gnu.cpp.link.option.paths.1879517971" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" useByScannerDiscovery="false" valueType="libPaths">
+									<listOptionValue builtIn="false" value="/usr/local/lib"/>
+								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2044523925" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -132,9 +136,9 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="MQTTSNGateway/GatewayTester/samples/mainOTA.cpp|MQTTSNGateway/GatewayTester/samples/mainTest.cpp|MQTTSNPacket/src|MQTTSNGateway/src|MQTTSNGateway/src/linux|MQTTSNGateway/src/linux/udp|MQTTSNGateway/src/mainLogmonitor.cpp|MQTTSNGateway/src/linux/xbee|MQTTSNPacket/test|MQTTSNPacket/samples" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="MQTTSNGateway/GatewayTester|MQTTSNGateway/GatewayTester/samples/mainTest.cpp|MQTTSNGateway/GatewayTester/samples/mainTemplate.cpp|MQTTSNGateway/GatewayTester/samples/mainOTA.cpp|MQTTSNPacket/src|MQTTSNGateway/src|MQTTSNGateway/src/linux|MQTTSNGateway/src/linux/udp|MQTTSNGateway/src/mainLogmonitor.cpp|MQTTSNGateway/src/linux/xbee|MQTTSNPacket/test|MQTTSNPacket/samples" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-						<entry excluding="tests/mainTestProcessFramework.cpp|mainLogmonitor.cpp|linux|linux/udp" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="MQTTSNGateway/src"/>
+						<entry excluding="tests|tests/mainTestProcessFramework.cpp|mainLogmonitor.cpp|linux|linux/udp" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="MQTTSNGateway/src"/>
-						<entry excluding="xbee" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="MQTTSNGateway/src/linux"/>
+						<entry excluding="udp" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="MQTTSNGateway/src/linux"/>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="MQTTSNPacket/src"/>
 					</sourceEntries>
 				</configuration>
@@ -170,4 +174,5 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>

.travis.yml

@@ -0,0 +1,21 @@
+language: cpp
+compiler: g++
+
+install:
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - g++-4.8
+    
+script: 
+  - cd MQTTSNGateway
+  - make CXX="g++-4.8" SENSORNET="xbee"
+  - make CXX="g++-4.8" SENSORNET="udp"
+  
+notifications:
+  emails:
+    - tomoaki@tomy-tech.com
+    

MQTTSNGateway/Makefile

@@ -7,11 +7,11 @@ LAPPL := mainLogmonitor
 TESTPROGNAME := testPFW
 TESTAPPL := mainTestProcess
 
-CONFIG := MQTTSNGateway/gateway.conf
+CONFIG := gateway.conf
-CLIENTS := MQTTSNGateway/clients.conf
+CLIENTS := clients.conf
 
-SRCDIR := MQTTSNGateway/src
+SRCDIR := src
-SUBDIR := MQTTSNPacket/src
+SUBDIR := ../MQTTSNPacket/src
 
 OS := linux
 SENSORNET := udp
@@ -72,7 +72,7 @@ DEFS :=
 LIBS += -L/usr/local/lib
 LDFLAGS := 
 CXXFLAGS := -Wall -O3 -std=c++11
-LDADD := -lpthread -lssl -lcrypto
+LDADD := -lpthread -lssl -lcrypto -lrt
 OUTDIR := Build
 
 PROG := $(OUTDIR)/$(PROGNAME)
@@ -129,13 +129,14 @@ clean:
 	rm -rf $(OUTDIR)
 
 install:
-	cp -pf $(PROG) ../
+	cp -pf $(PROG) ../../
-	cp -pf $(LPROG) ../
+	cp -pf $(LPROG) ../../
-	cp -pf $(CONFIG) ../
+	cp -pf $(CONFIG) ../../
-	cp -pf $(CLIENTS) ../
+	cp -pf $(CLIENTS) ../../
 
 exectest:
 	cp -pf $(CONFIG) $(OUTDIR)
-	cd $(OUTDIR); ./$(TESTPROGNAME) -f ./gateway.conf
+	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/)"