Merge pull request #115 from gazebosim/2-to-main-20221116

2 to main 20221116

CMakeLists.txt

@@ -41,6 +41,8 @@ if (NOT USE_SYSTEM_BACKWARDCPP)
 endif()
 find_package(Backward)
 
+add_subdirectory(etc)
+
 #============================================================================
 # Configure the build
 #============================================================================

Changelog.md

@@ -4,12 +4,71 @@
 
 ### Gazebo Tools 2.X.X (20XX-XX-XX)
 
-### Gazebo Tools 2.0.0 (20XX-XX-XX)
+### Gazebo Tools 2.0.0 (2022-09-22)
+
+1. Remove ign CLI from version 2
+ * [Pull request #109](https://github.com/gazebosim/gz-tools/pull/109)
+
+1. Finale: CMake var followups, docs, and paths
+ * [Pull request #99](https://github.com/gazebosim/gz-tools/pull/99)
+
+1. ign -> gz Partial Docs Migration and Project Name Followups : gz-tools
+ * [Pull request #98](https://github.com/gazebosim/gz-tools/pull/98)
+
+1. Rename CMake project to gz
+ * [Pull request #93](https://github.com/gazebosim/gz-tools/pull/93)
+
+1. Use gz-cmake
+ * [Pull request #96](https://github.com/gazebosim/gz-tools/pull/96)
+
+1. ign -> gz CLI Migration : gz-tools
+ * [Pull request #94](https://github.com/gazebosim/gz-tools/pull/94)
+
+1. Standardize config macros
+ * [Pull request #90](https://github.com/gazebosim/gz-tools/pull/90)
+
+1. Migrate ignition:: to gz::
+ * [Pull request #89](https://github.com/gazebosim/gz-tools/pull/89)
+
+1. Remove Bionic from future releases (Garden+)
+ * [Pull request #78](https://github.com/gazebosim/gz-tools/pull/78)
+
+1. Update codeowners
+ * [Pull request #27](https://github.com/gazebosim/gz-tools/pull/27)
+
+1. [master] Workflow updates
+ * [Pull request #18](https://github.com/gazebosim/gz-tools/pull/18)
 
 ## Gazebo Tools 1.x
 
 ### Gazebo Tools 1.X.X (20XX-XX-XX)
 
+### Gazebo Tools 1.5.0 (2022-08-12)
+
+1. Bash completion for subcommand names and flags
+ * [Pull request #77](https://github.com/gazebosim/gz-tools/pull/77)
+ * [Pull request #86](https://github.com/gazebosim/gz-tools/pull/86)
+ * [Pull request #87](https://github.com/gazebosim/gz-tools/pull/87)
+ * [Pull request #104](https://github.com/gazebosim/gz-tools/pull/104)
+ * [Pull request #106](https://github.com/gazebosim/gz-tools/pull/106)
+
+1. Infrastructure & CI
+ * [Pull request #100](https://github.com/gazebosim/gz-tools/pull/100)
+ * [Pull request #80](https://github.com/gazebosim/gz-tools/pull/80)
+ * [Pull request #75](https://github.com/gazebosim/gz-tools/pull/75)
+
+1. Remove unused config.hh.in
+ * [Pull request #91](https://github.com/gazebosim/gz-tools/pull/91)
+
+1. Bump CMake to 2.8.12
+ * [Pull request #85](https://github.com/gazebosim/gz-tools/pull/85)
+
+1. Fix `.dll` installation directory on Windows
+ * [Pull request #74](https://github.com/gazebosim/gz-tools/pull/74)
+
+1. Permit to invoke `ign` command in Windows
+ * [Pull request #73](https://github.com/gazebosim/gz-tools/pull/73)
+
 ### Gazebo Tools 1.4.1 (2021-10-27)
 
 1. Fix Windows colcon build

Migration.md

@@ -9,7 +9,7 @@ release will remove the deprecated code.
 
 * This package now depends on gz-cmake
 * The environment variable `IGN_CONFIG_PATH` is deprecated. Use `GZ_CONFIG_PATH` instead.
-* The `ign` command line executable is deprecated. Use `gz` instead.
+* The `ign` command line executable is removed. Use `gz` instead.
 
 * The project name has been changed to use the `gz-` prefix, you **must** use the `gz` prefix!
  * This also means that any generated code that use the project name (e.g. CMake variables, in-source macros) would have to be migrated.

etc/CMakeLists.txt

@@ -14,5 +14,6 @@ configure_file(
  "${CMAKE_CURRENT_BINARY_DIR}/gz${PROJECT_MAJOR_VERSION}.bash_completion.sh" @ONLY)
 install(FILES
  ${CMAKE_CURRENT_BINARY_DIR}/gz${PROJECT_MAJOR_VERSION}.bash_completion.sh
+ RENAME gz
  DESTINATION
- ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/gz/gz${PROJECT_MAJOR_VERSION}.completion.d)
+ ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions)

etc/gz.bash_completion.sh

@@ -43,7 +43,7 @@ function _gz
 
  # Subcommand is help
  if [[ "$cmd" == "help" ]]; then
- opts=$(gz --commands)
+ opts=$(gz --commands) || opts=""
 
  # Subcommand is a library name or an option (-*)
  else
@@ -62,9 +62,13 @@ function _gz
 
  # on first word, top-level command (gz)
  else
- opts="$(gz --commands) help"
+ commands=$(gz --commands) || commands=""
+ opts="${commands} help"
  fi
 
  COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
 }
+
+source @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/gz/gz@[email protected]
+
 complete -F "_gz" "gz"

etc/gz.completion

@@ -25,5 +25,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 # version numbers, which means functions from newer versions will overwrite
 # those from older versions.
 for f in $SCRIPT_DIR/gz*.completion.d/*.bash_completion.sh ; do
+ [[ -e "$f" ]] || continue
  source $f
 done

src/CMakeLists.txt

@@ -64,18 +64,10 @@ if(WIN32)
  # On Windows also install the gz.bat wrapper script to permit to
  # invoke gz via Command Prompt or Powershell
  install(PROGRAMS gz.bat DESTINATION ${GZ_BIN_INSTALL_DIR})
-
- # TODO(chapulina) tick-tock ign on Windows if someone actually needs it. It's
- # complicated to symlink / copy files on Windows.
-else()
- # TODO(CH3): Deprecated. Tick-tock the ign executable with symlink
- # This is exceptionally scuffed
- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
- ${CMAKE_INSTALL_PREFIX}/${GZ_BIN_INSTALL_DIR}/gz
- ${PROJECT_BINARY_DIR}/ign)")
- install(PROGRAMS ${PROJECT_BINARY_DIR}/ign DESTINATION ${GZ_BIN_INSTALL_DIR})
 endif()
 
+# Note: The `ign` CLI isn't installed on purpose so that v3 is co-installable with v2
+
 #===============================================================================
 # BEGIN TEST gz command
 # Generate the ruby script for internal testing.