Merge pull request ekumenlabs#54 from Intermodalics/diagnostics

Added diagnostics packages

do_everything.sh

@@ -177,6 +177,9 @@ if [[ $skip -ne 1 ]] ; then
     # Patch uuid - Avoiding stdlib.h include
     apply_patch $my_loc/patches/uuid.patch
 
+    # Patch yaml - Avoid building tests
+    apply_patch $my_loc/patches/yaml-cpp.patch
+
     # Patch bullet - Avoid building examples
     apply_patch $my_loc/patches/bullet.patch
 
@@ -207,7 +210,7 @@ if [[ $skip -ne 1 ]] ; then
     # Patch rospack - problems with Boost changes
     # Also emptied some unnecessary functions to avoid problems related to including Python.
     apply_patch $my_loc/patches/rospack.patch
-    
+
     # Patch xmlrpcpp - problems with Boost changes.
     apply_patch $my_loc/patches/xmlrpcpp.patch
 

ndk.rosinstall

@@ -94,30 +94,30 @@
     local-name: control_msgs
     uri: https://github.com/ros-gbp/control_msgs-release/archive/release/kinetic/control_msgs/1.4.0-0.tar.gz
     version: control_msgs-release-release-kinetic-control_msgs-1.4.0-0
-# - tar:
-#     local-name: diagnostics/diagnostic_aggregator
-#     uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_aggregator/1.9.3-0.tar.gz
-#     version: diagnostics-release-release-kinetic-diagnostic_aggregator-1.9.3-0
-# - tar:
-#     local-name: diagnostics/diagnostic_analysis
-#     uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_analysis/1.9.3-0.tar.gz
-#     version: diagnostics-release-release-kinetic-diagnostic_analysis-1.9.3-0
-# - tar:
-#     local-name: diagnostics/diagnostic_common_diagnostics
-#     uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_common_diagnostics/1.9.3-0.tar.gz
-#     version: diagnostics-release-release-kinetic-diagnostic_common_diagnostics-1.9.3-0
-# - tar:
-#     local-name: diagnostics/diagnostic_updater
-#     uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_updater/1.9.3-0.tar.gz
-#     version: diagnostics-release-release-kinetic-diagnostic_updater-1.9.3-0
-# - tar:
-#     local-name: diagnostics/diagnostics
-#     uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostics/1.9.3-0.tar.gz
-#     version: diagnostics-release-release-kinetic-diagnostics-1.9.3-0
-# - tar:
-#     local-name: diagnostics/self_test
-#     uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/self_test/1.9.3-0.tar.gz
-#     version: diagnostics-release-release-kinetic-self_test-1.9.3-0
+- tar:
+    local-name: diagnostics/diagnostic_aggregator
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_aggregator/1.9.3-0.tar.gz
+    version: diagnostics-release-release-kinetic-diagnostic_aggregator-1.9.3-0
+- tar:
+    local-name: diagnostics/diagnostic_analysis
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_analysis/1.9.3-0.tar.gz
+    version: diagnostics-release-release-kinetic-diagnostic_analysis-1.9.3-0
+- tar:
+    local-name: diagnostics/diagnostic_common_diagnostics
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_common_diagnostics/1.9.3-0.tar.gz
+    version: diagnostics-release-release-kinetic-diagnostic_common_diagnostics-1.9.3-0
+- tar:
+    local-name: diagnostics/diagnostic_updater
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostic_updater/1.9.3-0.tar.gz
+    version: diagnostics-release-release-kinetic-diagnostic_updater-1.9.3-0
+- tar:
+    local-name: diagnostics/diagnostics
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/diagnostics/1.9.3-0.tar.gz
+    version: diagnostics-release-release-kinetic-diagnostics-1.9.3-0
+- tar:
+    local-name: diagnostics/self_test
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/kinetic/self_test/1.9.3-0.tar.gz
+    version: diagnostics-release-release-kinetic-self_test-1.9.3-0
 - tar:
     local-name: dynamic_reconfigure
     uri: https://github.com/ros-gbp/dynamic_reconfigure-release/archive/release/kinetic/dynamic_reconfigure/1.5.50-0.tar.gz

patches/yaml-cpp.patch

@@ -0,0 +1,15 @@
+--- libs/yaml-cpp-yaml-cpp-0.6.2/CMakeLists.txt
++++ libs/yaml-cpp-yaml-cpp-0.6.2/CMakeLists.txt
+@@ -38,7 +38,11 @@ enable_testing()
+ ### Project options
+ ###
+ ## Project stuff
+-option(YAML_CPP_BUILD_TESTS "Enable testing" ON)
++if(NOT ANDROID)
++	option(YAML_CPP_BUILD_TESTS "Enable testing" ON)
++else()
++	option(YAML_CPP_BUILD_TESTS "Enable testing" OFF)
++endif()
+ option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON)
+ option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" ON)
+