prepare for ros2 release

Davide Faconti · Davide Faconti · commit 926ff69b43be · 2019-03-13T14:57:27.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,80 +11,16 @@ os:
 compiler:
   - gcc
 
-conan-linux: &conan-linux
-    os: linux
-    dist: xenial
-    language: python
-    python: "3.7"
-    services:
-      - docker
-    before_install:
-      - true
-    install:
-      - ./conan/travis/install.sh
-    script:
-      - ./conan/travis/build.sh
-
-conan-osx: &conan-osx
-    os: osx
-    language: generic
-    before_install:
-      - true
-    install:
-      - ./conan/travis/install.sh
-    script:
-      - ./conan/travis/build.sh
-
-matrix:
-    include:
-      - bare_linux:
-        env: ROS_DISTRO="none"
-      - ros_indigo:
-        env: ROS_DISTRO="kinetic"
-      - ros_kinetic:
-        env: ROS_DISTRO="lunar"
-      - ros_melodic:
-        env: ROS_DISTRO="melodic"
-     # - <<: *conan-linux
-     #   env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #   env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #  env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #   env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #   env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #   env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #   env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50 ROS_DISTRO="none"
-     # - <<: *conan-linux
-     #   env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 ROS_DISTRO="none"
-     # - <<: *conan-osx
-     #   osx_image: xcode8.3
-     #   env: CONAN_APPLE_CLANG_VERSIONS=8.1 ROS_DISTRO="none"
-     # - <<: *conan-osx
-     #   osx_image: xcode9
-     #   env: CONAN_APPLE_CLANG_VERSIONS=9.0 ROS_DISTRO="none"
-     # - <<: *conan-osx
-     #   osx_image: xcode9.4
-     #   env: CONAN_APPLE_CLANG_VERSIONS=9.1 ROS_DISTRO="none"
-     # - <<: *conan-osx
-     #   osx_image: xcode10.1
-      #  env: CONAN_APPLE_CLANG_VERSIONS=10.0 ROS_DISTRO="none"
-    fast_finish: false
-
 before_install:
-  - sudo apt-get update && sudo apt-get --reinstall install -qq build-essential
-  - if [ "$ROS_DISTRO" = "none" ]; then sudo apt-get --reinstall install -qq libzmq3-dev libdw-dev; fi
+  - sudo apt-get update && sudo apt-get --reinstall install -qq build-essential 
+  - sudo apt-get --reinstall install -qq libzmq3-dev
   # GTest: see motivation here https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/
   - sudo apt-get --reinstall install -qq libgtest-dev cmake
   - cd /usr/src/gtest
   - sudo cmake CMakeLists.txt
   - sudo make
   - sudo cp *.a /usr/lib
-  - cd $TRAVIS_BUILD_DIR
+- cd $TRAVIS_BUILD_DIR
 
 install:
   - if [ "$ROS_DISTRO" != "none" ]; then git clone https://github.com/ros-industrial/industrial_ci.git .ci_config; fi
@@ -94,7 +30,6 @@ before_script:
   - mkdir -p build
 
 script:
-  - if [ "$ROS_DISTRO"  = "none" ]; then (cd build; cmake .. ; sudo cmake --build . --target install; ./bin/behaviortree_cpp_v3_test); fi
-  - if [ "$ROS_DISTRO" != "none" ]; then (.ci_config/travis.sh); fi
+- cd build; cmake .. ; sudo cmake --build . --target install; ./bin/behaviortree_cpp_v3_test
 
 
diff --git a/package.xml b/package.xml
@@ -12,15 +12,18 @@
   <author>Michele Colledanchise</author>
   <author>Davide Faconti</author>
 
-  <build_depend>roslib</build_depend>
-  <run_depend>roslib</run_depend>
 
   <build_depend>libzmq3-dev</build_depend>
   <run_depend>libzmq3-dev</run_depend>
-  
+
   <build_depend>libdw-dev</build_depend>
   <run_depend>libdw-dev</run_depend>
 
-  <buildtool_depend>catkin</buildtool_depend>
+  <test_depend>ament_cmake_gtest</test_depend>
+
+  <buildtool_depend>ament_cmake</buildtool_depend>
+  <export>
+     <build_type>ament_cmake</build_type>
+  </export>
 
 </package>
