From 245f9f1f9c475a24b02271e0b1a7a150f601f80d Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Thu, 6 Apr 2023 20:06:22 +0200 Subject: [PATCH] generate release information for metainfo file from git tag --- CMakeLists.txt | 7 +++- cmake/Git.cmake | 10 +++++ deploy/org.mavlink.qgroundcontrol.metainfo.xml | 46 --------------------- deploy/org.mavlink.qgroundcontrol.metainfo.xml.in | 50 +++++++++++++++++++++++ 4 files changed, 66 insertions(+), 47 deletions(-) delete mode 100644 deploy/org.mavlink.qgroundcontrol.metainfo.xml create mode 100644 deploy/org.mavlink.qgroundcontrol.metainfo.xml.in diff --git a/CMakeLists.txt b/CMakeLists.txt index c6c99a7..5754ffb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,8 +224,13 @@ install( DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/ RENAME org.mavlink.qgroundcontrol.png ) +configure_file( + ${CMAKE_SOURCE_DIR}/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in + ${CMAKE_BINARY_DIR}/metainfo/org.mavlink.qgroundcontrol.metainfo.xml + @ONLY +) install( - FILES ${CMAKE_SOURCE_DIR}/deploy/org.mavlink.qgroundcontrol.metainfo.xml + FILES ${CMAKE_BINARY_DIR}/metainfo/org.mavlink.qgroundcontrol.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo/ ) diff --git a/cmake/Git.cmake b/cmake/Git.cmake index c26b1da..df899be 100644 --- a/cmake/Git.cmake +++ b/cmake/Git.cmake @@ -23,3 +23,13 @@ execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE APP_VERSION_STR OUTPUT_STRIP_TRAILING_WHITESPACE) + +execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE REL_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + +execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%aI ${REL_VERSION} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE REL_DATE + OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/deploy/org.mavlink.qgroundcontrol.metainfo.xml b/deploy/org.mavlink.qgroundcontrol.metainfo.xml deleted file mode 100644 index 54fbf69..0000000 --- a/deploy/org.mavlink.qgroundcontrol.metainfo.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - org.mavlink.qgroundcontrol - - QGroundControl - UAS ground control station - Dronecode Project, Inc. - - CC0-1.0 - GPL-3.0 AND Apache-2.0 - - - pointing - keyboard - touch - gamepad - - - -

- Intuitive and Powerful Ground Control Station for the MAVLink protocol. -

-
- - - - org.mavlink.qgroundcontrol.desktop - - - https://docs.qgroundcontrol.com/assets/quickstart/ConnectedVehicle.jpg - - - - http://qgroundcontrol.com/ - https://docs.qgroundcontrol.com/master/en/index.html - https://github.com/mavlink/qgroundcontrol/issues - - - Utility - Maps - - - - QGroundControl - -
diff --git a/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in b/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in new file mode 100644 index 0000000..bba2d1c --- /dev/null +++ b/deploy/org.mavlink.qgroundcontrol.metainfo.xml.in @@ -0,0 +1,50 @@ + + + org.mavlink.qgroundcontrol + + QGroundControl + UAS ground control station + Dronecode Project, Inc. + + CC0-1.0 + GPL-3.0 AND Apache-2.0 + + + pointing + keyboard + touch + gamepad + + + +

+ Intuitive and Powerful Ground Control Station for the MAVLink protocol. +

+
+ + + + + + + + org.mavlink.qgroundcontrol.desktop + + + https://docs.qgroundcontrol.com/assets/quickstart/ConnectedVehicle.jpg + + + + http://qgroundcontrol.com/ + https://docs.qgroundcontrol.com/master/en/index.html + https://github.com/mavlink/qgroundcontrol/issues + + + Utility + Maps + + + + QGroundControl + +