From 3a115249cb808550d09aa3f8c15ae9adfbab09fe Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Fri, 4 Aug 2023 06:54:40 -0700 Subject: [PATCH] Remove ignition (#424) Signed-off-by: Nate Koenig --- NEWS | 2 +- docker/gz-transport/Dockerfile | 2 +- example/record.cc | 2 +- include/CMakeLists.txt | 1 - include/ignition/transport.hh | 19 -------- .../ignition/transport/AdvertiseOptions.hh | 19 -------- include/ignition/transport/CIface.h | 19 -------- include/ignition/transport/Clock.hh | 19 -------- include/ignition/transport/Discovery.hh | 19 -------- include/ignition/transport/Export.hh | 19 -------- include/ignition/transport/HandlerStorage.hh | 19 -------- include/ignition/transport/Helpers.hh | 37 --------------- include/ignition/transport/MessageInfo.hh | 19 -------- include/ignition/transport/NetUtils.hh | 19 -------- include/ignition/transport/Node.hh | 19 -------- include/ignition/transport/NodeOptions.hh | 19 -------- include/ignition/transport/NodeShared.hh | 19 -------- include/ignition/transport/Packet.hh | 19 -------- include/ignition/transport/Publisher.hh | 19 -------- include/ignition/transport/RepHandler.hh | 19 -------- include/ignition/transport/ReqHandler.hh | 19 -------- .../ignition/transport/SubscribeOptions.hh | 19 -------- .../ignition/transport/SubscriptionHandler.hh | 19 -------- include/ignition/transport/TopicStatistics.hh | 19 -------- include/ignition/transport/TopicStorage.hh | 19 -------- include/ignition/transport/TopicUtils.hh | 19 -------- include/ignition/transport/TransportTypes.hh | 19 -------- include/ignition/transport/Uuid.hh | 19 -------- include/ignition/transport/config.hh | 46 ------------------- include/ignition/transport/detail/Export.hh | 19 -------- include/ignition/transport/detail/Node.hh | 19 -------- include/ignition/transport/log.hh | 19 -------- log/include/CMakeLists.txt | 1 - log/include/ignition/transport/log/Batch.hh | 19 -------- .../ignition/transport/log/Descriptor.hh | 19 -------- log/include/ignition/transport/log/Export.hh | 19 -------- log/include/ignition/transport/log/Log.hh | 19 -------- log/include/ignition/transport/log/Message.hh | 19 -------- log/include/ignition/transport/log/MsgIter.hh | 19 -------- .../ignition/transport/log/Playback.hh | 19 -------- .../ignition/transport/log/QualifiedTime.hh | 19 -------- .../ignition/transport/log/QueryOptions.hh | 19 -------- .../ignition/transport/log/Recorder.hh | 19 -------- .../ignition/transport/log/SqlStatement.hh | 19 -------- .../ignition/transport/log/detail/Export.hh | 19 -------- .../transport/log/detail/QueryOptions.hh | 19 -------- test/integration/deprecated_TEST.cc | 32 ------------- 47 files changed, 3 insertions(+), 861 deletions(-) delete mode 100644 include/ignition/transport.hh delete mode 100644 include/ignition/transport/AdvertiseOptions.hh delete mode 100644 include/ignition/transport/CIface.h delete mode 100644 include/ignition/transport/Clock.hh delete mode 100644 include/ignition/transport/Discovery.hh delete mode 100644 include/ignition/transport/Export.hh delete mode 100644 include/ignition/transport/HandlerStorage.hh delete mode 100644 include/ignition/transport/Helpers.hh delete mode 100644 include/ignition/transport/MessageInfo.hh delete mode 100644 include/ignition/transport/NetUtils.hh delete mode 100644 include/ignition/transport/Node.hh delete mode 100644 include/ignition/transport/NodeOptions.hh delete mode 100644 include/ignition/transport/NodeShared.hh delete mode 100644 include/ignition/transport/Packet.hh delete mode 100644 include/ignition/transport/Publisher.hh delete mode 100644 include/ignition/transport/RepHandler.hh delete mode 100644 include/ignition/transport/ReqHandler.hh delete mode 100644 include/ignition/transport/SubscribeOptions.hh delete mode 100644 include/ignition/transport/SubscriptionHandler.hh delete mode 100644 include/ignition/transport/TopicStatistics.hh delete mode 100644 include/ignition/transport/TopicStorage.hh delete mode 100644 include/ignition/transport/TopicUtils.hh delete mode 100644 include/ignition/transport/TransportTypes.hh delete mode 100644 include/ignition/transport/Uuid.hh delete mode 100644 include/ignition/transport/config.hh delete mode 100644 include/ignition/transport/detail/Export.hh delete mode 100644 include/ignition/transport/detail/Node.hh delete mode 100644 include/ignition/transport/log.hh delete mode 100644 log/include/ignition/transport/log/Batch.hh delete mode 100644 log/include/ignition/transport/log/Descriptor.hh delete mode 100644 log/include/ignition/transport/log/Export.hh delete mode 100644 log/include/ignition/transport/log/Log.hh delete mode 100644 log/include/ignition/transport/log/Message.hh delete mode 100644 log/include/ignition/transport/log/MsgIter.hh delete mode 100644 log/include/ignition/transport/log/Playback.hh delete mode 100644 log/include/ignition/transport/log/QualifiedTime.hh delete mode 100644 log/include/ignition/transport/log/QueryOptions.hh delete mode 100644 log/include/ignition/transport/log/Recorder.hh delete mode 100644 log/include/ignition/transport/log/SqlStatement.hh delete mode 100644 log/include/ignition/transport/log/detail/Export.hh delete mode 100644 log/include/ignition/transport/log/detail/QueryOptions.hh delete mode 100644 test/integration/deprecated_TEST.cc diff --git a/NEWS b/NEWS index 6b7be6e12..a73d9b7c1 100644 --- a/NEWS +++ b/NEWS @@ -1 +1 @@ -http://ignition_robotics.org +http://gazebosim.org diff --git a/docker/gz-transport/Dockerfile b/docker/gz-transport/Dockerfile index 3d3fc50c6..117cef2b1 100644 --- a/docker/gz-transport/Dockerfile +++ b/docker/gz-transport/Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && sudo apt-get update \ && sudo apt-get clean -# Install Ignition dependencies +# Install gazebo dependencies RUN sudo /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' \ && sudo /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -' \ && sudo apt-get update \ diff --git a/example/record.cc b/example/record.cc index 293ba230f..c4586a54f 100644 --- a/example/record.cc +++ b/example/record.cc @@ -15,7 +15,7 @@ * */ -/// \brief Example of recording all ignition transport topics. +/// \brief Example of recording all gz transport topics. /// This will record all topics and currently published to a file. /// Launch the gz-transport publisher example so this example has /// something to record. diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 992a1312e..a35a0475e 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/ignition/transport.hh b/include/ignition/transport.hh deleted file mode 100644 index 72e13a686..000000000 --- a/include/ignition/transport.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/AdvertiseOptions.hh b/include/ignition/transport/AdvertiseOptions.hh deleted file mode 100644 index 99ad5dbbe..000000000 --- a/include/ignition/transport/AdvertiseOptions.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/CIface.h b/include/ignition/transport/CIface.h deleted file mode 100644 index bd6435671..000000000 --- a/include/ignition/transport/CIface.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Clock.hh b/include/ignition/transport/Clock.hh deleted file mode 100644 index 149689ada..000000000 --- a/include/ignition/transport/Clock.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Discovery.hh b/include/ignition/transport/Discovery.hh deleted file mode 100644 index 3ef844680..000000000 --- a/include/ignition/transport/Discovery.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Export.hh b/include/ignition/transport/Export.hh deleted file mode 100644 index c7c48bc3f..000000000 --- a/include/ignition/transport/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/HandlerStorage.hh b/include/ignition/transport/HandlerStorage.hh deleted file mode 100644 index 5e19f7162..000000000 --- a/include/ignition/transport/HandlerStorage.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Helpers.hh b/include/ignition/transport/Helpers.hh deleted file mode 100644 index 06214623a..000000000 --- a/include/ignition/transport/Helpers.hh +++ /dev/null @@ -1,37 +0,0 @@ -/* - * 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 -#include - -// Avoid using deprecated message send/receive function when possible. -#if ZMQ_VERSION > ZMQ_MAKE_VERSION(4, 3, 1) - #define IGN_ZMQ_POST_4_3_1 GZ_ZMQ_POST_4_3_1 -#endif - -// Avoid using deprecated set function when possible -#if CPPZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 7, 0) - // Ubuntu Focal (20.04) packages a different "4.7.0" - #ifndef UBUNTU_FOCAL - #define IGN_CPPZMQ_POST_4_7_0 GZ_CPPZMQ_POST_4_7_0 - #endif -#endif - -#define ign_strcat gz_strcat -#define ign_strcpy gz_strcpy -#define ign_sprintf gz_sprintf -#define ign_strdup gz_strdup diff --git a/include/ignition/transport/MessageInfo.hh b/include/ignition/transport/MessageInfo.hh deleted file mode 100644 index 97db64c7a..000000000 --- a/include/ignition/transport/MessageInfo.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/NetUtils.hh b/include/ignition/transport/NetUtils.hh deleted file mode 100644 index 31de86633..000000000 --- a/include/ignition/transport/NetUtils.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Node.hh b/include/ignition/transport/Node.hh deleted file mode 100644 index f7162d05f..000000000 --- a/include/ignition/transport/Node.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/NodeOptions.hh b/include/ignition/transport/NodeOptions.hh deleted file mode 100644 index 7c2d190d6..000000000 --- a/include/ignition/transport/NodeOptions.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/NodeShared.hh b/include/ignition/transport/NodeShared.hh deleted file mode 100644 index 0bc26daad..000000000 --- a/include/ignition/transport/NodeShared.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Packet.hh b/include/ignition/transport/Packet.hh deleted file mode 100644 index 45dc0fdf2..000000000 --- a/include/ignition/transport/Packet.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Publisher.hh b/include/ignition/transport/Publisher.hh deleted file mode 100644 index b4655c4b8..000000000 --- a/include/ignition/transport/Publisher.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/RepHandler.hh b/include/ignition/transport/RepHandler.hh deleted file mode 100644 index 2f35859fd..000000000 --- a/include/ignition/transport/RepHandler.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/ReqHandler.hh b/include/ignition/transport/ReqHandler.hh deleted file mode 100644 index 5ba6c83e6..000000000 --- a/include/ignition/transport/ReqHandler.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/SubscribeOptions.hh b/include/ignition/transport/SubscribeOptions.hh deleted file mode 100644 index 1e1c3ae83..000000000 --- a/include/ignition/transport/SubscribeOptions.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/SubscriptionHandler.hh b/include/ignition/transport/SubscriptionHandler.hh deleted file mode 100644 index 2833f0f92..000000000 --- a/include/ignition/transport/SubscriptionHandler.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/TopicStatistics.hh b/include/ignition/transport/TopicStatistics.hh deleted file mode 100644 index cfbb55bb5..000000000 --- a/include/ignition/transport/TopicStatistics.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/TopicStorage.hh b/include/ignition/transport/TopicStorage.hh deleted file mode 100644 index 43127b289..000000000 --- a/include/ignition/transport/TopicStorage.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/TopicUtils.hh b/include/ignition/transport/TopicUtils.hh deleted file mode 100644 index db966e89c..000000000 --- a/include/ignition/transport/TopicUtils.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/TransportTypes.hh b/include/ignition/transport/TransportTypes.hh deleted file mode 100644 index 65a8de6e9..000000000 --- a/include/ignition/transport/TransportTypes.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/Uuid.hh b/include/ignition/transport/Uuid.hh deleted file mode 100644 index 83b03a9eb..000000000 --- a/include/ignition/transport/Uuid.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/config.hh b/include/ignition/transport/config.hh deleted file mode 100644 index bb47abfbe..000000000 --- a/include/ignition/transport/config.hh +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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. - * - */ - -#ifndef IGNITION_TRANSPORT__CONFIG_HH_ -#define IGNITION_TRANSPORT__CONFIG_HH_ - -#include - -#define IGNITION_TRANSPORT_MAJOR_VERSION GZ_TRANSPORT_MAJOR_VERSION -#define IGNITION_TRANSPORT_MINOR_VERSION GZ_TRANSPORT_MINOR_VERSION -#define IGNITION_TRANSPORT_PATCH_VERSION GZ_TRANSPORT_PATCH_VERSION - -#define IGNITION_TRANSPORT_VERSION GZ_TRANSPORT_VERSION -#define IGNITION_TRANSPORT_VERSION_FULL GZ_TRANSPORT_VERSION_FULL - -#define IGNITION_TRANSPORT_VERSION_NAMESPACE GZ_TRANSPORT_VERSION_NAMESPACE - -#define IGNITION_TRANSPORT_VERSION_HEADER GZ_TRANSPORT_VERSION_HEADER - -namespace gz -{ -} - -namespace ignition -{ - #ifndef SUPPRESS_IGNITION_HEADER_DEPRECATION - #pragma message("ignition namespace is deprecated! Use gz instead!") - #endif - using namespace gz; -} - -#endif diff --git a/include/ignition/transport/detail/Export.hh b/include/ignition/transport/detail/Export.hh deleted file mode 100644 index 5a865938c..000000000 --- a/include/ignition/transport/detail/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/detail/Node.hh b/include/ignition/transport/detail/Node.hh deleted file mode 100644 index de30bb6dd..000000000 --- a/include/ignition/transport/detail/Node.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/include/ignition/transport/log.hh b/include/ignition/transport/log.hh deleted file mode 100644 index be65cf6c4..000000000 --- a/include/ignition/transport/log.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/CMakeLists.txt b/log/include/CMakeLists.txt index 992a1312e..a35a0475e 100644 --- a/log/include/CMakeLists.txt +++ b/log/include/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(gz) -install(DIRECTORY ignition DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}) diff --git a/log/include/ignition/transport/log/Batch.hh b/log/include/ignition/transport/log/Batch.hh deleted file mode 100644 index 168460c7f..000000000 --- a/log/include/ignition/transport/log/Batch.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/Descriptor.hh b/log/include/ignition/transport/log/Descriptor.hh deleted file mode 100644 index b3dcbec99..000000000 --- a/log/include/ignition/transport/log/Descriptor.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/Export.hh b/log/include/ignition/transport/log/Export.hh deleted file mode 100644 index 52e8a8357..000000000 --- a/log/include/ignition/transport/log/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/Log.hh b/log/include/ignition/transport/log/Log.hh deleted file mode 100644 index a3d9f0b0d..000000000 --- a/log/include/ignition/transport/log/Log.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/Message.hh b/log/include/ignition/transport/log/Message.hh deleted file mode 100644 index 9fe6ffefb..000000000 --- a/log/include/ignition/transport/log/Message.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/MsgIter.hh b/log/include/ignition/transport/log/MsgIter.hh deleted file mode 100644 index a2fcc4014..000000000 --- a/log/include/ignition/transport/log/MsgIter.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/Playback.hh b/log/include/ignition/transport/log/Playback.hh deleted file mode 100644 index 6d3f325ee..000000000 --- a/log/include/ignition/transport/log/Playback.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/QualifiedTime.hh b/log/include/ignition/transport/log/QualifiedTime.hh deleted file mode 100644 index f5e7a6d44..000000000 --- a/log/include/ignition/transport/log/QualifiedTime.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/QueryOptions.hh b/log/include/ignition/transport/log/QueryOptions.hh deleted file mode 100644 index 5a3df80ae..000000000 --- a/log/include/ignition/transport/log/QueryOptions.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/Recorder.hh b/log/include/ignition/transport/log/Recorder.hh deleted file mode 100644 index 1ff5bf7af..000000000 --- a/log/include/ignition/transport/log/Recorder.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/SqlStatement.hh b/log/include/ignition/transport/log/SqlStatement.hh deleted file mode 100644 index 03a9795d3..000000000 --- a/log/include/ignition/transport/log/SqlStatement.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/detail/Export.hh b/log/include/ignition/transport/log/detail/Export.hh deleted file mode 100644 index 6bac0e118..000000000 --- a/log/include/ignition/transport/log/detail/Export.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/log/include/ignition/transport/log/detail/QueryOptions.hh b/log/include/ignition/transport/log/detail/QueryOptions.hh deleted file mode 100644 index b995c3d3c..000000000 --- a/log/include/ignition/transport/log/detail/QueryOptions.hh +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 -#include diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc deleted file mode 100644 index 00ba6dca7..000000000 --- a/test/integration/deprecated_TEST.cc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 - -#define SUPPRESS_IGNITION_HEADER_DEPRECATION - -#include -#include - -///////////////////////////////////////////////// -// Make sure the ignition namespace still works -TEST(Deprecated, IgnitionNamespace) -{ - ignition::transport::Clock clock; -} - -#undef SUPPRESS_IGNITION_HEADER_DEPRECATION