Remove deprecations: tock

Signed-off-by: Carlos Agüero <[email protected]>
gazebosim · Dec 3, 2024 · eea1129 · eea1129
1 parent 9cec25a
commit eea1129
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,6 @@ gz_configure_project(VERSION_SUFFIX pre1)
 #============================================================================
 
 set(GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH "${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/")
-set(GZ_LAUNCH_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${GZ_LAUNCH_PLUGIN_RELATIVE_INSTALL_PATH}")
 
 #============================================================================
 # Search for project-specific dependencies

diff --git a/include/gz/launch/config.hh.in b/include/gz/launch/config.hh.in
@@ -31,8 +31,4 @@
 
 #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"
 
-#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"
-
-#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}"
-
 #endif
diff --git a/plugins/websocket_server/combined.proto b/plugins/websocket_server/combined.proto
@@ -412,10 +412,6 @@ message Joint
   string name           = 2;
   uint32 id             = 3;
 
-  /// \brief Angle of each axis. 
-  /// \deprecated Use the position field in the axis1 or axis2 message.
-  repeated double angle = 4 [deprecated=true];
-
   Type type             = 5;
   string parent         = 6;
   uint32 parent_id      = 7;
@@ -428,11 +424,6 @@ message Joint
   double cfm            = 13;
   double bounce         = 14;
 
-  /// \brief Velocity of the joint in SI units (meter/second).
-  /// \deprecated Use the velocity value in the axis1 or axis2
-  /// message.
-  double velocity       = 15[deprecated=true];
-
   double fudge_factor   = 16;
   double limit_cfm      = 17;
   double limit_erp      = 18;