Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ign -> gz Provisional Finale: Source Migration : gz-tools #99

Merged
merged 1 commit into from
Jul 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
libignition-cmake3-dev
libgz-cmake3-dev
rubocop
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v2
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@focal
uses: gazebo-tooling/action-gz-ci@focal
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
Expand All @@ -20,4 +20,4 @@ jobs:
uses: actions/checkout@v2
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@jammy
uses: gazebo-tooling/action-gz-ci@jammy
2 changes: 1 addition & 1 deletion .github/workflows/pr-collection-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
steps:
- name: Add collection labels
if: github.event.action == 'opened'
uses: ignition-tooling/pr-collection-labeler@v1
uses: gazebo-tooling/pr-collection-labeler@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion cmake/run_test.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This script is part of the unit test mechanism for ign-tools.
# This script is part of the unit test mechanism for gz-tools.
execute_process(COMMAND ruby ${GZ_SCRIPT}
${TEST_NAME}
OUTPUT_VARIABLE TEST_OUTPUT
Expand Down
12 changes: 6 additions & 6 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ endif()
install (TARGETS backward
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
RUNTIME DESTINATION ${IGN_BIN_INSTALL_DIR})
RUNTIME DESTINATION ${GZ_BIN_INSTALL_DIR})

#===============================================================================
# Used for the installed version.
Expand All @@ -53,27 +53,27 @@ set(gz_script_generated ${PROJECT_BINARY_DIR}/$<CONFIG>/${executable_name})

configure_file(gz.in ${gz_script_configured})
file(GENERATE OUTPUT ${gz_script_generated} INPUT ${gz_script_configured})
install (PROGRAMS ${gz_script_generated} DESTINATION ${IGN_BIN_INSTALL_DIR})
install (PROGRAMS ${gz_script_generated} DESTINATION ${GZ_BIN_INSTALL_DIR})

if(WIN32)
# On Windows also install the executable as gz
# to permit to invoke gz via Git Bash
# see https://github.com/gazebosim/gz-tools/issues/70
install(PROGRAMS ${gz_script_generated} DESTINATION ${IGN_BIN_INSTALL_DIR} RENAME gz)
install(PROGRAMS ${gz_script_generated} DESTINATION ${GZ_BIN_INSTALL_DIR} RENAME gz)

# On Windows also install the gz.bat wrapper script to permit to
# invoke gz via Command Prompt or Powershell
install(PROGRAMS gz.bat DESTINATION ${IGN_BIN_INSTALL_DIR})
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}/${IGN_BIN_INSTALL_DIR}/gz
${CMAKE_INSTALL_PREFIX}/${GZ_BIN_INSTALL_DIR}/gz
${PROJECT_BINARY_DIR}/ign)")
install(PROGRAMS ${PROJECT_BINARY_DIR}/ign DESTINATION ${IGN_BIN_INSTALL_DIR})
install(PROGRAMS ${PROJECT_BINARY_DIR}/ign DESTINATION ${GZ_BIN_INSTALL_DIR})
endif()

#===============================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/gz.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ required_tags =
commands = {}
yaml_found = false

conf_dirs = '@CMAKE_INSTALL_PREFIX@/share/ignition/'
conf_dirs = '@CMAKE_INSTALL_PREFIX@/share/gz/'
conf_dirs = ENV['GZ_CONFIG_PATH'] if ENV.key?('GZ_CONFIG_PATH')

conf_dirs = conf_dirs.split('@ENV_PATH_DELIMITER@')
Expand Down
4 changes: 2 additions & 2 deletions tutorials.md.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
\page tutorials Tutorials

Welcome to the Gazebo @IGN_DESIGNATION_CAP@ tutorials. These tutorials
Welcome to the Gazebo @GZ_DESIGNATION_CAP@ tutorials. These tutorials
will guide you through the process of understanding the capabilities of the
Gazebo @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively.

**The tutorials**

Expand Down
2 changes: 1 addition & 1 deletion tutorials/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ First, follow the [gz-cmake](https://github.com/gazebosim/gz-cmake) tutorial for
```
conda search libgz-tools* --channel conda-forge --info
```
See the [Conda release repository](https://github.com/conda-forge/libgz-tools4-feedstock) for more information.
See the [Conda release repository](https://github.com/conda-forge/libignition-tools4-feedstock) for more information.

Install dependencies, replacing `<#>` with the desired version:
```
Expand Down