From d38c1852fe511f37c55c16b2dfff9805a8dea009 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 4 Dec 2019 19:26:39 -0800 Subject: [PATCH 1/4] Move FrameSemantics.hh to src folder and update includes --- src/Frame.cc | 2 +- src/FrameSemantics.cc | 2 +- {include/sdf => src}/FrameSemantics.hh | 0 src/JointAxis.cc | 2 +- src/Model.cc | 2 +- src/SemanticPose.cc | 2 +- src/World.cc | 2 +- src/parser.cc | 3 ++- 8 files changed, 8 insertions(+), 7 deletions(-) rename {include/sdf => src}/FrameSemantics.hh (100%) diff --git a/src/Frame.cc b/src/Frame.cc index 3ca7e6a27..c6a5737df 100644 --- a/src/Frame.cc +++ b/src/Frame.cc @@ -19,7 +19,7 @@ #include "sdf/Frame.hh" #include "sdf/Error.hh" #include "sdf/Types.hh" -#include "sdf/FrameSemantics.hh" +#include "FrameSemantics.hh" #include "Utils.hh" using namespace sdf; diff --git a/src/FrameSemantics.cc b/src/FrameSemantics.cc index 0fe85208b..6a5dfe47c 100644 --- a/src/FrameSemantics.cc +++ b/src/FrameSemantics.cc @@ -25,7 +25,7 @@ #include "sdf/Types.hh" #include "sdf/World.hh" -#include "sdf/FrameSemantics.hh" +#include "FrameSemantics.hh" namespace sdf { diff --git a/include/sdf/FrameSemantics.hh b/src/FrameSemantics.hh similarity index 100% rename from include/sdf/FrameSemantics.hh rename to src/FrameSemantics.hh diff --git a/src/JointAxis.cc b/src/JointAxis.cc index 8faa5b6aa..5aa2b67cd 100644 --- a/src/JointAxis.cc +++ b/src/JointAxis.cc @@ -18,7 +18,7 @@ #include #include "sdf/Error.hh" #include "sdf/JointAxis.hh" -#include "sdf/FrameSemantics.hh" +#include "FrameSemantics.hh" using namespace sdf; diff --git a/src/Model.cc b/src/Model.cc index 78a7ffce2..0d392eead 100644 --- a/src/Model.cc +++ b/src/Model.cc @@ -20,11 +20,11 @@ #include #include "sdf/Error.hh" #include "sdf/Frame.hh" -#include "sdf/FrameSemantics.hh" #include "sdf/Joint.hh" #include "sdf/Link.hh" #include "sdf/Model.hh" #include "sdf/Types.hh" +#include "FrameSemantics.hh" #include "Utils.hh" using namespace sdf; diff --git a/src/SemanticPose.cc b/src/SemanticPose.cc index ad6603ed6..01e7f904e 100644 --- a/src/SemanticPose.cc +++ b/src/SemanticPose.cc @@ -17,10 +17,10 @@ #include #include #include "sdf/Assert.hh" -#include "sdf/FrameSemantics.hh" #include "sdf/SemanticPose.hh" #include "sdf/Error.hh" #include "sdf/Types.hh" +#include "FrameSemantics.hh" #include "Utils.hh" namespace sdf diff --git a/src/World.cc b/src/World.cc index 402a13fde..71076d9ad 100644 --- a/src/World.cc +++ b/src/World.cc @@ -20,12 +20,12 @@ #include "sdf/Actor.hh" #include "sdf/Frame.hh" -#include "sdf/FrameSemantics.hh" #include "sdf/Light.hh" #include "sdf/Model.hh" #include "sdf/Physics.hh" #include "sdf/Types.hh" #include "sdf/World.hh" +#include "FrameSemantics.hh" #include "Utils.hh" using namespace sdf; diff --git a/src/parser.cc b/src/parser.cc index 542d9e025..2aaeba179 100644 --- a/src/parser.cc +++ b/src/parser.cc @@ -26,7 +26,6 @@ #include "sdf/Converter.hh" #include "sdf/Filesystem.hh" #include "sdf/Frame.hh" -#include "sdf/FrameSemantics.hh" #include "sdf/Joint.hh" #include "sdf/Link.hh" #include "sdf/Model.hh" @@ -39,6 +38,8 @@ #include "sdf/parser_urdf.hh" #include "sdf/sdf_config.h" +#include "FrameSemantics.hh" + namespace sdf { inline namespace SDF_VERSION_NAMESPACE { From 290fb157706aeab903a0fd4c9235ed5298343c3e Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 4 Dec 2019 19:27:23 -0800 Subject: [PATCH 2/4] move test/integration/frame_semantics.cc to src/FrameSemantics_TEST.cc and treat like Utils_TEST --- src/CMakeLists.txt | 7 ++++++- .../frame_semantics.cc => src/FrameSemantics_TEST.cc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) rename test/integration/frame_semantics.cc => src/FrameSemantics_TEST.cc (99%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e9560855c..bee3ede40 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,12 +143,17 @@ if (IGNITION-TOOLS_BINARY_DIRS) ) endif() +sdf_build_tests(${gtest_sources}) + if (NOT WIN32) set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS Utils.cc) sdf_build_tests(Utils_TEST.cc) endif() -sdf_build_tests(${gtest_sources}) +if (NOT WIN32) + set(SDF_BUILD_TESTS_EXTRA_EXE_SRCS FrameSemantics.cc) + sdf_build_tests(FrameSemantics_TEST.cc) +endif() sdf_add_library(${sdf_target} ${sources}) target_link_libraries(${sdf_target} PUBLIC ${IGNITION-MATH_LIBRARIES}) diff --git a/test/integration/frame_semantics.cc b/src/FrameSemantics_TEST.cc similarity index 99% rename from test/integration/frame_semantics.cc rename to src/FrameSemantics_TEST.cc index 1a9e7bc9d..e119b589b 100644 --- a/test/integration/frame_semantics.cc +++ b/src/FrameSemantics_TEST.cc @@ -23,7 +23,6 @@ #include "sdf/Element.hh" #include "sdf/Frame.hh" -#include "sdf/FrameSemantics.hh" #include "sdf/Filesystem.hh" #include "sdf/Model.hh" #include "sdf/Root.hh" @@ -32,6 +31,7 @@ #include "sdf/parser.hh" #include "sdf/sdf_config.h" +#include "FrameSemantics.hh" #include "test_config.h" ///////////////////////////////////////////////// From 3ec5b7b16368b9367b664be567411d9a6758fa94 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 4 Dec 2019 19:27:52 -0800 Subject: [PATCH 3/4] changelog --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index c2aa5becc..46a312fb9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -72,6 +72,7 @@ 1. Hide FrameSemantics implementation. * [Pull request 622](https://bitbucket.org/osrf/sdformat/pull-requests/622) + * [Pull request 623](https://bitbucket.org/osrf/sdformat/pull-requests/623) ## SDFormat 8.0 From 67c78aa9d88383ee7ce5af0f63e310fd640e7a0a Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 5 Dec 2019 04:01:50 +0000 Subject: [PATCH 4/4] Close branch hide_frame_semantics_2