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.

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

Support backward-cpp #2

Merged
merged 9 commits into from
Oct 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion bionic/debian/control

This file was deleted.

36 changes: 36 additions & 0 deletions bionic/debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
Source: ignition-tools
Standards-Version: 3.9.8
Maintainer: Jose Luis Rivero <jrivero@osrfoundation.org>
Section: science
Priority: optional
Build-Depends: debhelper (>= 9~),
gem2deb,
cmake,
pkg-config
XS-Ruby-Versions: all
Vcs-Browser: https://bitbucket.org/ignitionrobotics/ign-tools-release
Vcs-Hg: https://bitbucket.org/ignitionrobotics/ign-tools-release
Homepage: http://ignitionrobotics.org/

Package: ignition-tools
Architecture: any
Section: libs
Pre-Depends: ${misc:Pre-Depends}
XB-Ruby-Versions: ${ruby:Versions}
Depends: ruby | ruby-interpreter,
${misc:Depends}
Multi-Arch: same
Description: Ignition entry point for using all the suite of ignition tools
Ignition tools is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.

Package: libignition-tools-dev
Architecture: any
Section: libdevel
Depends: cmake,
ignition-tools,
${misc:Depends}
Multi-Arch: same
Description: CMake/Pkgconfig Support for rest of the suite of ignition tools
Ignition tools is a component in the ignition framework, a set of libraries
designed to rapidly develop robot applications.
1 change: 0 additions & 1 deletion bionic/debian/rules

This file was deleted.

12 changes: 12 additions & 0 deletions bionic/debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/make -f


.PHONY: override_dh_auto_configure

override_dh_auto_configure:
# backward-cpp not in Bionic
dh_auto_configure -- \
-DUSE_SYSTEM_BACKWARDCPP=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
%:
dh $@ --buildsystem=cmake --with ruby
53 changes: 0 additions & 53 deletions debian/sid/debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/compat

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/control

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/copyright

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/ignition-tools.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/libignition-tools-dev.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/rules

This file was deleted.

1 change: 0 additions & 1 deletion debian/sid/debian/source/format

This file was deleted.

3 changes: 2 additions & 1 deletion ubuntu/debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Priority: optional
Build-Depends: debhelper (>= 9~),
gem2deb,
cmake,
pkg-config
pkg-config,
libbackward-cpp-dev
Copy link
Contributor

Choose a reason for hiding this comment

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

This kinda goes against the undocumented rule we have against adding dependencies in minor releases. In this case I guess the alternative would be vendoring, which I don't think is recommended.

Do you think the addition of this dependency could negatively impact downstream users? Note that ign-tools1 is a dependency of pretty much all simulators we maintain right now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you think the addition of this dependency could negatively impact downstream users? Note that ign-tools1 is a dependency of pretty much all simulators we maintain right now.

This case is a bit special since the dependency is only a build-dep, headers go into the build and no more is needed, if I understand the scenario correctly. If this is right, we are not modifying the dependency chain for consumers of the library just altering the build conditions providing the necessary source code for platforms without backwards-cpp. Seems safe to me to make an exception to the rule.

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool, I agree that it's ok if it's only needed while building. To be honest, I haven't looked into how it's all hooked up. I just noticed some failing downstream CI that couldn't find backward though.

XS-Ruby-Versions: all
Vcs-Browser: https://bitbucket.org/ignitionrobotics/ign-tools-release
Vcs-Hg: https://bitbucket.org/ignitionrobotics/ign-tools-release
Expand Down
1 change: 1 addition & 0 deletions ubuntu/debian/ignition-tools.install
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
usr/bin/*
usr/lib/*/libignition-tools-backward.so
3 changes: 2 additions & 1 deletion ubuntu/debian/libignition-tools-dev.install
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
usr/lib/
/usr/lib/*/pkgconfig/
/usr/lib/*/cmake/