Merge pull request #77 from k-okada/fix_travis

fix travis compile

Author: k-okada

.travis.yml

@@ -13,14 +13,14 @@ env:
   global:
     - JOB_PATH=/tmp/devel_job
     - ABORT_ON_TEST_FAILURE=1
+    - INDEX_URL=https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml
   matrix:
-    - ROS_DISTRO_NAME=indigo  OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
+    - ROS_DISTRO_NAME=indigo  OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64 INDEX_URL=https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/6a93d17/index.yaml
     - ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
-    - ROS_DISTRO_NAME=lunar   OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
     - ROS_DISTRO_NAME=melodic OS_NAME=ubuntu OS_CODE_NAME=bionic ARCH=amd64
-#   matrix:
-#     allow_failures:
-#       - env: ROS_DISTRO_NAME=kinetic OS_NAME=ubuntu OS_CODE_NAME=xenial ARCH=amd64
+# matrix:
+#   allow_failures:
+#     - env: ROS_DISTRO_NAME=indigo  OS_NAME=ubuntu OS_CODE_NAME=trusty ARCH=amd64
 install:
   # either install the latest released version of ros_buildfarm
   - pip install ros_buildfarm
@@ -32,15 +32,15 @@ install:
   # run devel job for a ROS repository with the same name as this repo
   - export REPOSITORY_NAME=`basename $TRAVIS_BUILD_DIR`
   # use the code already checked out by Travis
-  - mkdir -p $JOB_PATH/catkin_workspace/src
-  - cp -R $TRAVIS_BUILD_DIR $JOB_PATH/catkin_workspace/src/
+  - mkdir -p $JOB_PATH/ws/src
+  - cp -R $TRAVIS_BUILD_DIR $JOB_PATH/ws/src/
   # generate the script to run a pre-release job for that target and repo
-  - generate_prerelease_script.py https://raw.githubusercontent.com/ros-infrastructure/ros_buildfarm_config/production/index.yaml $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH  --output-dir $JOB_PATH
+  - generate_prerelease_script.py $INDEX_URL $ROS_DISTRO_NAME default $OS_NAME $OS_CODE_NAME $ARCH  --output-dir $JOB_PATH
   # run the actual job which involves Docker
   - cd $JOB_PATH; sh ./prerelease.sh -y
 script:
   # get summary of test results
-  - /tmp/catkin/bin/catkin_test_results $JOB_PATH/catkin_workspace/test_results --all
+  - /tmp/catkin/bin/catkin_test_results $JOB_PATH/ws/test_results --all
 notifications:
   email: false
 

ethercat_hardware/include/ethercat_hardware/ethercat_hardware.h

@@ -35,6 +35,10 @@
 #ifndef ETHERCAT_HARDWARE_H
 #define ETHERCAT_HARDWARE_H
 
+#include <iostream>
+#include <string>
+#include <vector>
+
 #include <pr2_hardware_interface/hardware_interface.h>
 
 #include <al/ethercat_AL.h>
@@ -52,6 +56,8 @@
 #include <boost/accumulators/statistics/max.hpp>
 #include <boost/accumulators/statistics/mean.hpp>
 
+#include <boost/shared_ptr.hpp>
+
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>

ethercat_hardware/include/ethercat_hardware/motor_heating_model.h

@@ -44,6 +44,7 @@
 
 #include <boost/utility.hpp>
 #include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <vector>

ethercat_hardware/src/ethercat_hardware.cpp

@@ -32,6 +32,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *********************************************************************/
 
+#include <vector>
+
 #include "ethercat_hardware/ethercat_hardware.h"
 
 #include <ethercat/ethercat_xenomai_drv.h>
@@ -42,8 +44,11 @@
 
 #include <net/if.h>
 #include <sys/ioctl.h>
+#include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/regex.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/thread.hpp>
 
 EthercatHardwareDiagnostics::EthercatHardwareDiagnostics() :
 

ethercat_hardware/src/motor_heating_model.cpp

@@ -40,6 +40,8 @@
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/timer.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 
 // Use XML format when saving or loading XML file
 #include <tinyxml.h>
@@ -712,7 +714,10 @@ bool MotorHeatingModel::saveTemperatureState()
   {
     int error = errno;
     char errbuf[100];
-    strerror_r(error, errbuf, sizeof(errbuf));
+    if (strerror_r(error, errbuf, sizeof(errbuf)) != 0)
+    {
+      memcpy(errbuf, "Unknown error\0", 14);
+    }
     errbuf[sizeof(errbuf)-1] = '\0';
     ROS_WARN("Problem renaming '%s' to '%s' : (%d) '%s'", 
              tmp_filename.c_str(), save_filename_.c_str(), error, errbuf);

ethercat_hardware/src/motorconf.cpp

@@ -52,7 +52,6 @@
 #include <ethercat_hardware/wg021.h>
 #include <ethercat_hardware/wg014.h>
 
-#include <boost/crc.hpp>
 #include <boost/foreach.hpp>
 
 #include <net/if.h>

ethercat_hardware/src/wg021.cpp

@@ -44,7 +44,6 @@
 #include <dll/ethercat_device_addressed_telegram.h>
 #include <dll/ethercat_frame.h>
 
-#include <boost/crc.hpp>
 #include <boost/static_assert.hpp>
 
 #include "ethercat_hardware/wg_util.h"

ethercat_hardware/src/wg05.cpp

@@ -44,7 +44,6 @@
 #include <dll/ethercat_device_addressed_telegram.h>
 #include <dll/ethercat_frame.h>
 
-#include <boost/crc.hpp>
 #include <boost/static_assert.hpp>
 
 PLUGINLIB_EXPORT_CLASS(WG05, EthercatDevice);

ethercat_hardware/src/wg0x.cpp

@@ -45,6 +45,7 @@
 #include <dll/ethercat_frame.h>
 
 #include <boost/crc.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/make_shared.hpp>
 

ethercat_hardware/src/wg_eeprom.cpp

@@ -35,6 +35,8 @@
 #include "ethercat_hardware/wg_eeprom.h"
 #include "ros/ros.h"
 
+#include <boost/static_assert.hpp>
+#include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
 
 namespace ethercat_hardware