diff options
Diffstat (limited to 'snap')
-rw-r--r-- | snap/CMakeLists.txt | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/snap/CMakeLists.txt b/snap/CMakeLists.txt index 8ff9e7ad9..c8bbe0007 100644 --- a/snap/CMakeLists.txt +++ b/snap/CMakeLists.txt @@ -32,8 +32,8 @@ set(SNAP_NAME "remmina") set(SNAP_VERSION ${REMMINA_VERSION}) -if (NOT ${GIT_REVISION} STREQUAL ${REMMINA_VERSION_SUFFIX} AND - NOT ${GIT_REVISION} MATCHES "^v?[0-9].[0-9].[0-9](-rcgit.[0-9]*)?$") +if(NOT ${GIT_REVISION} STREQUAL ${REMMINA_VERSION_SUFFIX} AND + NOT ${GIT_REVISION} MATCHES "^v?[0-9].[0-9].[0-9](-rcgit.[0-9]*)?$") set(SNAP_VERSION ${SNAP_VERSION}+git${GIT_REVISION}) endif() @@ -45,15 +45,15 @@ file(MAKE_DIRECTORY ${SNAP_GUI_DIR}) file(RELATIVE_PATH CMAKE_SOURCE_DIR_RELATIVE ${SNAP_BUILD_DIR} ${CMAKE_SOURCE_DIR}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/snapcraft.yaml.in - ${SNAP_BUILD_DIR}/snapcraft.yaml @ONLY) + ${SNAP_BUILD_DIR}/snapcraft.yaml @ONLY) set(REMMINA_BINARY_PATH "remmina") set(REMMINA_ICON "\${SNAP}/meta/gui/icon.svg") configure_file(${CMAKE_SOURCE_DIR}/remmina/desktop/remmina.desktop.in - ${SNAP_GUI_DIR}/remmina.desktop @ONLY) + ${SNAP_GUI_DIR}/remmina.desktop @ONLY) configure_file(${CMAKE_SOURCE_DIR}/LICENSE - ${SNAP_SETUP_DIR}/license.txt COPYONLY) + ${SNAP_SETUP_DIR}/license.txt COPYONLY) add_custom_target("snap-prime" COMMAND ${SNAPCRAFT} prime @@ -61,7 +61,7 @@ add_custom_target("snap-prime" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" COMMENT "Priming snap package ${SNAP_VERSION}" VERBATIM -) + ) add_custom_target("snap" COMMAND ${SNAPCRAFT} @@ -69,26 +69,26 @@ add_custom_target("snap" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" COMMENT "Create snap package ${SNAP_VERSION}" VERBATIM -) + ) foreach(channel stable candidate beta edge) - add_custom_target("snap-push-${channel}" - COMMAND bash -c "${SNAPCRAFT} push --release ${channel} *.snap" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" - COMMENT "Create snap package ${SNAP_VERSION}" - VERBATIM - ) - add_dependencies("snap-push-${channel}" "snap") -endforeach(channel) + add_custom_target("snap-push-${channel}" + COMMAND bash -c "${SNAPCRAFT} push --release ${channel} *.snap" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" + COMMENT "Create snap package ${SNAP_VERSION}" + VERBATIM + ) + add_dependencies("snap-push-${channel}" "snap") +endforeach() add_custom_target("snap-push-transfer.sh" - COMMAND bash -c "snap=$(ls *.snap -1 | head -n1); \ - curl --upload-file $snap \ - https://transfer.sh/$(basename $snap)" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" - COMMENT "Create snap package ${SNAP_VERSION}" - VERBATIM - ) + COMMAND bash -c "snap=$(ls *.snap -1 | head -n1); \ + curl --upload-file $snap \ + https://transfer.sh/$(basename $snap)" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" + COMMENT "Create snap package ${SNAP_VERSION}" + VERBATIM + ) add_dependencies("snap-push-transfer.sh" "snap") |