Merge pull request #34 from astumpf/pr_fix_missing_install_rules

Add missing install rules for wavemap
ethz-asl · Sep 19, 2023 · 7fd41f7 · 7fd41f7
2 parents f94e7db + ddcd0d5
commit 7fd41f7
Show file tree

Hide file tree

Showing 21 changed files with 96 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -261,6 +261,44 @@ jobs:
       - name: Show statistics for ccache
         uses: ./.github/actions/log-ccache-stats
 
+  install:
+    name: Catkin install
+    needs: [ workspace-container, build ]
+    runs-on: [ self-hosted, vwire ]
+    container:
+      image: ${{ needs.workspace-container.outputs.image }}
+    steps:
+      - name: Fetch the package's repository
+        uses: actions/checkout@v3
+        # NOTE: Even though the repo is already present in the container, we
+        #       also need to check it out at GitHub Actions' preferred location
+        #       for private actions and problem matchers to work.
+
+      - name: Setup ccache
+        uses: ./.github/actions/setup-ccache
+        with:
+          cache-group: noetic-gcc-release
+          cache-version: ${{ secrets.CCACHE_CACHE_VERSION }}
+
+      - name: Enable catkin install
+        working-directory: ${{ env.CATKIN_WS_PATH }}
+        shell: bash
+        run: |
+          catkin config --install
+          catkin clean -b -y
+
+      - name: Build all wavemap packages
+        working-directory: ${{ env.CATKIN_WS_PATH }}
+        shell: bash
+        run: |
+          . /opt/ros/noetic/setup.sh
+          echo "::add-matcher::./.github/problem-matchers/gcc.json"
+          catkin build wavemap_all --no-status --force-color
+          echo "::remove-matcher owner=problem-matcher-gcc::"
+
+      - name: Show statistics for ccache
+        uses: ./.github/actions/log-ccache-stats
+
   clang-tidy:
     name: Clang tidy
     needs: [ workspace-container, build ]

diff --git a/libraries/wavemap/CHANGELOG.rst b/libraries/wavemap/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package wavemap
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+* Add missing install rules for wavemap
+* Contributors: Alexander Stumpf
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/libraries/wavemap/CMakeLists.txt b/libraries/wavemap/CMakeLists.txt
@@ -71,6 +71,19 @@ add_library(${PROJECT_NAME}
     src/utils/thread_pool.cc)
 target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
 
+# Install targets
+install(TARGETS ${PROJECT_NAME}
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+# Mark cpp header files for installation
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+  FILES_MATCHING PATTERN "*.h"
+)
+
 # Tests
 if (CATKIN_ENABLE_TESTING)
   catkin_add_gtest(

diff --git a/libraries/wavemap/package.xml b/libraries/wavemap/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>Base library for wavemap.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/libraries/wavemap_io/CHANGELOG.rst b/libraries/wavemap_io/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_io
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/libraries/wavemap_io/package.xml b/libraries/wavemap_io/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_io</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>(De)serialization of wavemap types to files.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_msgs/CHANGELOG.rst b/ros/wavemap_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/ros/wavemap_msgs/package.xml b/ros/wavemap_msgs/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_msgs</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>Message definitions for wavemap's ROS interfaces.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_ros/CHANGELOG.rst b/ros/wavemap_ros/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package wavemap_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+* Add missing install rules for wavemap
+* Contributors: Alexander Stumpf
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/ros/wavemap_ros/CMakeLists.txt b/ros/wavemap_ros/CMakeLists.txt
@@ -40,3 +40,8 @@ target_link_libraries(wavemap_rosbag_processor ${PROJECT_NAME})
 # Export
 cs_install()
 cs_export()
+
+# Export config files
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/config/
+        DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config
+)
diff --git a/ros/wavemap_ros/package.xml b/ros/wavemap_ros/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_ros</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>ROS interface for wavemap.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_ros_conversions/CHANGELOG.rst b/ros/wavemap_ros_conversions/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_ros_conversions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/ros/wavemap_ros_conversions/package.xml b/ros/wavemap_ros_conversions/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_ros_conversions</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>Conversions between wavemap and ROS types.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/ros/wavemap_rviz_plugin/CHANGELOG.rst b/ros/wavemap_rviz_plugin/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_rviz_plugin
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/ros/wavemap_rviz_plugin/package.xml b/ros/wavemap_rviz_plugin/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_rviz_plugin</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>Plugin to interactively visualize maps published in wavemap's
     native format.
   </description>

diff --git a/tooling/packages/catkin_setup/CHANGELOG.rst b/tooling/packages/catkin_setup/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package catkin_setup
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/tooling/packages/catkin_setup/package.xml b/tooling/packages/catkin_setup/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>catkin_setup</name>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <description>Dummy package to make it easy to setup the workspace and generate the setup.[sh|bash|zsh] scripts in CI.</description>
 
     <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/tooling/packages/wavemap_all/CHANGELOG.rst b/tooling/packages/wavemap_all/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_all
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 

diff --git a/tooling/packages/wavemap_all/package.xml b/tooling/packages/wavemap_all/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>wavemap_all</name>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <description>Metapackage that builds all wavemap packages.</description>
 
   <maintainer email="[email protected]">Victor Reijgwart</maintainer>

diff --git a/tooling/packages/wavemap_utils/CHANGELOG.rst b/tooling/packages/wavemap_utils/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package wavemap_utils
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.5.2 (2023-09-19)
+------------------
+
 1.5.1 (2023-09-08)
 ------------------
 * Show documentation preview without using Python HTTP server

diff --git a/tooling/packages/wavemap_utils/package.xml b/tooling/packages/wavemap_utils/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
     <name>wavemap_utils</name>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <description>Small package containing scripts to simplify common wavemap development tasks.</description>
 
     <maintainer email="[email protected]">Victor Reijgwart</maintainer>