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.

Sign up for GitHub

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

Add desktop entry and svg logo #1411

Merged
merged 6 commits into from
Apr 6, 2022
Merged

Add desktop entry and svg logo #1411

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13b1ede
Add desktop entry and svg logo
j-rivero Mar 24, 2022
616d28a
Prepare 3.13.0~pre1
j-rivero Mar 25, 2022
5723a33
Use --force-version in desktop launcher to support multiple versions
j-rivero Mar 31, 2022
7e8d017
Produce versioned desktop file
j-rivero Mar 31, 2022
d552717
Update tools/desktop/ignition-gazebo.desktop.in
j-rivero Apr 4, 2022
f89544a
Revert version change for this branch
j-rivero Apr 4, 2022
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
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(ignition-gazebo3 VERSION 3.12.0)
project(ignition-gazebo3 VERSION 3.13.0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@j-rivero , I think it's cleaner if we do this in a separate PR and update the changelog as usual. It makes it easier to track the releases and then announce them, and also gives visibility to the team. How about:

  1. Reverting the version changes in this PR and merge it
  2. Opening a new PR for the stable release, with a changelog update including all the recent changes: ignition-gazebo3_3.12.0...ign-gazebo3
  3. Making a stable release


#============================================================================
# Find ignition-cmake
Expand All @@ -14,7 +14,7 @@ find_package(ignition-cmake2 2.8.0 REQUIRED)
#============================================================================
# Configure the project
#============================================================================
ign_configure_project(VERSION_SUFFIX)
ign_configure_project(VERSION_SUFFIX pre3)

#============================================================================
# Set project-specific options
Expand Down Expand Up @@ -172,6 +172,7 @@ ign_create_packages()
#============================================================================
configure_file(${CMAKE_SOURCE_DIR}/api.md.in ${CMAKE_BINARY_DIR}/api.md)
configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials.md)
configure_file(${CMAKE_SOURCE_DIR}/tools/desktop/ignition-gazebo.desktop.in ${CMAKE_BINARY_DIR}/ignition-gazebo${PROJECT_VERSION_MAJOR}.desktop)

# disable doxygen on macOS due to issues with doxygen 1.9.0
# there is an unreleased fix; revert this when 1.9.1 is released
Expand Down
9 changes: 9 additions & 0 deletions tools/desktop/ignition-gazebo.desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=Igniton Gazebo @PROJECT_VERSION_MAJOR@
Comment=3D Robot Simulator
Exec=/usr/bin/ign gazebo --force-version @PROJECT_VERSION_MAJOR@
Icon=ignition-gazebo
Categories=Education;Science;Robotics;Development;
StartupNotify=true
95 changes: 95 additions & 0 deletions tools/desktop/ignition-gazebo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.