diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | scripts/travis-build.sh | 16 | ||||
| -rw-r--r-- | snap/.snapcraft/travis_snapcraft.cfg | bin | 2448 -> 0 bytes | |||
| -rw-r--r-- | snap/CMakeLists.txt | 39 | ||||
| -rw-r--r-- | snap/SNAP_VERSION.in | 1 | ||||
| -rw-r--r-- | snap/snapcraft.yaml (renamed from snap/snapcraft.yaml.in) | 26 |
8 files changed, 54 insertions, 51 deletions
diff --git a/.gitignore b/.gitignore index 6d762396a..5a8e4bf3f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,10 +55,11 @@ remmina/remmina remmina/src/remmina *.snap -snapcraft.yaml parts prime stage -snap/snap +snap/SNAP_VERSION +snap/.snapcraft .flatpak-builder/ + diff --git a/.travis.yml b/.travis.yml index 3000ed92e..54ca45b2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,11 +47,7 @@ env: - DEB_BUILD_OPTIONS='-DCMAKE_BUILD_TYPE=Debug -DWITH_SSE2=ON -DWITH_APPINDICATOR=OFF' - DOCKER_IMAGE=ubuntu:xenial - SNAP_PRIME_ON_PULL_REQUEST=true - - SNAP_TRANSFER_SH_UPLOAD_ON_PULL_REQUEST=true - - SNAP_UNSTABLE_CHANNEL=edge - - SNAP_RELEASE_CHANNEL=candidate - - SNAPCRAFT_CONFIG_KEY=$encrypted_fe91ff0c7eee_key - - SNAPCRAFT_CONFIG_IV=$encrypted_fe91ff0c7eee_iv + - SNAP_TRANSFER_SH_UPLOAD=true matrix: # - BUILD_TYPE=deb - BUILD_TYPE=snap @@ -78,14 +74,6 @@ deploy: condition: $BUILD_TYPE = snap branch: next - - provider: script - skip_cleanup: true - script: scripts/travis-build.sh deploy-release - on: - condition: $BUILD_TYPE = snap - branch: next - tags: true - notifications: email: - antenore@simbiosi.org diff --git a/CMakeLists.txt b/CMakeLists.txt index 153f9ad99..db198f286 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,7 +162,9 @@ if(NOT REMMINA_EXTERNAL_TOOLS_DIR) endif() # Snap package generation support -if(NOT DEFINED ENV{SNAPCRAFT_PROJECT_NAME}) +if(DEFINED ENV{SNAPCRAFT_PROJECT_NAME}) + add_subdirectory(snap) +else() find_program(SNAPCRAFT "snapcraft") if(SNAPCRAFT) add_subdirectory(snap) diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 6203eea89..2c66240a8 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -1,6 +1,6 @@ #!/bin/bash # Remmina - The GTK+ Remote Desktop Client -# Copyright (C) 2014-2017 Marco Trevisan +# Copyright (C) 2017-2018 Marco Trevisan # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -77,6 +77,9 @@ elif [ "$BUILD_TYPE" == "snap" ]; then elif [ "$TRAVIS_BUILD_STEP" == "install" ]; then docker_exec apt-get update -q docker_exec apt-get install -y cmake git-core snapcraft + if [ "$SNAP_TRANSFER_SH_UPLOAD" == "true" ]; then + docker_exec apt-get install -y curl + fi elif [ "$TRAVIS_BUILD_STEP" == "script" ]; then git clean -f cmake_buld_type="Release" @@ -106,15 +109,14 @@ elif [ "$BUILD_TYPE" == "snap" ]; then fi set -x - if [ "$TRAVIS_PULL_REQUEST" != "false" ] && - [ "$SNAP_TRANSFER_SH_UPLOAD_ON_PULL_REQUEST" == "true" ]; then - docker_exec apt-get install -y curl + elif [ "$TRAVIS_BUILD_STEP" == "deploy-unstable" ]; then + if [ "$SNAP_TRANSFER_SH_UPLOAD" == "true" ]; then docker_exec make snap-push-transfer.sh -C $BUILD_FOLDER fi - elif [ "$TRAVIS_BUILD_STEP" == "deploy-unstable" ]; then - docker_exec make snap-push-$SNAP_UNSTABLE_CHANNEL -C $BUILD_FOLDER elif [ "$TRAVIS_BUILD_STEP" == "deploy-release" ]; then - docker_exec make snap-push-$SNAP_RELEASE_CHANNEL -C $BUILD_FOLDER + if [ "$SNAP_TRANSFER_SH_UPLOAD" == "true" ]; then + docker_exec make snap-push-transfer.sh -C $BUILD_FOLDER + fi fi else echo 'No $BUILD_TYPE defined' diff --git a/snap/.snapcraft/travis_snapcraft.cfg b/snap/.snapcraft/travis_snapcraft.cfg Binary files differdeleted file mode 100644 index 7af0cd282..000000000 --- a/snap/.snapcraft/travis_snapcraft.cfg +++ /dev/null diff --git a/snap/CMakeLists.txt b/snap/CMakeLists.txt index e75148f70..fb0f41cb9 100644 --- a/snap/CMakeLists.txt +++ b/snap/CMakeLists.txt @@ -1,6 +1,6 @@ # Remmina - The GTK+ Remote Desktop Client # -# Copyright (C) 2017 Marco Trevisan +# Copyright (C) 2017-2018 Marco Trevisan # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,16 +37,15 @@ if(NOT ${GIT_REVISION} STREQUAL ${REMMINA_VERSION_SUFFIX} AND set(SNAP_VERSION ${SNAP_VERSION}+git${GIT_REVISION}) endif() -set(SNAP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}) -set(SNAP_SETUP_DIR ${SNAP_BUILD_DIR}/snap) -set(SNAP_GUI_DIR ${SNAP_SETUP_DIR}/gui) +set(SNAP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(SNAP_GUI_DIR ${SNAP_DIR}/gui) file(MAKE_DIRECTORY ${SNAP_GUI_DIR}) -file(RELATIVE_PATH CMAKE_SOURCE_DIR_RELATIVE ${SNAP_BUILD_DIR} +file(RELATIVE_PATH CMAKE_SOURCE_DIR_RELATIVE ${SNAP_DIR} ${CMAKE_SOURCE_DIR}) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/snapcraft.yaml.in - ${SNAP_BUILD_DIR}/snapcraft.yaml @ONLY) +configure_file(${SNAP_DIR}/SNAP_VERSION.in + ${SNAP_DIR}/SNAP_VERSION @ONLY) set(REMMINA_BINARY_PATH "remmina") set(REMMINA_ICON "\${SNAP}/meta/gui/icon.svg") @@ -54,29 +53,35 @@ configure_file(${CMAKE_SOURCE_DIR}/remmina/desktop/remmina.desktop.in ${SNAP_GUI_DIR}/${UNIQUE_APPNAME}.desktop @ONLY) configure_file(${CMAKE_SOURCE_DIR}/LICENSE - ${SNAP_SETUP_DIR}/license.txt COPYONLY) + ${SNAP_GUI_DIR}/license.txt COPYONLY) + +add_custom_target("snap-version-script" ALL + DEPENDS "${SNAP_DIR}/SNAP_VERSION" + COMMENT "Preparing snap version file ${SNAP_VERSION}" + VERBATIM + ) add_custom_target("snap-prime" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" COMMAND ${SNAPCRAFT} prime - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" + DEPENDS "${SNAP_DIR}/SNAP_VERSION" COMMENT "Priming snap package ${SNAP_VERSION}" VERBATIM ) add_custom_target("snap" COMMAND ${SNAPCRAFT} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + DEPENDS "${SNAP_DIR}/SNAP_VERSION" COMMENT "Create snap package ${SNAP_VERSION}" VERBATIM ) foreach(channel stable candidate beta edge) add_custom_target("snap-push-${channel}" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" COMMAND bash -c "${SNAPCRAFT} push --release ${channel} *.snap" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/snapcraft.yaml" + DEPENDS "${SNAP_DIR}/SNAP_VERSION" COMMENT "Create snap package ${SNAP_VERSION}" VERBATIM ) @@ -84,12 +89,12 @@ foreach(channel stable candidate beta edge) endforeach() add_custom_target("snap-push-transfer.sh" + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" 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}" + DEPENDS "${SNAP_DIR}/SNAP_VERSION" + COMMENT "Uploading snap package to transfer.sh ${SNAP_VERSION}" VERBATIM ) add_dependencies("snap-push-transfer.sh" "snap") diff --git a/snap/SNAP_VERSION.in b/snap/SNAP_VERSION.in new file mode 100644 index 000000000..9e5410a72 --- /dev/null +++ b/snap/SNAP_VERSION.in @@ -0,0 +1 @@ +@SNAP_VERSION@ diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml index 989d7fe87..a6630b25d 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml @@ -1,7 +1,9 @@ -name: @SNAP_NAME@ -version: @SNAP_VERSION@ +name: remmina +version: git +version-script: cat parts/remmina/src/snap/SNAP_VERSION +# license: GPL-2.0-only summary: The GTK+ Remote Desktop Client -icon: @CMAKE_SOURCE_DIR_RELATIVE@/remmina/desktop/scalable/apps/remmina.svg +icon: remmina/desktop/scalable/apps/remmina.svg description: | Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote @@ -44,7 +46,7 @@ parts: - libxtst-dev - libxv-dev configflags: - - -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ + - -DCMAKE_BUILD_TYPE=Release - -DWITH_WAYLAND=on - -DWITH_CLIENT=off - -DWITH_SERVER=off @@ -60,7 +62,7 @@ parts: # XXX: This is an hack to have a kind of bind-mount with absolute prefix. - -DCMAKE_INSTALL_PREFIX=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr organize: - snap/@SNAP_NAME@/current: . + snap/remmina/current: . prime: - -usr/include @@ -74,7 +76,7 @@ parts: source-depth: 1 source-branch: v0-7 configflags: - - -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ + - -DCMAKE_BUILD_TYPE=Release - -DWITH_STATIC_LIB=ON - -DWITH_GSSAPI=ON - -DWITH_NACL=0 @@ -82,14 +84,16 @@ parts: # XXX: This is an hack to have a kind of bind-mount with absolute prefix. - -DCMAKE_INSTALL_PREFIX=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr organize: - snap/@SNAP_NAME@/current: . + snap/remmina/current: . prime: - ./**/libssh*.so.* remmina: plugin: cmake - source: @CMAKE_SOURCE_DIR_RELATIVE@ + source: . + prepare: + cp -av $SNAPCRAFT_STAGE/../snap $SNAPCRAFT_PART_INSTALL/../src stage-packages: - xauth build-packages: @@ -108,14 +112,14 @@ parts: - libvte-2.91-dev - libxkbfile-dev configflags: - - -DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@ + - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_PREFIX_PATH=$SNAPCRAFT_STAGE/usr - -DSNAP_BUILD=on # XXX: This is an hack to have a kind of bind-mount with absolute prefix. - -DCMAKE_INSTALL_PREFIX=/snap/$SNAPCRAFT_PROJECT_NAME/current/usr organize: - snap/@SNAP_NAME@/current: . + snap/remmina/current: . after: - libssh-0.7 @@ -151,4 +155,4 @@ slots: remmina-gapp: interface: dbus bus: session - name: @UNIQUE_APPNAME@ + name: org.remmina.Remmina |