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

Remove deprecations: tock #705

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Remove deprecations: tock #705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f993aab
Remove deprecations: tock
caguero Dec 5, 2024
97f5255
Deprecate GZ_PHYSICS_ENGINE_INSTALL_DIR
caguero Dec 8, 2024
e1e5bae
Remove macro
caguero Dec 19, 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
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ message(STATUS "-------------------------------------------\n")
set(GZ_PHYSICS_ENGINE_RELATIVE_INSTALL_DIR
${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/engine-plugins
)
set(GZ_PHYSICS_ENGINE_INSTALL_DIR
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this cmake variable is still being used in different engine plugins' CMakeLists.txt for windows install. Not sure if we can remove this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Leave it as deprecated, then. 97f5255. Thanks!

${CMAKE_INSTALL_PREFIX}/${GZ_PHYSICS_ENGINE_RELATIVE_INSTALL_DIR}
)

#============================================================================
# Configure the build
Expand Down
7 changes: 7 additions & 0 deletions Migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Deprecated code produces compile-time warnings. These warning serve as
notification to users that their code should be upgraded. The next major
release will remove the deprecated code.

## Gazebo Physics 8.X to 9.X

### Removals

* The environment variable `GZ_PHYSICS_ENGINE_INSTALL_DIR` is removed. Use
Copy link
Contributor

Choose a reason for hiding this comment

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

rephrased to say macro instead of env var

Suggested change
* The environment variable `GZ_PHYSICS_ENGINE_INSTALL_DIR` is removed. Use
* The macro `GZ_PHYSICS_ENGINE_INSTALL_DIR` is removed. Use

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated in 97f5255.

`gz::physics::getEngineInstallDir()` instead.
Copy link
Contributor

Choose a reason for hiding this comment

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

should we just remove the macro like other gz packages?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How about now? e1e5bae


## Gazebo Physics 5.X to 6.X

### Deprecations
Expand Down
11 changes: 0 additions & 11 deletions dartsim/src/SDFFeatures_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,17 +361,6 @@ TEST_P(SDFFeatures_TEST, CheckDartsimData)
std::numeric_limits<double>::infinity(),
std::numeric_limits<double>::infinity());

/// \todo (anyone) getBodyNode("blah")->getFrictionCoeff is deprecated,
/// disabling these tests.
/*
EXPECT_DOUBLE_EQ(1.1, skeleton->getBodyNode("base")->getFrictionCoeff());
// The last collision element overwrites the value set by previous collision
// elements. We expect mu=1, the default value, instead of 0.1.
EXPECT_DOUBLE_EQ(1, skeleton->getBodyNode("upper_link")->getFrictionCoeff());
// Gets the default value when the <surface> tag is missing
EXPECT_DOUBLE_EQ(1, skeleton->getBodyNode("lower_link")->getFrictionCoeff());
*/

for (const auto * joint : {skeleton->getJoint(1), skeleton->getJoint(2)})
{
const auto * revolute =
Expand Down
2 changes: 0 additions & 2 deletions include/gz/physics/config.hh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
#define GZ_PHYSICS_VERSION_FULL "${PROJECT_VERSION_FULL}"
#define GZ_PHYSICS_VERSION_NAMESPACE v${PROJECT_VERSION_MAJOR}

#define GZ_PHYSICS_ENGINE_INSTALL_DIR _Pragma ("GCC warning \"'GZ_PHYSICS_ENGINE_INSTALL_DIR' macro is deprecated, use gz::physics::getEngineInstallDir() function instead. \"") "${GZ_PHYSICS_ENGINE_INSTALL_DIR}"

#define GZ_PHYSICS_VERSION_HEADER "Gazebo Physics, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"

#endif
Loading