Skip to content

Commit 9527043

Browse files
authored
Remove deprecations: tock (#284)
* Remove deprecations: tock Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
1 parent 9cec25a commit 9527043

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ gz_configure_project(VERSION_SUFFIX pre1)
2424
#============================================================================
2525

2626
set(GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH "${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/")
27-
set(GZ_LAUNCH_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH}")
2827

2928
#============================================================================
3029
# Search for project-specific dependencies

Migration.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ Deprecated code produces compile-time warnings. These warning serve as
55
notification to users that their code should be upgraded. The next major
66
release will remove the deprecated code.
77

8+
## Gazebo Launch 8.X to 9.X
9+
10+
* The environment variable `GZ_LAUNCH_INITIAL_CONFIG_PATH` is removed. Use
11+
`gz::launch::getInitialConfigPath()` instead.
12+
13+
* The environment variable `GZ_LAUNCH_PLUGIN_INSTALL_PATH` is removed. Use
14+
`gz::launch::getPluginInstallPath()` instead.
15+
816
## Gazebo Launch 6.X to 7.X
917

1018
- Removed Ignition

include/gz/launch/config.hh.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,4 @@
3131

3232
#define GZ_LAUNCH_VERSION_HEADER "Gazebo Launch, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2019 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n"
3333

34-
#define GZ_LAUNCH_INITIAL_CONFIG_PATH _Pragma ("GCC warning \"'GZ_LAUNCH_INITIAL_CONFIG_PATH' macro is deprecated, use gz::launch::getInitialConfigPath() function instead. \"") "${CMAKE_INSTALL_PREFIX}/${GZ_DATA_INSTALL_DIR}/configs"
35-
36-
#define GZ_LAUNCH_PLUGIN_INSTALL_PATH _Pragma ("GCC warning \"'GZ_LAUNCH_PLUGIN_INSTALL_PATH' macro is deprecated, use gz::launch::getPluginInstallPath() function instead. \"") "${GZ_LAUNCH_PLUGIN_INSTALL_PATH}"
37-
3834
#endif

plugins/websocket_server/combined.proto

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,6 @@ message Joint
412412
string name = 2;
413413
uint32 id = 3;
414414

415-
/// \brief Angle of each axis.
416-
/// \deprecated Use the position field in the axis1 or axis2 message.
417-
repeated double angle = 4 [deprecated=true];
418-
419415
Type type = 5;
420416
string parent = 6;
421417
uint32 parent_id = 7;
@@ -428,11 +424,6 @@ message Joint
428424
double cfm = 13;
429425
double bounce = 14;
430426

431-
/// \brief Velocity of the joint in SI units (meter/second).
432-
/// \deprecated Use the velocity value in the axis1 or axis2
433-
/// message.
434-
double velocity = 15[deprecated=true];
435-
436427
double fudge_factor = 16;
437428
double limit_cfm = 17;
438429
double limit_erp = 18;

0 commit comments

Comments
 (0)