From c34932a98c1edafb02969faf9a77a9b45a54461e Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 27 Apr 2022 14:35:59 -0700 Subject: [PATCH 1/5] Move header files with git mv Signed-off-by: methylDragon --- cli/include/external-cli/{ignition => gz}/utils/CMakeLists.txt | 0 cli/include/external-cli/{ignition => gz}/utils/cli/App.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/CLI.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Config.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/ConfigFwd.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Error.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Formatter.hpp | 0 .../external-cli/{ignition => gz}/utils/cli/FormatterFwd.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Macros.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Option.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Split.hpp | 0 .../external-cli/{ignition => gz}/utils/cli/StringTools.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Timer.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/TypeTools.hpp | 0 .../external-cli/{ignition => gz}/utils/cli/Validators.hpp | 0 cli/include/external-cli/{ignition => gz}/utils/cli/Version.hpp | 0 cli/include/{ignition => gz}/utils/CMakeLists.txt | 0 .../cli/IgnitionFormatter.hpp => gz/utils/cli/GzFormatter.hpp} | 0 cli/include/vendored-cli/{ignition => gz}/utils/CMakeLists.txt | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/App.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/CLI.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Config.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/ConfigFwd.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Error.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Formatter.hpp | 0 .../vendored-cli/{ignition => gz}/utils/cli/FormatterFwd.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Macros.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Option.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Split.hpp | 0 .../vendored-cli/{ignition => gz}/utils/cli/StringTools.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Timer.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/TypeTools.hpp | 0 .../vendored-cli/{ignition => gz}/utils/cli/Validators.hpp | 0 cli/include/vendored-cli/{ignition => gz}/utils/cli/Version.hpp | 0 include/{ignition => gz}/CMakeLists.txt | 0 include/{ignition => gz}/utils/CMakeLists.txt | 0 include/{ignition => gz}/utils/Environment.hh | 0 include/{ignition => gz}/utils/ExtraTestMacros.hh | 0 include/{ignition => gz}/utils/ImplPtr.hh | 0 include/{ignition => gz}/utils/NeverDestroyed.hh | 0 include/{ignition => gz}/utils/SuppressWarning.hh | 0 include/{ignition => gz}/utils/config.hh.in | 0 include/{ignition => gz}/utils/detail/DefaultOps.hh | 0 include/{ignition => gz}/utils/detail/ExtraTestMacros.hh | 0 include/{ignition => gz}/utils/detail/ImplPtr.hh | 0 include/{ignition => gz}/utils/detail/SuppressWarning.hh | 0 include/{ignition => gz}/utils/utils.hh.in | 0 47 files changed, 0 insertions(+), 0 deletions(-) rename cli/include/external-cli/{ignition => gz}/utils/CMakeLists.txt (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/App.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/CLI.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Config.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/ConfigFwd.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Error.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Formatter.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/FormatterFwd.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Macros.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Option.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Split.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/StringTools.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Timer.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/TypeTools.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Validators.hpp (100%) rename cli/include/external-cli/{ignition => gz}/utils/cli/Version.hpp (100%) rename cli/include/{ignition => gz}/utils/CMakeLists.txt (100%) rename cli/include/{ignition/utils/cli/IgnitionFormatter.hpp => gz/utils/cli/GzFormatter.hpp} (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/CMakeLists.txt (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/App.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/CLI.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Config.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/ConfigFwd.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Error.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Formatter.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/FormatterFwd.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Macros.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Option.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Split.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/StringTools.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Timer.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/TypeTools.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Validators.hpp (100%) rename cli/include/vendored-cli/{ignition => gz}/utils/cli/Version.hpp (100%) rename include/{ignition => gz}/CMakeLists.txt (100%) rename include/{ignition => gz}/utils/CMakeLists.txt (100%) rename include/{ignition => gz}/utils/Environment.hh (100%) rename include/{ignition => gz}/utils/ExtraTestMacros.hh (100%) rename include/{ignition => gz}/utils/ImplPtr.hh (100%) rename include/{ignition => gz}/utils/NeverDestroyed.hh (100%) rename include/{ignition => gz}/utils/SuppressWarning.hh (100%) rename include/{ignition => gz}/utils/config.hh.in (100%) rename include/{ignition => gz}/utils/detail/DefaultOps.hh (100%) rename include/{ignition => gz}/utils/detail/ExtraTestMacros.hh (100%) rename include/{ignition => gz}/utils/detail/ImplPtr.hh (100%) rename include/{ignition => gz}/utils/detail/SuppressWarning.hh (100%) rename include/{ignition => gz}/utils/utils.hh.in (100%) diff --git a/cli/include/external-cli/ignition/utils/CMakeLists.txt b/cli/include/external-cli/gz/utils/CMakeLists.txt similarity index 100% rename from cli/include/external-cli/ignition/utils/CMakeLists.txt rename to cli/include/external-cli/gz/utils/CMakeLists.txt diff --git a/cli/include/external-cli/ignition/utils/cli/App.hpp b/cli/include/external-cli/gz/utils/cli/App.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/App.hpp rename to cli/include/external-cli/gz/utils/cli/App.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/CLI.hpp b/cli/include/external-cli/gz/utils/cli/CLI.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/CLI.hpp rename to cli/include/external-cli/gz/utils/cli/CLI.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Config.hpp b/cli/include/external-cli/gz/utils/cli/Config.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Config.hpp rename to cli/include/external-cli/gz/utils/cli/Config.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/external-cli/gz/utils/cli/ConfigFwd.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp rename to cli/include/external-cli/gz/utils/cli/ConfigFwd.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Error.hpp b/cli/include/external-cli/gz/utils/cli/Error.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Error.hpp rename to cli/include/external-cli/gz/utils/cli/Error.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp b/cli/include/external-cli/gz/utils/cli/Formatter.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Formatter.hpp rename to cli/include/external-cli/gz/utils/cli/Formatter.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/external-cli/gz/utils/cli/FormatterFwd.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp rename to cli/include/external-cli/gz/utils/cli/FormatterFwd.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Macros.hpp b/cli/include/external-cli/gz/utils/cli/Macros.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Macros.hpp rename to cli/include/external-cli/gz/utils/cli/Macros.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Option.hpp b/cli/include/external-cli/gz/utils/cli/Option.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Option.hpp rename to cli/include/external-cli/gz/utils/cli/Option.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Split.hpp b/cli/include/external-cli/gz/utils/cli/Split.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Split.hpp rename to cli/include/external-cli/gz/utils/cli/Split.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp b/cli/include/external-cli/gz/utils/cli/StringTools.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/StringTools.hpp rename to cli/include/external-cli/gz/utils/cli/StringTools.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Timer.hpp b/cli/include/external-cli/gz/utils/cli/Timer.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Timer.hpp rename to cli/include/external-cli/gz/utils/cli/Timer.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/external-cli/gz/utils/cli/TypeTools.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/TypeTools.hpp rename to cli/include/external-cli/gz/utils/cli/TypeTools.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Validators.hpp b/cli/include/external-cli/gz/utils/cli/Validators.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Validators.hpp rename to cli/include/external-cli/gz/utils/cli/Validators.hpp diff --git a/cli/include/external-cli/ignition/utils/cli/Version.hpp b/cli/include/external-cli/gz/utils/cli/Version.hpp similarity index 100% rename from cli/include/external-cli/ignition/utils/cli/Version.hpp rename to cli/include/external-cli/gz/utils/cli/Version.hpp diff --git a/cli/include/ignition/utils/CMakeLists.txt b/cli/include/gz/utils/CMakeLists.txt similarity index 100% rename from cli/include/ignition/utils/CMakeLists.txt rename to cli/include/gz/utils/CMakeLists.txt diff --git a/cli/include/ignition/utils/cli/IgnitionFormatter.hpp b/cli/include/gz/utils/cli/GzFormatter.hpp similarity index 100% rename from cli/include/ignition/utils/cli/IgnitionFormatter.hpp rename to cli/include/gz/utils/cli/GzFormatter.hpp diff --git a/cli/include/vendored-cli/ignition/utils/CMakeLists.txt b/cli/include/vendored-cli/gz/utils/CMakeLists.txt similarity index 100% rename from cli/include/vendored-cli/ignition/utils/CMakeLists.txt rename to cli/include/vendored-cli/gz/utils/CMakeLists.txt diff --git a/cli/include/vendored-cli/ignition/utils/cli/App.hpp b/cli/include/vendored-cli/gz/utils/cli/App.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/App.hpp rename to cli/include/vendored-cli/gz/utils/cli/App.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp b/cli/include/vendored-cli/gz/utils/cli/CLI.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/CLI.hpp rename to cli/include/vendored-cli/gz/utils/cli/CLI.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp b/cli/include/vendored-cli/gz/utils/cli/Config.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Config.hpp rename to cli/include/vendored-cli/gz/utils/cli/Config.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/vendored-cli/gz/utils/cli/ConfigFwd.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp rename to cli/include/vendored-cli/gz/utils/cli/ConfigFwd.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp b/cli/include/vendored-cli/gz/utils/cli/Error.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Error.hpp rename to cli/include/vendored-cli/gz/utils/cli/Error.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp b/cli/include/vendored-cli/gz/utils/cli/Formatter.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp rename to cli/include/vendored-cli/gz/utils/cli/Formatter.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/vendored-cli/gz/utils/cli/FormatterFwd.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp rename to cli/include/vendored-cli/gz/utils/cli/FormatterFwd.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp b/cli/include/vendored-cli/gz/utils/cli/Macros.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Macros.hpp rename to cli/include/vendored-cli/gz/utils/cli/Macros.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp b/cli/include/vendored-cli/gz/utils/cli/Option.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Option.hpp rename to cli/include/vendored-cli/gz/utils/cli/Option.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp b/cli/include/vendored-cli/gz/utils/cli/Split.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Split.hpp rename to cli/include/vendored-cli/gz/utils/cli/Split.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp b/cli/include/vendored-cli/gz/utils/cli/StringTools.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp rename to cli/include/vendored-cli/gz/utils/cli/StringTools.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp b/cli/include/vendored-cli/gz/utils/cli/Timer.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Timer.hpp rename to cli/include/vendored-cli/gz/utils/cli/Timer.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/vendored-cli/gz/utils/cli/TypeTools.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp rename to cli/include/vendored-cli/gz/utils/cli/TypeTools.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp b/cli/include/vendored-cli/gz/utils/cli/Validators.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Validators.hpp rename to cli/include/vendored-cli/gz/utils/cli/Validators.hpp diff --git a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp b/cli/include/vendored-cli/gz/utils/cli/Version.hpp similarity index 100% rename from cli/include/vendored-cli/ignition/utils/cli/Version.hpp rename to cli/include/vendored-cli/gz/utils/cli/Version.hpp diff --git a/include/ignition/CMakeLists.txt b/include/gz/CMakeLists.txt similarity index 100% rename from include/ignition/CMakeLists.txt rename to include/gz/CMakeLists.txt diff --git a/include/ignition/utils/CMakeLists.txt b/include/gz/utils/CMakeLists.txt similarity index 100% rename from include/ignition/utils/CMakeLists.txt rename to include/gz/utils/CMakeLists.txt diff --git a/include/ignition/utils/Environment.hh b/include/gz/utils/Environment.hh similarity index 100% rename from include/ignition/utils/Environment.hh rename to include/gz/utils/Environment.hh diff --git a/include/ignition/utils/ExtraTestMacros.hh b/include/gz/utils/ExtraTestMacros.hh similarity index 100% rename from include/ignition/utils/ExtraTestMacros.hh rename to include/gz/utils/ExtraTestMacros.hh diff --git a/include/ignition/utils/ImplPtr.hh b/include/gz/utils/ImplPtr.hh similarity index 100% rename from include/ignition/utils/ImplPtr.hh rename to include/gz/utils/ImplPtr.hh diff --git a/include/ignition/utils/NeverDestroyed.hh b/include/gz/utils/NeverDestroyed.hh similarity index 100% rename from include/ignition/utils/NeverDestroyed.hh rename to include/gz/utils/NeverDestroyed.hh diff --git a/include/ignition/utils/SuppressWarning.hh b/include/gz/utils/SuppressWarning.hh similarity index 100% rename from include/ignition/utils/SuppressWarning.hh rename to include/gz/utils/SuppressWarning.hh diff --git a/include/ignition/utils/config.hh.in b/include/gz/utils/config.hh.in similarity index 100% rename from include/ignition/utils/config.hh.in rename to include/gz/utils/config.hh.in diff --git a/include/ignition/utils/detail/DefaultOps.hh b/include/gz/utils/detail/DefaultOps.hh similarity index 100% rename from include/ignition/utils/detail/DefaultOps.hh rename to include/gz/utils/detail/DefaultOps.hh diff --git a/include/ignition/utils/detail/ExtraTestMacros.hh b/include/gz/utils/detail/ExtraTestMacros.hh similarity index 100% rename from include/ignition/utils/detail/ExtraTestMacros.hh rename to include/gz/utils/detail/ExtraTestMacros.hh diff --git a/include/ignition/utils/detail/ImplPtr.hh b/include/gz/utils/detail/ImplPtr.hh similarity index 100% rename from include/ignition/utils/detail/ImplPtr.hh rename to include/gz/utils/detail/ImplPtr.hh diff --git a/include/ignition/utils/detail/SuppressWarning.hh b/include/gz/utils/detail/SuppressWarning.hh similarity index 100% rename from include/ignition/utils/detail/SuppressWarning.hh rename to include/gz/utils/detail/SuppressWarning.hh diff --git a/include/ignition/utils/utils.hh.in b/include/gz/utils/utils.hh.in similarity index 100% rename from include/ignition/utils/utils.hh.in rename to include/gz/utils/utils.hh.in From eacb04a7b0f12437251477ac2986d92d60fb4c4e Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 27 Apr 2022 14:35:59 -0700 Subject: [PATCH 2/5] Create redirection aliases Signed-off-by: methylDragon --- .../external-cli/ignition/utils/cli/App.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/CLI.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/Config.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/ConfigFwd.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/Error.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/Formatter.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/FormatterFwd.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/Macros.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/Option.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/Split.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/StringTools.hpp | 18 ++++++++++++++++++ .../external-cli/ignition/utils/cli/Timer.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/TypeTools.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/Validators.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/Version.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/IgnitionFormatter.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/App.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/CLI.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/Config.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/ConfigFwd.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/Error.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/Formatter.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/FormatterFwd.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/Macros.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/Option.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/Split.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/StringTools.hpp | 18 ++++++++++++++++++ .../vendored-cli/ignition/utils/cli/Timer.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/TypeTools.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/Validators.hpp | 18 ++++++++++++++++++ .../ignition/utils/cli/Version.hpp | 18 ++++++++++++++++++ include/ignition/utils.hh | 18 ++++++++++++++++++ include/ignition/utils/Environment.hh | 18 ++++++++++++++++++ include/ignition/utils/Export.hh | 18 ++++++++++++++++++ include/ignition/utils/ExtraTestMacros.hh | 18 ++++++++++++++++++ include/ignition/utils/ImplPtr.hh | 18 ++++++++++++++++++ include/ignition/utils/NeverDestroyed.hh | 18 ++++++++++++++++++ include/ignition/utils/SuppressWarning.hh | 18 ++++++++++++++++++ include/ignition/utils/config.hh | 18 ++++++++++++++++++ include/ignition/utils/detail/DefaultOps.hh | 18 ++++++++++++++++++ .../ignition/utils/detail/ExtraTestMacros.hh | 18 ++++++++++++++++++ include/ignition/utils/detail/ImplPtr.hh | 18 ++++++++++++++++++ .../ignition/utils/detail/SuppressWarning.hh | 18 ++++++++++++++++++ include/ignition/utils/utils.hh | 18 ++++++++++++++++++ 44 files changed, 792 insertions(+) create mode 100644 cli/include/external-cli/ignition/utils/cli/App.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/CLI.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Config.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Error.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Formatter.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Macros.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Option.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Split.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/StringTools.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Timer.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/TypeTools.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Validators.hpp create mode 100644 cli/include/external-cli/ignition/utils/cli/Version.hpp create mode 100644 cli/include/ignition/utils/cli/IgnitionFormatter.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/App.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/CLI.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Config.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Error.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Macros.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Option.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Split.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Timer.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Validators.hpp create mode 100644 cli/include/vendored-cli/ignition/utils/cli/Version.hpp create mode 100644 include/ignition/utils.hh create mode 100644 include/ignition/utils/Environment.hh create mode 100644 include/ignition/utils/Export.hh create mode 100644 include/ignition/utils/ExtraTestMacros.hh create mode 100644 include/ignition/utils/ImplPtr.hh create mode 100644 include/ignition/utils/NeverDestroyed.hh create mode 100644 include/ignition/utils/SuppressWarning.hh create mode 100644 include/ignition/utils/config.hh create mode 100644 include/ignition/utils/detail/DefaultOps.hh create mode 100644 include/ignition/utils/detail/ExtraTestMacros.hh create mode 100644 include/ignition/utils/detail/ImplPtr.hh create mode 100644 include/ignition/utils/detail/SuppressWarning.hh create mode 100644 include/ignition/utils/utils.hh diff --git a/cli/include/external-cli/ignition/utils/cli/App.hpp b/cli/include/external-cli/ignition/utils/cli/App.hpp new file mode 100644 index 0000000..bf8b209 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/App.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/CLI.hpp b/cli/include/external-cli/ignition/utils/cli/CLI.hpp new file mode 100644 index 0000000..2f13af5 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/CLI.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Config.hpp b/cli/include/external-cli/ignition/utils/cli/Config.hpp new file mode 100644 index 0000000..9c0aa6d --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Config.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp new file mode 100644 index 0000000..4cd3458 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/ConfigFwd.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Error.hpp b/cli/include/external-cli/ignition/utils/cli/Error.hpp new file mode 100644 index 0000000..2645c6e --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Error.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Formatter.hpp b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp new file mode 100644 index 0000000..9015d9f --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Formatter.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp new file mode 100644 index 0000000..673339c --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/FormatterFwd.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Macros.hpp b/cli/include/external-cli/ignition/utils/cli/Macros.hpp new file mode 100644 index 0000000..2b65982 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Macros.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Option.hpp b/cli/include/external-cli/ignition/utils/cli/Option.hpp new file mode 100644 index 0000000..d29b97a --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Option.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Split.hpp b/cli/include/external-cli/ignition/utils/cli/Split.hpp new file mode 100644 index 0000000..63682e7 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Split.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/StringTools.hpp b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp new file mode 100644 index 0000000..715b332 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/StringTools.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Timer.hpp b/cli/include/external-cli/ignition/utils/cli/Timer.hpp new file mode 100644 index 0000000..a3823b6 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Timer.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp new file mode 100644 index 0000000..e8b521f --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/TypeTools.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Validators.hpp b/cli/include/external-cli/ignition/utils/cli/Validators.hpp new file mode 100644 index 0000000..06c7c4e --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Validators.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/external-cli/ignition/utils/cli/Version.hpp b/cli/include/external-cli/ignition/utils/cli/Version.hpp new file mode 100644 index 0000000..a02dde7 --- /dev/null +++ b/cli/include/external-cli/ignition/utils/cli/Version.hpp @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/ignition/utils/cli/IgnitionFormatter.hpp b/cli/include/ignition/utils/cli/IgnitionFormatter.hpp new file mode 100644 index 0000000..90c31a6 --- /dev/null +++ b/cli/include/ignition/utils/cli/IgnitionFormatter.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/App.hpp b/cli/include/vendored-cli/ignition/utils/cli/App.hpp new file mode 100644 index 0000000..defcc2d --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/App.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp new file mode 100644 index 0000000..4a64829 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/CLI.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Config.hpp b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp new file mode 100644 index 0000000..768d70c --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Config.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp new file mode 100644 index 0000000..32be359 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/ConfigFwd.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Error.hpp b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp new file mode 100644 index 0000000..1866c8d --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Error.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp new file mode 100644 index 0000000..2f4e75f --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Formatter.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp new file mode 100644 index 0000000..f428383 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/FormatterFwd.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp new file mode 100644 index 0000000..fff0cf8 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Macros.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Option.hpp b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp new file mode 100644 index 0000000..1d0f4ad --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Option.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Split.hpp b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp new file mode 100644 index 0000000..ef743d2 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Split.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp new file mode 100644 index 0000000..a613d6e --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/StringTools.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp new file mode 100644 index 0000000..f12d5d2 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Timer.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp new file mode 100644 index 0000000..c338de7 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/TypeTools.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp new file mode 100644 index 0000000..9e3909b --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Validators.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/cli/include/vendored-cli/ignition/utils/cli/Version.hpp b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp new file mode 100644 index 0000000..9b66af1 --- /dev/null +++ b/cli/include/vendored-cli/ignition/utils/cli/Version.hpp @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils.hh b/include/ignition/utils.hh new file mode 100644 index 0000000..2c876fa --- /dev/null +++ b/include/ignition/utils.hh @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/Environment.hh b/include/ignition/utils/Environment.hh new file mode 100644 index 0000000..d58de5d --- /dev/null +++ b/include/ignition/utils/Environment.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/Export.hh b/include/ignition/utils/Export.hh new file mode 100644 index 0000000..1632fb2 --- /dev/null +++ b/include/ignition/utils/Export.hh @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/ExtraTestMacros.hh b/include/ignition/utils/ExtraTestMacros.hh new file mode 100644 index 0000000..875855e --- /dev/null +++ b/include/ignition/utils/ExtraTestMacros.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2020 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/ImplPtr.hh b/include/ignition/utils/ImplPtr.hh new file mode 100644 index 0000000..17f0df5 --- /dev/null +++ b/include/ignition/utils/ImplPtr.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/NeverDestroyed.hh b/include/ignition/utils/NeverDestroyed.hh new file mode 100644 index 0000000..aeaeb3a --- /dev/null +++ b/include/ignition/utils/NeverDestroyed.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2021 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/SuppressWarning.hh b/include/ignition/utils/SuppressWarning.hh new file mode 100644 index 0000000..8b7d4c3 --- /dev/null +++ b/include/ignition/utils/SuppressWarning.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/config.hh b/include/ignition/utils/config.hh new file mode 100644 index 0000000..fea1896 --- /dev/null +++ b/include/ignition/utils/config.hh @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/detail/DefaultOps.hh b/include/ignition/utils/detail/DefaultOps.hh new file mode 100644 index 0000000..d9f4fc6 --- /dev/null +++ b/include/ignition/utils/detail/DefaultOps.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/detail/ExtraTestMacros.hh b/include/ignition/utils/detail/ExtraTestMacros.hh new file mode 100644 index 0000000..b048f54 --- /dev/null +++ b/include/ignition/utils/detail/ExtraTestMacros.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2020 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/detail/ImplPtr.hh b/include/ignition/utils/detail/ImplPtr.hh new file mode 100644 index 0000000..2041ed9 --- /dev/null +++ b/include/ignition/utils/detail/ImplPtr.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/detail/SuppressWarning.hh b/include/ignition/utils/detail/SuppressWarning.hh new file mode 100644 index 0000000..27059c3 --- /dev/null +++ b/include/ignition/utils/detail/SuppressWarning.hh @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2017 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include diff --git a/include/ignition/utils/utils.hh b/include/ignition/utils/utils.hh new file mode 100644 index 0000000..77ab913 --- /dev/null +++ b/include/ignition/utils/utils.hh @@ -0,0 +1,18 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include From 76b71cee8074f9ab1c1e28f5909bd09559cd56da Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 27 Apr 2022 14:36:32 -0700 Subject: [PATCH 3/5] Migrate sources in src, test, examples, and include Signed-off-by: methylDragon --- cli/include/gz/utils/cli/GzFormatter.hpp | 10 +++++----- include/gz/utils/Environment.hh | 10 +++++----- include/gz/utils/ExtraTestMacros.hh | 8 ++++---- include/gz/utils/ImplPtr.hh | 14 +++++++------- include/gz/utils/NeverDestroyed.hh | 6 +++--- include/gz/utils/SuppressWarning.hh | 8 ++++---- include/gz/utils/detail/DefaultOps.hh | 6 +++--- include/gz/utils/detail/ExtraTestMacros.hh | 8 ++++---- include/gz/utils/detail/ImplPtr.hh | 8 ++++---- include/gz/utils/detail/SuppressWarning.hh | 8 ++++---- include/gz/utils/utils.hh.in | 2 +- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/cli/include/gz/utils/cli/GzFormatter.hpp b/cli/include/gz/utils/cli/GzFormatter.hpp index 72bc115..997e1bf 100644 --- a/cli/include/gz/utils/cli/GzFormatter.hpp +++ b/cli/include/gz/utils/cli/GzFormatter.hpp @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_UTILS_CLI_IGNITION_FORMATTER_HPP_ -#define IGNITION_UTILS_CLI_IGNITION_FORMATTER_HPP_ +#ifndef GZ_UTILS_CLI_IGNITION_FORMATTER_HPP_ +#define GZ_UTILS_CLI_IGNITION_FORMATTER_HPP_ #include #include @@ -24,8 +24,8 @@ #include #include -#include "ignition/utils/cli/App.hpp" -#include "ignition/utils/cli/FormatterFwd.hpp" +#include "gz/utils/cli/App.hpp" +#include "gz/utils/cli/FormatterFwd.hpp" ////////////////////////////////////////////////// /// \brief CLI Formatter class that implements custom Ignition-specific @@ -167,4 +167,4 @@ private: std::unordered_multimap needs; private: std::unordered_multimap needed_by; }; -#endif // IGNITION_UTILS_CLI_IGNITION_FORMATTER_HPP_ +#endif // GZ_UTILS_CLI_IGNITION_FORMATTER_HPP_ diff --git a/include/gz/utils/Environment.hh b/include/gz/utils/Environment.hh index 658a13f..36cad0b 100644 --- a/include/gz/utils/Environment.hh +++ b/include/gz/utils/Environment.hh @@ -15,11 +15,11 @@ * */ -#ifndef IGNITION_UTILS_ENVIRONMENT_HH_ -#define IGNITION_UTILS_ENVIRONMENT_HH_ +#ifndef GZ_UTILS_ENVIRONMENT_HH_ +#define GZ_UTILS_ENVIRONMENT_HH_ -#include -#include +#include +#include #include @@ -70,5 +70,5 @@ bool IGNITION_UTILS_VISIBLE unsetenv(const std::string &_name); } // namespace utils } // namespace ignition -#endif // IGNITION_UTILS_ENVIRONMENT_HH_ +#endif // GZ_UTILS_ENVIRONMENT_HH_ diff --git a/include/gz/utils/ExtraTestMacros.hh b/include/gz/utils/ExtraTestMacros.hh index bad461e..625d21b 100644 --- a/include/gz/utils/ExtraTestMacros.hh +++ b/include/gz/utils/ExtraTestMacros.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_UTILS_EXTRATESTMACROS_HH -#define IGNITION_UTILS_EXTRATESTMACROS_HH +#ifndef GZ_UTILS_EXTRATESTMACROS_HH +#define GZ_UTILS_EXTRATESTMACROS_HH -#include +#include /// \brief Restrict the execution of the test for the Windows platform. /// The test will be compiled on Windows too but will never be run as @@ -44,4 +44,4 @@ #define IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) \ DETAIL_IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(TestName) -#endif // IGNITION_UTILS_EXTRATESTMACROS_HH +#endif // GZ_UTILS_EXTRATESTMACROS_HH diff --git a/include/gz/utils/ImplPtr.hh b/include/gz/utils/ImplPtr.hh index 8eba453..dfc8881 100644 --- a/include/gz/utils/ImplPtr.hh +++ b/include/gz/utils/ImplPtr.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_UTILS__IMPLPTR_HH_ -#define IGNITION_UTILS__IMPLPTR_HH_ +#ifndef GZ_UTILS__IMPLPTR_HH_ +#define GZ_UTILS__IMPLPTR_HH_ #include #include -#include -#include -#include +#include +#include +#include namespace ignition { @@ -255,6 +255,6 @@ namespace ignition IGN_UTILS_UNIQUE_IMPL_PTR_FWD(Implementation, memberName) -#include +#include -#endif // IGNITION_UTILS__IMPLPTR_HH_ +#endif // GZ_UTILS__IMPLPTR_HH_ diff --git a/include/gz/utils/NeverDestroyed.hh b/include/gz/utils/NeverDestroyed.hh index 2ad9351..8537a79 100644 --- a/include/gz/utils/NeverDestroyed.hh +++ b/include/gz/utils/NeverDestroyed.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_UTILS_NEVERDESTROYED_HH_ -#define IGNITION_UTILS_NEVERDESTROYED_HH_ +#ifndef GZ_UTILS_NEVERDESTROYED_HH_ +#define GZ_UTILS_NEVERDESTROYED_HH_ #include #include @@ -159,4 +159,4 @@ class NeverDestroyed } // namespace utils } // namespace ignition -#endif // IGNITION_UTILS_NEVERDESTROYED_HH_ +#endif // GZ_UTILS_NEVERDESTROYED_HH_ diff --git a/include/gz/utils/SuppressWarning.hh b/include/gz/utils/SuppressWarning.hh index d8bb134..af9d72d 100644 --- a/include/gz/utils/SuppressWarning.hh +++ b/include/gz/utils/SuppressWarning.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_UTILS__SUPPRESSWARNING_HH_ -#define IGNITION_UTILS__SUPPRESSWARNING_HH_ +#ifndef GZ_UTILS__SUPPRESSWARNING_HH_ +#define GZ_UTILS__SUPPRESSWARNING_HH_ -#include +#include // This header contains cross-platform macros for suppressing warnings. Please // only use these macros responsibly when you are certain that the compiler is @@ -88,4 +88,4 @@ // TODO(anyone): Add more warning types as they become relevant. // Do not add warning types to suppress unless they are genuinely necessary. -#endif // IGNITION_UTILS__SUPPRESSWARNING_HH_ +#endif // GZ_UTILS__SUPPRESSWARNING_HH_ diff --git a/include/gz/utils/detail/DefaultOps.hh b/include/gz/utils/detail/DefaultOps.hh index 0c966cc..16b09e7 100644 --- a/include/gz/utils/detail/DefaultOps.hh +++ b/include/gz/utils/detail/DefaultOps.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_UTILS__DETAIL__DEFAULTOPS_HH_ -#define IGNITION_UTILS__DETAIL__DEFAULTOPS_HH_ +#ifndef GZ_UTILS__DETAIL__DEFAULTOPS_HH_ +#define GZ_UTILS__DETAIL__DEFAULTOPS_HH_ #include @@ -80,5 +80,5 @@ namespace ignition } // namespace utils } // namespace ignition -#endif // IGNITION_UTILS__DETAIL__DEFAULTOPS_HH_ +#endif // GZ_UTILS__DETAIL__DEFAULTOPS_HH_ diff --git a/include/gz/utils/detail/ExtraTestMacros.hh b/include/gz/utils/detail/ExtraTestMacros.hh index 02f2a49..c24c408 100644 --- a/include/gz/utils/detail/ExtraTestMacros.hh +++ b/include/gz/utils/detail/ExtraTestMacros.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_UTILS_DETAIL_EXTRATESTMACROS_HH -#define IGNITION_UTILS_DETAIL_EXTRATESTMACROS_HH +#ifndef GZ_UTILS_DETAIL_EXTRATESTMACROS_HH +#define GZ_UTILS_DETAIL_EXTRATESTMACROS_HH -#include +#include #define DETAIL_IGN_UTILS_ADD_DISABLED_PREFIX(x) DISABLED_##x @@ -59,4 +59,4 @@ #endif // defined __linux__ -#endif // IGNITION_UTILS_DETAIL_EXTRATESTMACROS_HH +#endif // GZ_UTILS_DETAIL_EXTRATESTMACROS_HH diff --git a/include/gz/utils/detail/ImplPtr.hh b/include/gz/utils/detail/ImplPtr.hh index 0926f29..65dcf71 100644 --- a/include/gz/utils/detail/ImplPtr.hh +++ b/include/gz/utils/detail/ImplPtr.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_UTILS__DETAIL__IMPLPTR_HH_ -#define IGNITION_UTILS__DETAIL__IMPLPTR_HH_ +#ifndef GZ_UTILS__DETAIL__IMPLPTR_HH_ +#define GZ_UTILS__DETAIL__IMPLPTR_HH_ -#include +#include #include @@ -148,4 +148,4 @@ namespace ignition } // namespace utils } // namespace ignition -#endif // IGNITION_UTILS__DETAIL__IMPLPTR_HH_ +#endif // GZ_UTILS__DETAIL__IMPLPTR_HH_ diff --git a/include/gz/utils/detail/SuppressWarning.hh b/include/gz/utils/detail/SuppressWarning.hh index da1f736..bcfcb22 100644 --- a/include/gz/utils/detail/SuppressWarning.hh +++ b/include/gz/utils/detail/SuppressWarning.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_UTILS__DETAIL__SUPPRESSWARNING_HH_ -#define IGNITION_UTILS__DETAIL__SUPPRESSWARNING_HH_ +#ifndef GZ_UTILS__DETAIL__SUPPRESSWARNING_HH_ +#define GZ_UTILS__DETAIL__SUPPRESSWARNING_HH_ -#include +#include #ifndef DETAIL_IGN_UTILS_STRINGIFY #define DETAIL_IGN_UTILS_STRINGIFY(x) #x @@ -238,4 +238,4 @@ #endif -#endif // IGNITION_UTILS__DETAIL__SUPPRESSWARNING_HH_ +#endif // GZ_UTILS__DETAIL__SUPPRESSWARNING_HH_ diff --git a/include/gz/utils/utils.hh.in b/include/gz/utils/utils.hh.in index 8071d70..5964169 100644 --- a/include/gz/utils/utils.hh.in +++ b/include/gz/utils/utils.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers} From ea5baa1d7167e669e3b75c8f3afff13a10d70763 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 27 Apr 2022 14:36:34 -0700 Subject: [PATCH 4/5] Migrate CMake files Signed-off-by: methylDragon --- CMakeLists.txt | 4 +++- cli/include/CMakeLists.txt | 10 +++++----- cli/src/CMakeLists.txt | 8 ++++---- include/CMakeLists.txt | 3 ++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c1a6b0..321860a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,9 @@ find_package(ignition-cmake3 REQUIRED) # Configure the project #============================================================================ set(c++standard 17) -ign_configure_project(VERSION_SUFFIX pre1) +ign_configure_project( + REPLACE_IGNITION_INCLUDE_PATH gz/utils + VERSION_SUFFIX pre1) #============================================================================ # Set project-specific options diff --git a/cli/include/CMakeLists.txt b/cli/include/CMakeLists.txt index 3e21b27..148a1f5 100644 --- a/cli/include/CMakeLists.txt +++ b/cli/include/CMakeLists.txt @@ -4,15 +4,15 @@ # target_include_directories(@tgt@ INTERFACE "$") # that for the usual include directories are handled by ign_add_component if(IGN_UTILS_VENDOR_CLI11) - add_subdirectory(vendored-cli/ignition/utils) - target_include_directories(${ign_utils_cli_target_name} + add_subdirectory(vendored-cli/gz/utils) + target_include_directories(${gz_utils_cli_target_name} INTERFACE "$") else() - add_subdirectory(external-cli/ignition/utils) - target_include_directories(${ign_utils_cli_target_name} + add_subdirectory(external-cli/gz/utils) + target_include_directories(${gz_utils_cli_target_name} INTERFACE "$") endif() -add_subdirectory(ignition/utils) +add_subdirectory(gz/utils) diff --git a/cli/src/CMakeLists.txt b/cli/src/CMakeLists.txt index fcad935..14bc66f 100644 --- a/cli/src/CMakeLists.txt +++ b/cli/src/CMakeLists.txt @@ -2,17 +2,17 @@ ign_add_component( cli INTERFACE INDEPENDENT_FROM_PROJECT_LIB - GET_TARGET_NAME ign_utils_cli_target_name) + GET_TARGET_NAME gz_utils_cli_target_name) # Make sure that the name is visible also in cli/include/CMakeLists.txt -set(ign_utils_cli_target_name ${ign_utils_cli_target_name} PARENT_SCOPE) +set(gz_utils_cli_target_name ${gz_utils_cli_target_name} PARENT_SCOPE) if(NOT IGN_UTILS_VENDOR_CLI11) - target_link_libraries(${ign_utils_cli_target_name} INTERFACE CLI11::CLI11) + target_link_libraries(${gz_utils_cli_target_name} INTERFACE CLI11::CLI11) endif() ign_get_libsources_and_unittests(sources gtest_sources) ign_build_tests(TYPE UNIT SOURCES ${gtest_sources} LIB_DEPS - ${ign_utils_cli_target_name} + ${gz_utils_cli_target_name} ) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 25ec897..4b2bdd7 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition) +add_subdirectory(gz) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) From e305fcb4ea6b026a9116f277e82ff36cf0a551d8 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Wed, 27 Apr 2022 16:21:17 -0700 Subject: [PATCH 5/5] Manual: Update examples Signed-off-by: methylDragon --- examples/using_cli/main.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/using_cli/main.cc b/examples/using_cli/main.cc index 64cb0f5..04810f8 100644 --- a/examples/using_cli/main.cc +++ b/examples/using_cli/main.cc @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include /* * At this point, all functionality of CLI11 will be available.