From d9c2b5931e50cd8a83a0dd86037b27438dbc5e93 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 23 Dec 2020 17:10:09 -0800 Subject: [PATCH 1/4] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=201.10.1=20?= =?UTF-8?q?=F0=9F=8F=81=20(#79)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c72da8b..55c8e464 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-launch1 VERSION 1.10.0) +project(ignition-launch1 VERSION 1.10.1) #============================================================================ # Find ignition-cmake diff --git a/Changelog.md b/Changelog.md index cc6a90d4..fd251113 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,13 @@ ## Ignition Launch 1.x -### Ignition Launch 1.X.X (20XX-XX-XX) +### Ignition Launch 1.10.1 (2020-12-23) + +1. Fix codecheck + * [Pull Request 67](https://github.com/ignitionrobotics/ign-launch/pull/67) + * [Pull Request 70](https://github.com/ignitionrobotics/ign-launch/pull/70) + +1. Fix race condition in websocket server + * [Pull Request 68](https://github.com/ignitionrobotics/ign-launch/pull/68) ### Ignition Launch 1.10.0 (2020-09-25) From 2269365e1236510901c8a4dd11aa2d03f50faba6 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Fri, 22 Jul 2022 21:37:00 -0700 Subject: [PATCH 2/4] Change IGN_DESIGNATION to GZ_DESIGNATION (#181) Signed-off-by: Nate Koenig Signed-off-by: Louise Poubel Co-authored-by: Nate Koenig Co-authored-by: Louise Poubel --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ee67061..79f44593 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-launch0 VERSION 0.2.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 REQUIRED) +find_package(ignition-cmake2 VERSION 2.13 REQUIRED) set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR}) #============================================================================ @@ -20,7 +20,7 @@ ign_configure_project() # Set project-specific options #============================================================================ -set(IGN_LAUNCH_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${IGN_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/") +set(IGN_LAUNCH_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins/") #============================================================================ # Search for project-specific dependencies From ef40fec61efd8947e81f395a348d31f328c8fcb0 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 25 Jul 2022 08:27:16 -0700 Subject: [PATCH 3/4] Remove mistaken VERSION (#182) Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79f44593..c6b6ed12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(ignition-launch0 VERSION 0.2.0) #============================================================================ # Find ignition-cmake #============================================================================ -find_package(ignition-cmake2 VERSION 2.13 REQUIRED) +find_package(ignition-cmake2 2.13 REQUIRED) set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR}) #============================================================================ From e8aff7bed5a94ee189522848fa807940d17bf579 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 27 Jul 2022 08:04:12 -0700 Subject: [PATCH 4/4] 0 to 1 GZ_DESIGNATION Signed-off-by: Nate Koenig --- api.md.in | 4 ++-- tutorials.md.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api.md.in b/api.md.in index d25ca916..31af8657 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ -## Ignition @IGN_DESIGNATION_CAP@ +## Ignition @GZ_DESIGNATION_CAP@ -Ignition @IGN_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries +Ignition @GZ_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries designed to rapidly develop robot and simulation applications. ## License diff --git a/tutorials.md.in b/tutorials.md.in index 0b62683d..3ed81a89 100644 --- a/tutorials.md.in +++ b/tutorials.md.in @@ -1,8 +1,8 @@ \page tutorials Tutorials -Welcome to the Ignition @IGN_DESIGNATION_CAP@ tutorials. These tutorials +Welcome to the Ignition @GZ_DESIGNATION_CAP@ tutorials. These tutorials will guide you through the process of understanding the capabilities of the -Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively. +Ignition @GZ_DESIGNATION_CAP@ library and how to use the library effectively. **Tutorials**