diff options
author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2017-01-31 14:30:53 +0300 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2017-01-31 14:30:53 +0300 |
commit | c9b6f18aeb02a416ec268cdce2afbd4d3d1f93ce (patch) | |
tree | 498fabd8cb890b03c7f5bfe4adaecae949804a4f /snap | |
parent | f5c9cec1db625d5c275b6f6e741818c5a9544b2f (diff) |
snap: use @VARIABLE@-format in snapcrat.yaml.in
Diffstat (limited to 'snap')
-rw-r--r-- | snap/CMakeLists.txt | 2 | ||||
-rw-r--r-- | snap/snapcraft.yaml.in | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/snap/CMakeLists.txt b/snap/CMakeLists.txt index 668bc5442..94a5a004f 100644 --- a/snap/CMakeLists.txt +++ b/snap/CMakeLists.txt @@ -45,7 +45,7 @@ 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) + ${SNAP_BUILD_DIR}/snapcraft.yaml @ONLY) set(REMMINA_BINARY_PATH "remmina") set(REMMINA_ICON "\${SNAP}/meta/gui/icon.svg") diff --git a/snap/snapcraft.yaml.in b/snap/snapcraft.yaml.in index 7dcdb9202..ddf91ce38 100644 --- a/snap/snapcraft.yaml.in +++ b/snap/snapcraft.yaml.in @@ -1,8 +1,8 @@ -name: ${SNAP_NAME} -version: ${SNAP_VERSION} +name: @SNAP_NAME@ +version: @SNAP_VERSION@ summary: The GTK+ Remote Desktop Client # Enable this when https://github.com/snapcore/snapcraft/pull/1092 is merged -# icon: ${CMAKE_SOURCE_DIR_RELATIVE}/remmina/desktop/scalable/apps/remmina.svg +# icon: @CMAKE_SOURCE_DIR_RELATIVE@/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 @@ -60,7 +60,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/@SNAP_NAME@/current: . prime: - -usr/include @@ -69,7 +69,7 @@ parts: remmina: plugin: cmake - source: ${CMAKE_SOURCE_DIR_RELATIVE} + source: @CMAKE_SOURCE_DIR_RELATIVE@ stage-packages: - xauth build-packages: @@ -92,7 +92,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/@SNAP_NAME@/current: . after: - freerdp @@ -123,4 +123,4 @@ slots: remmina-gapp: interface: dbus bus: session - name: ${UNIQUE_APPNAME} + name: @UNIQUE_APPNAME@ |