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

Merge 1 -> main #79

Merged
merged 41 commits into from
Mar 15, 2022
Merged

Merge 1 -> main #79

merged 41 commits into from
Mar 15, 2022

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port ign-tools1 to main. Needed by #78

Branch comparison: main...ign-tools1

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

mabelzhang and others added 30 commits February 25, 2021 17:37
* Fix relocatable pkg-config file on Ubuntu

The hard-coded ../.. path to prefix is incorrect when the .pc file
is installed to a subfolder of lib, such as for debian packages,
which install to /usr/lib/x86_64-linux-gnu/pkgconfig

* Remove include and library flags from .pc file
* Remove unneeded fields

Signed-off-by: Steve Peters <[email protected]>
* 🎈 1.1.0~pre1

Signed-off-by: Louise Poubel <[email protected]>

* fix changelog

Signed-off-by: Carlos Agüero <[email protected]>

Co-authored-by: Carlos Agüero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* Relax version verification

Signed-off-by: Caio Amaral <[email protected]>
Co-authored-by: Carlos Agüero <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* Sort versions correctly.

Signed-off-by: Carlos Agüero <[email protected]>
* Remove all cmake code related to compilations

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
* Remove ruby find_program and ronn. Not really used

Signed-off-by: Jose Luis Rivero <[email protected]>
…m#54)

* Remove all test artifacts from build code: unused
* Remove Utils.cmake code related to test
* Add changelog entry

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Alejandro Hernández <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* 🎈 1.3.0

Signed-off-by: Louise Poubel <[email protected]>

* merge changelog entries

PR gazebosim#56 fixed a bug in gazebosim#55 so merge their entries

Signed-off-by: Steve Peters <[email protected]>

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Generate to a unique folder based on $<CONFIG>

Signed-off-by: Steve Peters <[email protected]>
`$<TARGET_FILE>` yields the full path of the library in the build
directory, which will likely not be available in binary distributions of
ign-tools. This instead uses the install path of the library.

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Fix use of Backward on macOS and add a unit test
scpeters and others added 9 commits October 25, 2021 13:57
* Remove configure.bat
* README: update windows job badge

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>

Co-authored-by: Steve Peters <[email protected]>
Signed-off-by: Silvio <[email protected]>

Co-authored-by: Carlos Agüero <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
This is based on the helper used by gazebo's gz command.
It has minimal functionality for now in order to
demonstrate the approach.

* README: from-source auto-complete instructions

Signed-off-by: Steve Peters <[email protected]>
@chapulina
Copy link
Contributor

@scpeters
Copy link
Member Author

Windows needs

that has been merged, so this is ready for review

Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

🚀

@scpeters scpeters merged commit 0b1c3ee into gazebosim:main Mar 15, 2022
@scpeters scpeters deleted the merge12 branch March 15, 2022 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants