diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index c19a84e6ca..42e0a54ba4 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -35,7 +35,7 @@ include(cmake/td_mtproto.cmake) include(cmake/td_scheme.cmake) include(cmake/td_tde2e.cmake) include(cmake/td_ui.cmake) -include(cmake/generate_appdata_changelog.cmake) +include(cmake/generate_appstream_changelog.cmake) if (DESKTOP_APP_TEST_APPS) include(cmake/tests.cmake) @@ -2132,7 +2132,7 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED) include(GNUInstallDirs) configure_file("../lib/xdg/org.telegram.desktop.service" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" @ONLY) configure_file("../lib/xdg/org.telegram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" @ONLY) - generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml") + generate_appstream_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml") install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "org.telegram.desktop.png") install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "org.telegram.desktop.png") diff --git a/Telegram/build/changelog2appdata.py b/Telegram/build/changelog2appstream.py similarity index 86% rename from Telegram/build/changelog2appdata.py rename to Telegram/build/changelog2appstream.py index bbcd950329..9879db9807 100755 --- a/Telegram/build/changelog2appdata.py +++ b/Telegram/build/changelog2appstream.py @@ -52,24 +52,24 @@ def get_changelog_xml(changelog, max_items=None): releases.append(release) return releases -def update_appdata(appdata_path, changelog, max_items=None): - appdata = ET.parse(appdata_path) - root = appdata.getroot() +def update_metadata(metadata_path, changelog, max_items=None): + metadata = ET.parse(metadata_path) + root = metadata.getroot() releases = root.find("releases") if releases is not None: root.remove(releases) root.append( get_changelog_xml(changelog, max_items) ) - appdata.write(appdata_path, encoding="utf-8", xml_declaration=True) + metadata.write(metadata_path, encoding="utf-8", xml_declaration=True) def main(): ap = argparse.ArgumentParser("Parse Telegram changelog") ap.add_argument("-c", "--changelog-path", default="changelog.txt") - ap.add_argument("-a", "--appdata-path", default="lib/xdg/org.telegram.desktop.metainfo.xml") + ap.add_argument("-m", "--metadata-path", default="lib/xdg/org.telegram.desktop.metainfo.xml") ap.add_argument("-n", "--num-releases", type=int, default=None) args = ap.parse_args() - update_appdata(args.appdata_path, + update_metadata(args.metadata_path, parse_changelog(args.changelog_path), max_items=args.num_releases) diff --git a/Telegram/cmake/generate_appdata_changelog.cmake b/Telegram/cmake/generate_appstream_changelog.cmake similarity index 54% rename from Telegram/cmake/generate_appdata_changelog.cmake rename to Telegram/cmake/generate_appstream_changelog.cmake index 2d1ac0bbcd..fe0694e647 100644 --- a/Telegram/cmake/generate_appdata_changelog.cmake +++ b/Telegram/cmake/generate_appstream_changelog.cmake @@ -4,31 +4,31 @@ # For license and copyright information please follow this link: # https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL -function(generate_appdata_changelog target_name changelog_path appdata_path) +function(generate_appstream_changelog target_name changelog_path metadata_path) find_package(Python3 REQUIRED) set(gen_dst ${CMAKE_CURRENT_BINARY_DIR}/gen) file(MAKE_DIRECTORY ${gen_dst}) - set(gen_timestamp ${gen_dst}/${target_name}_appdata_changelog.timestamp) - set(gen_files ${appdata_path}) + set(gen_timestamp ${gen_dst}/${target_name}_appstream_changelog.timestamp) + set(gen_files ${metadata_path}) add_custom_command( OUTPUT ${gen_timestamp} COMMAND ${Python3_EXECUTABLE} - ${submodules_loc}/build/changelog2appdata.py + ${submodules_loc}/build/changelog2appstream.py -c "${changelog_path}" - -a "${appdata_path}" + -m "${metadata_path}" -n 10 COMMAND echo 1> ${gen_timestamp} - COMMENT "Generating AppData changelog (${target_name})" + COMMENT "Generating AppStream changelog (${target_name})" DEPENDS - ${submodules_loc}/build/changelog2appdata.py + ${submodules_loc}/build/changelog2appstream.py ${changelog_path} - ${appdata_path} + ${metadata_path} ) - generate_target(${target_name} appdata_changelog ${gen_timestamp} "${gen_files}" ${gen_dst}) + generate_target(${target_name} appstream_changelog ${gen_timestamp} "${gen_files}" ${gen_dst}) endfunction()