search

ros2 / tinydir_vendor

Vendor package for providing tinydir within a cmake package
Apache License 2.0
0 stars 7 forks source link

Manage installation of the external project manually. #3

Closed nuclearsandwich closed 5 years ago

nuclearsandwich commented 5 years ago

Connects to #2, fixes #2

This change, mostly influenced by https://github.com/ament/uncrustify_vendor/, modifies the cmake arguments for tinydir installation to install it into the build directory of the vendor package, then the vendor package takes that result and installs it to the ultimate target during the vendor package's install phase.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

nuclearsandwich commented 5 years ago
nuclearsandwich commented 5 years ago

Building a package with this change is successful and the package appears well-formed:

buildfarm@steven-workstation:/tmp/binarydeb$ dpkg -c ros-crystal-tinydir-vendor_1.0.0-0bionic.20190122.225239_amd64.deb 
drwxr-xr-x root/root         0 2019-01-22 14:52 ./
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/crystal/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/crystal/include/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/crystal/include/tinydir/
-rw-r--r-- root/root     18362 2018-10-22 19:04 ./opt/ros/crystal/include/tinydir/tinydir.h
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/crystal/share/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/crystal/share/tinydir_vendor/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./opt/ros/crystal/share/tinydir_vendor/cmake/
-rw-r--r-- root/root       353 2019-01-22 14:52 ./opt/ros/crystal/share/tinydir_vendor/cmake/tinydir_vendorConfig-version.cmake
-rw-r--r-- root/root       342 2019-01-22 14:52 ./opt/ros/crystal/share/tinydir_vendor/cmake/tinydir_vendorConfig.cmake
drwxr-xr-x root/root         0 2019-01-22 14:52 ./usr/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./usr/share/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./usr/share/doc/
drwxr-xr-x root/root         0 2019-01-22 14:52 ./usr/share/doc/ros-crystal-tinydir-vendor/
-rw-r--r-- root/root       271 2019-01-22 14:52 ./usr/share/doc/ros-crystal-tinydir-vendor/changelog.Debian.gz
AAlon commented 5 years ago

Looks good, thanks for the fix!

nuclearsandwich commented 5 years ago

Closing the loop, releasing 1.0.1 allowed us to build the package and it will be released to the main ROS 2 repository in tomorrow's package sync.