Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add libgz-utils3-log and dev packages #4

Merged
merged 6 commits into from
Aug 21, 2024
Merged

Add libgz-utils3-log and dev packages #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f49b7a
Add spdlog dependency
iche033 Aug 19, 2024
6a58ffd
add log component
iche033 Aug 20, 2024
ff75d34
update install files
iche033 Aug 21, 2024
6206828
more updates
iche033 Aug 21, 2024
9f80b3a
add missing install files
iche033 Aug 21, 2024
a3090c1
fix
iche033 Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jammy/debian/libgz-utils3-log-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ubuntu/debian/libgz-utils-log-dev.install
1 change: 1 addition & 0 deletions jammy/debian/libgz-utils3-log.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ubuntu/debian/libgz-utils-log.install
1 change: 1 addition & 0 deletions noble/debian/libgz-utils3-log-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ubuntu/debian/libgz-utils-log-dev.install
1 change: 1 addition & 0 deletions noble/debian/libgz-utils3-log.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../ubuntu/debian/libgz-utils-log.install
19 changes: 19 additions & 0 deletions ubuntu/debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Priority: extra
Build-Depends: cmake,
debhelper (>= 13),
doxygen,
libspdlog-dev,
libgz-cmake4-dev
Vcs-Browser: https://github.com/gazebosim/gz-utils3-release
Vcs-Git: https://github.com/gazebosim/gz-utils3-release
Expand Down Expand Up @@ -36,6 +37,24 @@ Depends: libgz-utils3-dev (= ${binary:Version}),
Multi-Arch: same
Description: Gazebo Utils Library - CLI Development files

Package: libgz-utils3-log-dev
Architecture: any
Section: libdevel
Depends: libgz-utils3-dev (= ${binary:Version}),
libgz-utils3-log (= ${binary:Version}),
libspdlog-dev,
${misc:Depends}
Multi-Arch: same
Description: Gazebo Utils Library - Log Development files

Package: libgz-utils3-log
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: same
Description: Gazebo Utils Library - Log shared library

Package: libgz-utils3-dbg
Architecture: any
Section: debug
Expand Down
4 changes: 2 additions & 2 deletions ubuntu/debian/libgz-utils-cli-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
usr/include/*/*/*/utils/cli/*
usr/include/*/*/*/utils/cli.hh
usr/lib/*/pkgconfig/*-utils?-cli.pc
usr/lib/*/cmake/*-utils?-cli/*
usr/lib/*/pkgconfig/*-utils[0-99]-cli.pc
usr/lib/*/cmake/*-utils[0-99]-cli/*
12 changes: 8 additions & 4 deletions ubuntu/debian/libgz-utils-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
usr/include/*
usr/lib/*/*.so
usr/lib/*/pkgconfig/*.pc
usr/lib/*/cmake/*-utils*/*
usr/include/*/utils[0-99]/gz/utils/detail/*.hh
usr/include/*/utils[0-99]/gz/utils/detail/*.h
usr/include/*/utils[0-99]/*/utils.hh
usr/include/*/utils[0-99]/*/utils/*.hh
usr/lib/*/pkgconfig/*-utils[0-99].pc
usr/lib/*/cmake/*-utils[0-99]/*-utils*
usr/lib/*/cmake/*-utils[0-99]-all/*-utils*
usr/lib/*/lib*-utils[0-99].so
usr/share/gz/*/*
4 changes: 4 additions & 0 deletions ubuntu/debian/libgz-utils-log-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
usr/include/*/*/*/utils/log/*
usr/lib/*/pkgconfig/*-utils[0-99]-log.pc
usr/lib/*/cmake/*-utils[0-99]-log/*
usr/lib/*/lib*-utils[0-99]-log.so
1 change: 1 addition & 0 deletions ubuntu/debian/libgz-utils-log.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/*/lib*-utils[0-99]-log.so.*
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a test run and it looks like there are some warnings: https://build.osrfoundation.org/job/gz-utils3-debbuilder/513/console

W: gz-utils3 source: binaries-have-file-conflict libgz-utils3 libgz-utils3-log usr/lib/x86_64-linux-gnu/libgz-utils3-log.so.3.0.0
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/include/gz/utils3/gz/utils/log.hh
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/include/gz/utils3/gz/utils/log/Export.hh
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/include/gz/utils3/gz/utils/log/Logger.hh
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/include/gz/utils3/gz/utils/log/SplitSink.hh
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/include/gz/utils3/gz/utils/log/detail/Export.hh
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/lib/x86_64-linux-gnu/cmake/gz-utils3-log/gz-utils3-log-config-version.cmake
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/lib/x86_64-linux-gnu/cmake/gz-utils3-log/gz-utils3-log-config.cmake
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/lib/x86_64-linux-gnu/cmake/gz-utils3-log/gz-utils3-log-targets-relwithdebinfo.cmake
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/lib/x86_64-linux-gnu/cmake/gz-utils3-log/gz-utils3-log-targets.cmake
W: gz-utils3 source: binaries-have-file-conflict libgz-utils3-dev libgz-utils3-log-dev usr/lib/x86_64-linux-gnu/pkgconfig/gz-utils3-log.pc

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok made a few changes. The build is green now: https://build.osrfoundation.org/job/gz-utils3-debbuilder/517/

2 changes: 1 addition & 1 deletion ubuntu/debian/libgz-utils.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
usr/lib/*/*.so.*
usr/lib/*/lib*-utils[0-99].so.*