Create deb using cpack

.travis.yml

@@ -16,6 +16,8 @@ after_success:
   - ls -lh out/*   # <= wrong line: see https://travis-ci.org/AppImage/AppImageKit/jobs/347965050#L4211
   - ls -lh build/out/*
   - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  # don't upload any .debs but appimaged's
+  - find build/out/ -iname '*.deb' -not -iname '*appimaged*' -print -delete
   - bash ./upload.sh build/out/*
 
 notifications:

CMakeLists.txt

@@ -14,7 +14,7 @@ include(CTest)
 
 # determine Git commit ID
 execute_process(
-    COMMAND git describe --tags --always --abbrev=7
+    COMMAND git rev-parse --short HEAD
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_COMMIT
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -42,6 +42,9 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+# write version information for CPack to files
+file(WRITE ${PROJECT_BINARY_DIR}/GIT_COMMIT "${GIT_COMMIT}")
+
 
 ##########################
 # configure dependencies #
@@ -99,6 +102,10 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/sanitizers-cmake/cmake" ${CMA
 
 add_subdirectory(src)
 
+################################
+#            packing           #
+################################
+include(cmake/cpack_debs.cmake)
 
 ################################
 # unit and functionality tests #

cmake/AppImageKitConfigVersion.cmake.in

@@ -1,4 +1,4 @@
-set(PACKAGE_VERSION "@GIT_VERSION@")
+set(PACKAGE_VERSION "@GIT_COMMIT@")
 
 # Check whether the requested PACKAGE_FIND_VERSION is compatible
 if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
@@ -8,4 +8,4 @@ else()
   if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
     set(PACKAGE_VERSION_EXACT TRUE)
   endif()
-endif()
+endif()

cmake/cpack_debs.cmake

@@ -0,0 +1,44 @@
+# required for DEB-DEFAULT to work as intended
+cmake_minimum_required(VERSION 3.6)
+
+set(PROJECT_VERSION 1.0)
+set(CPACK_GENERATOR "DEB")
+
+set(CPACK_DEBIAN_PACKAGE_VERSION ${PROJECT_VERSION})
+file(READ ${PROJECT_BINARY_DIR}/GIT_COMMIT GIT_COMMIT)
+message("GIT_COMMIT: ${GIT_COMMIT}")
+set(CPACK_DEBIAN_PACKAGE_RELEASE "git${GIT_COMMIT}")
+
+if(DEFINED ENV{ARCH})
+    set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE $ENV{ARCH})
+    if(CPACK_DEBIAN_PACKAGE_ARCHITECTURE MATCHES "i686")
+        set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
+    endif()
+endif()
+
+message("CPACK_DEBIAN_PACKAGE_ARCHITECTURE: ${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "AppImage Team")
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://appimage.org/")
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+
+set(CPACK_DEBIAN_LIBAPPIMAGE_PACKAGE_NAME "libappimage")
+set(CPACK_DEBIAN_LIBAPPIMAGE_PACKAGE_DEPENDS "libarchive13, libc6 (>= 2.4), libglib2.0-0, zlib1g, fuse")
+set(CPACK_DEBIAN_LIBAPPIMAGE_PACKAGE_DESCRIPTION "Utilities collection to handle AppImage files.")
+
+set(CPACK_DEBIAN_LIBAPPIMAGE-DEV_PACKAGE_NAME "libappimage-dev")
+set(CPACK_DEBIAN_LIBAPPIMAGE-DEV_PACKAGE_DEPENDS "libappimage")
+set(CPACK_DEBIAN_LIBAPPIMAGE-DEV_PACKAGE_DESCRIPTION "Utilities collection to handle AppImage files.")
+
+set(CPACK_DEBIAN_APPIMAGED_PACKAGE_NAME "appimaged")
+set(CPACK_COMPONENT_APPIMAGED_DESCRIPTION
+    "Optional AppImage daemon for desktop integration.\n  Integrates AppImages into the desktop, e.g., installs icons and menu entries.")
+
+set(CPACK_DEBIAN_APPIMAGED_PACKAGE_DEPENDS "libarchive13, libc6 (>= 2.4), libglib2.0-0, zlib1g, fuse")
+
+set(CPACK_COMPONENTS_ALL appimaged libappimage libappimage-dev)
+set(CPACK_DEB_COMPONENT_INSTALL ON)
+
+include(CPack)

install-build-deps.sh

@@ -22,7 +22,7 @@ fi
 if [ -e /usr/bin/apt-get ] ; then
   sudo apt-get update
   sudo apt-get -y install zsync git libarchive-dev autoconf libtool make gcc g++ libtool libfuse-dev \
-  liblzma-dev libglib2.0-dev libssl-dev libinotifytools0-dev liblz4-dev equivs libcairo-dev desktop-file-utils cmake
+  liblzma-dev libglib2.0-dev libssl-dev libinotifytools0-dev liblz4-dev libcairo-dev desktop-file-utils cmake
   # libtool-bin might be required in newer distributions but is not available in precise
   sudo cp resources/liblz4.pc /usr/lib/$ARCH-linux-gnu/pkgconfig/
   if cat /etc/lsb-release | grep 14.04 2>&1 >/dev/null; then

resources/appimaged.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=AppImage daemon
+After=basic.target
+[Service]
+ExecStart=/usr/bin/appimaged
+Restart=always
+RestartSec=5s
+StartLimitInterval=0
+[Install]
+WantedBy=graphical.target

src/CMakeLists.txt

@@ -237,7 +237,17 @@ else()
 endif()
 
 install(
-    TARGETS AppRun appimaged appimagetool digest validate
+    TARGETS appimaged
+    RUNTIME DESTINATION bin COMPONENT appimaged
+)
+
+install(
+    FILES ${CMAKE_SOURCE_DIR}/resources/appimaged.service
+    DESTINATION lib/systemd/user/
+    COMPONENT appimaged
+)
+install(
+    TARGETS AppRun appimagetool digest validate
     RUNTIME DESTINATION bin COMPONENT applications
     LIBRARY DESTINATION lib COMPONENT applications
     ARCHIVE DESTINATION lib/static COMPONENT applications

travis/build-appimages.sh → travis/build-packages-and-appimages.sh

@@ -1,11 +1,20 @@
 #! /bin/bash
 
-cd /build/out
+set -e
+
+cd /AppImageKit/build
+
+cpack -V
+mv *.deb out/
+
+cd out/
+
+# || true -- temporary workaround
 
 ./appimagetool.AppDir/AppRun ./appimagetool.AppDir/ -s -v \
     -u "gh-releases-zsync|AppImage|AppImageKit|continuous|appimagetool-$ARCH.AppImage.zsync" \
-    appimagetool-"$ARCH".AppImage
+    appimagetool-"$ARCH".AppImage || true
 
 ./appimagetool-"$ARCH".AppImage ./appimaged.AppDir/ -s -v \
     -u "gh-releases-zsync|AppImage|AppImageKit|continuous|appimaged-$ARCH.AppImage.zsync" \
-    appimaged-"$ARCH".AppImage
+    appimaged-"$ARCH".AppImage || true

travis/travis-build.sh

@@ -6,19 +6,14 @@ set -x
 case "$ARCH" in
     "x86_64")
         export ARCH="x86_64"
-        sed -i -e 's|%ARCH%|amd64|g' appimaged.ctl
         ;;
     "i386"|"i686")
         export ARCH="i686"
-        sed -i -e 's|%ARCH%|i386|g' appimaged.ctl
         # sleep so as not to overwrite during uploading (FIXME)
         sleep 60
         ;;
 esac
 
-# debug print
-grep Architecture appimaged.ctl
-
 # clean up and download data from GitHub
 rm -rf data.tar.g* .gnu* || true
 wget https://github.com/AppImage/AppImageKit/files/584665/data.zip -O data.tar.gz.gpg
@@ -29,7 +24,7 @@ wget https://github.com/AppImage/AppImageKit/files/584665/data.zip -O data.tar.g
 mkdir -p ./out/
 
 # build AppImageKit
-docker run \
+docker run --rm \
     --device /dev/fuse:mrw \
     -e ARCH -e TRAVIS -e TRAVIS_BUILD_NUMBER \
     -i \
@@ -43,16 +38,16 @@ find build/out/appimagetool.AppDir/
 find build/out/appimaged.AppDir/
 
 # build AppImages
-docker run \
+docker run --rm \
     --cap-add SYS_ADMIN \
     --device /dev/fuse:mrw \
     -e ARCH -e TRAVIS -e TRAVIS_BUILD_NUMBER \
     -i \
+    -v "${PWD}":/AppImageKit \
     -v "${PWD}"/travis/:/travis \
-    -v "${PWD}"/build:/build \
     -v $HOME/.gnupg:/root/.gnupg \
     "$DOCKER_IMAGE" \
-    /bin/bash -x "/travis/build-appimages.sh"
+    /bin/bash -x "/travis/build-packages-and-appimages.sh"
 
 cd build/
 
@@ -62,14 +57,11 @@ bash -x ../travis/test-appimages.sh
 
 # install more tools
 # (vim-common contains xxd)
-sudo apt-get install equivs vim-common
+sudo apt-get install vim-common
 
 # fix permissions
 sudo chown -R travis.travis .
 
-# build .deb
-(cd out ; equivs-build ../../appimaged.ctl)
-
 # remove binaries from output directory
 ls -al out/
 rm -r out/{appimaged,appimagetool,validate,digest,mksquashfs,*.AppDir}