From 1ca7415526165c874ed0fd24c19bc62c6c16688a Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Sun, 13 Jan 2019 01:42:52 +0100
Subject: Add Appimage build, fix windows CI

---
 .gitlab-ci.yml                 | 26 ++++++++++++++++++++++++++
 share/templates/CMakeLists.txt |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed6193f09..72fd3806a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,32 @@ inkscape:linux:
     paths:
       - build/
 
+appimage:linux:
+  stage: build
+  except:
+    - schedules
+  cache:
+    key: "cache-appimage"
+    paths:
+      - ccache/
+  before_script:
+    # CCache Config
+    - mkdir -p ccache
+    - export CCACHE_BASEDIR=${PWD}
+    - export CCACHE_DIR=${PWD}/ccache
+  script:
+    - cd build
+    - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+    - make -j$(nproc)
+    - make DESTDIR=appdir -j$(nproc) install ; find appdir/
+    - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
+    - chmod a+x linuxdeployqt-continuous-x86_64.AppImage
+    - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
+  artifacts:
+    expire_in: 1 year
+    paths:
+      - build/Inkscape*.AppImage*
+
 inkscape:mac:
   stage: build
   tags:
diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt
index c17cb5a13..abc7345d5 100644
--- a/share/templates/CMakeLists.txt
+++ b/share/templates/CMakeLists.txt
@@ -19,6 +19,6 @@ add_custom_target(inkscape_default_svg ALL
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/create_defaults.pl ${CMAKE_CURRENT_SOURCE_DIR}/default.svg 
   BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/default.*.svg
   COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/create_defaults.pl"
-  COMMAND mv default.*.svg ${CMAKE_CURRENT_BINARY_DIR}
+  COMMAND sh -c "mv default.*.svg ${CMAKE_CURRENT_BINARY_DIR}"
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
-- 
cgit v1.2.3