diff --git a/CMake/ScmRevGen.cmake b/CMake/ScmRevGen.cmake index 12ee7727b2..a4d438c081 100644 --- a/CMake/ScmRevGen.cmake +++ b/CMake/ScmRevGen.cmake @@ -30,6 +30,8 @@ if(GIT_FOUND) ERROR_QUIET) endif() +string(TIMESTAMP DOLPHIN_WC_BUILD_DATE "%Y-%m-%d" UTC) + # version number set(DOLPHIN_VERSION_MAJOR "2409") set(DOLPHIN_VERSION_MINOR "0") @@ -68,3 +70,7 @@ if(APPLE) configure_source_file("Source/Core/DolphinQt/Info.plist") configure_source_file("Source/Core/MacUpdater/Info.plist") endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + configure_source_file("Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml") +endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 636d5473e3..ed91a677a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -794,6 +794,13 @@ if(APPLE) endif() endif() +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Flatpak) + if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml) + file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml) + endif() +endif() + find_package(Git) if(NOT GIT_FOUND) set(GIT_EXECUTABLE "") @@ -801,7 +808,7 @@ endif() add_custom_target( dolphin_scmrev ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake - BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" + BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml" VERBATIM ) diff --git a/Flatpak/fill_release_node.sh b/Flatpak/fill_release_node.sh deleted file mode 100755 index 43597fa920..0000000000 --- a/Flatpak/fill_release_node.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -DATE=$(git log -1 --pretty=%cd --date=iso8601 --date=format:'%Y-%m-%d') -sed -i -e "s/@DATE_PLACEHOLDER/${DATE}/" org.DolphinEmu.dolphin-emu.metainfo.xml -VERSION=$(git describe --tags | sed -E 's/^([0-9]+-[0-9]+).*/\1/') -sed -i -e "s/@VERSION_PLACEHOLDER/${VERSION}/" org.DolphinEmu.dolphin-emu.metainfo.xml - - diff --git a/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml.in b/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml.in index e4e8c891a3..cd00055a12 100644 --- a/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml.in +++ b/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml.in @@ -36,7 +36,7 @@ dolphin-emu.desktop - + https://dolphin-emu.org https://bugs.dolphin-emu.org/projects/emulator/issues diff --git a/Flatpak/org.DolphinEmu.dolphin-emu.yml b/Flatpak/org.DolphinEmu.dolphin-emu.yml index 596e2552e1..5144b676d0 100644 --- a/Flatpak/org.DolphinEmu.dolphin-emu.yml +++ b/Flatpak/org.DolphinEmu.dolphin-emu.yml @@ -63,8 +63,7 @@ modules: - /share/man post-install: - install -D -t ${FLATPAK_DEST}/bin/ dolphin-emu-wrapper - - "${FLATPAK_BUILDER_BUILDDIR}/Flatpak/fill_release_node.sh" - - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ org.DolphinEmu.dolphin-emu.metainfo.xml + - install -Dm644 -t ${FLATPAK_DEST}/share/metainfo/ ${FLATPAK_BUILDER_BUILDDIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml - desktop-file-edit --set-key=Exec --set-value='/app/bin/dolphin-emu-wrapper' /app/share/applications/dolphin-emu.desktop sources: