Merge branch 'ign-plugin1' into ports/1_to_2

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Nov 11, 2022 · 106fa08 · 106fa08
2 parents 931428a + 1d5a4c9
commit 106fa08
Show file tree

Hide file tree

Showing 22 changed files with 55 additions and 53 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(VERSION_SUFFIX)
+gz_configure_project()
 
 #============================================================================
 # Set project-specific options

diff --git a/Changelog.md b/Changelog.md
@@ -60,6 +60,37 @@
 1. Remove gz-tools from CMakeLists.txt. Not used
     * [Pull request #56](https://github.com/gazebosim/gz-plugin/pull/56)
 
+
+## Gazebo Plugin 1.x
+
+### Gazebo Plugin 1.3.0 (2022-11-11)
+
+1. ign -> gz Migrate Ignition Headers : gz-plugin
+    * [Pull request #101](https://github.com/gazebosim/gz-plugin/pull/101)
+
+### Gazebo Plugin 1.3.0 (2022-08-15)
+
+1. Remove redundant namespace references
+    * [Pull request #100](https://github.com/gazebosim/gz-plugin/pull/100)
+
+1. Change `IGN_DESIGNATION` to `GZ_DESIGNATION`
+    * [Pull request #96](https://github.com/gazebosim/gz-plugin/pull/96)
+
+1. Ignition -> Gazebo
+    * [Pull request #94](https://github.com/gazebosim/gz-plugin/pull/94)
+
+1. Bash completion for flags
+    * [Pull request #81](https://github.com/gazebosim/gz-plugin/pull/81)
+
+1. Add LICENSE file
+    * [Pull request #72](https://github.com/gazebosim/gz-plugin/pull/72)
+
+1. Add Ubuntu Jammy CI
+    * [Pull request #68](https://github.com/gazebosim/gz-plugin/pull/68)
+
+1. Install ruby commands on Windows
+    * [Pull request #63](https://github.com/gazebosim/gz-plugin/pull/63)
+
 ### Gazebo Plugin 1.2.0 (2021-03-30)
 
 1. Infrastructure

diff --git a/MigrationFromCommon.md b/MigrationFromCommon.md
@@ -84,8 +84,10 @@ then you should continue to use it. It does not have a replacement in `gz-plugin
 
 Here is a list of things that you *should* replace:
 
+* `#include <ignition/common/PluginLoader.hh>` should be replaced with `#include <gz/plugin/Loader.hh>`
 * `#include <gz/common/PluginLoader.hh>` should be replaced with `#include <gz/plugin/Loader.hh>`
 * `gz::common::PluginLoader` should be replaced with `gz::plugin::Loader`
+* `ignition::common::PluginLoader` should be replaced with `gz::plugin::Loader`
 * When calling `Loader::Instantiate("....")` do **NOT** prefix the class name with `::`. E.g. `"::some_namespace::MyClass"` should now be `"some_namespace::MyClass"`.
 
 

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -15,6 +15,5 @@ gz_build_tests(
   TYPE UNIT
   SOURCES ${tests})
 
-
 add_subdirectory(include/gz/plugin)
 install(DIRECTORY include/ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
diff --git a/core/include/CMakeLists.txt b/core/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gz/plugin)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/core/include/ignition/plugin/EnablePluginFromThis.hh b/core/include/ignition/plugin/EnablePluginFromThis.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/Factory.hh b/core/include/ignition/plugin/Factory.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/Info.hh b/core/include/ignition/plugin/Info.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/Plugin.hh b/core/include/ignition/plugin/Plugin.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/PluginPtr.hh b/core/include/ignition/plugin/PluginPtr.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/SpecializedPlugin.hh b/core/include/ignition/plugin/SpecializedPlugin.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/SpecializedPluginPtr.hh b/core/include/ignition/plugin/SpecializedPluginPtr.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/WeakPluginPtr.hh b/core/include/ignition/plugin/WeakPluginPtr.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/include/ignition/plugin/utility.hh b/core/include/ignition/plugin/utility.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/loader/include/CMakeLists.txt b/loader/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/loader/include/ignition/plugin/Loader.hh b/loader/include/ignition/plugin/Loader.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/loader/include/ignition/plugin/detail/Loader.hh b/loader/include/ignition/plugin/detail/Loader.hh
diff --git a/loader/src/cmd/gz.cc b/loader/src/cmd/gz.cc
@@ -24,6 +24,8 @@
 #include "gz/plugin/config.hh"
 #include "gz.hh"
 
+using Loader = gz::plugin::Loader;
+
 //////////////////////////////////////////////////
 extern "C" void cmdPluginInfo(
     const char *_plugin, int _verbose)
@@ -34,7 +36,7 @@ extern "C" void cmdPluginInfo(
     return;
   }
 
-  gz::plugin::Loader pl;
+  Loader pl;
   std::cout << "Loading plugin library file [" << _plugin << "]\n";
 
   // Print names of plugins exported by library file

diff --git a/register/include/CMakeLists.txt b/register/include/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gz)
+install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
diff --git a/register/include/ignition/plugin/Register.hh b/register/include/ignition/plugin/Register.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/register/include/ignition/plugin/RegisterMore.hh b/register/include/ignition/plugin/RegisterMore.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/register/include/ignition/plugin/detail/Register.hh b/register/include/ignition/plugin/detail/Register.hh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(gz/plugin)
		install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		add_subdirectory(gz)
		install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})