Add AppImage integration.
2
.gitignore
vendored
@ -5,7 +5,7 @@ Doxyfile
|
|||||||
patches/
|
patches/
|
||||||
doc/conky.1
|
doc/conky.1
|
||||||
README
|
README
|
||||||
build*
|
build*/
|
||||||
doc/*.html
|
doc/*.html
|
||||||
|
|
||||||
Makefile
|
Makefile
|
||||||
|
82
.travis.yml
@ -44,9 +44,9 @@ matrix:
|
|||||||
- libircclient-dev
|
- libircclient-dev
|
||||||
- gawk
|
- gawk
|
||||||
sonarcloud:
|
sonarcloud:
|
||||||
organization: "brndnmtthws-github"
|
organization: brndnmtthws-github
|
||||||
token:
|
token:
|
||||||
secure: "KikPusy+HXcEVLr0Dqb6mkrefDU5jm7EGQ5fwO4sBG7bRMcnHV3V14s5yB4Ol8btpUC0nkNn/41+f37lkG+oT4y9ZeIH2ZrhsSEHxOgH6DF9ZSVJwtpLrF9siWgfZ0m5c5V7U5rzVYL3jlO1hQfXKCfMNAcwlKcEUrfpk7jVEZc="
|
secure: KikPusy+HXcEVLr0Dqb6mkrefDU5jm7EGQ5fwO4sBG7bRMcnHV3V14s5yB4Ol8btpUC0nkNn/41+f37lkG+oT4y9ZeIH2ZrhsSEHxOgH6DF9ZSVJwtpLrF9siWgfZ0m5c5V7U5rzVYL3jlO1hQfXKCfMNAcwlKcEUrfpk7jVEZc=
|
||||||
env:
|
env:
|
||||||
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
|
- MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
|
||||||
- os: linux
|
- os: linux
|
||||||
@ -95,38 +95,38 @@ matrix:
|
|||||||
sources:
|
sources:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
packages:
|
packages:
|
||||||
- g++-8
|
- g++-8
|
||||||
- cmake
|
- cmake
|
||||||
- docbook2x
|
- docbook2x
|
||||||
- libxdamage-dev
|
- libxdamage-dev
|
||||||
- libx11-dev
|
- libx11-dev
|
||||||
- libxft-dev
|
- libxft-dev
|
||||||
- libxext-dev
|
- libxext-dev
|
||||||
- libglib2.0-dev
|
- libglib2.0-dev
|
||||||
- libxml2-dev
|
- libxml2-dev
|
||||||
- libcurl4-gnutls-dev
|
- libcurl4-gnutls-dev
|
||||||
- liblua5.3-dev
|
- liblua5.3-dev
|
||||||
- libcairo2-dev
|
- libcairo2-dev
|
||||||
- libimlib2-dev
|
- libimlib2-dev
|
||||||
- libxinerama-dev
|
- libxinerama-dev
|
||||||
- libmysqlclient-dev
|
- libmysqlclient-dev
|
||||||
- libical-dev
|
- libical-dev
|
||||||
- libircclient-dev
|
- libircclient-dev
|
||||||
- libcairo2-dev
|
- libcairo2-dev
|
||||||
- libmicrohttpd-dev
|
- libmicrohttpd-dev
|
||||||
- ncurses-dev
|
- ncurses-dev
|
||||||
- librsvg2-dev
|
- librsvg2-dev
|
||||||
- libaudclient-dev
|
- libaudclient-dev
|
||||||
- libxmmsclient-dev
|
- libxmmsclient-dev
|
||||||
- libpulse-dev
|
- libpulse-dev
|
||||||
- libcurl4-gnutls-dev
|
- libcurl4-gnutls-dev
|
||||||
- audacious-dev
|
- audacious-dev
|
||||||
- libsystemd-dev
|
- libsystemd-dev
|
||||||
- libxnvctrl-dev
|
- libxnvctrl-dev
|
||||||
- libircclient-dev
|
- libircclient-dev
|
||||||
- gawk
|
- gawk
|
||||||
env:
|
env:
|
||||||
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
|
- MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode9.4
|
osx_image: xcode9.4
|
||||||
- os: osx
|
- os: osx
|
||||||
@ -221,7 +221,19 @@ script:
|
|||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
sudo: false
|
sudo: required
|
||||||
cache:
|
cache:
|
||||||
- directories:
|
- directories:
|
||||||
- "$HOME/.sonar/cache"
|
- '$HOME/.sonar/cache'
|
||||||
|
before_deploy:
|
||||||
|
- './appimage/build.sh'
|
||||||
|
deploy:
|
||||||
|
provider: releases
|
||||||
|
file_glob: true
|
||||||
|
file: conky*.AppImage
|
||||||
|
skip_cleanup: true
|
||||||
|
on:
|
||||||
|
tags: true
|
||||||
|
condition: '$CXX = clang++-7'
|
||||||
|
api_key:
|
||||||
|
secure: YGmk5e9am7gwH1pKJVwjHPheaLrSxMIIa5iDvnto9KKaj9VDgsynzPFcwfP6my78qMszdpC7IsjpukpKFBpmifAZ7OQcpEDFp1d91kXcTEM9ILgu3j3kl/gr6nIkzqJO9VAwlYO5H3t5xlD6EZa36FGg0Nlvi2cCuNG7mEyVJy0=
|
||||||
|
@ -94,6 +94,12 @@ if(MAINTAINER_MODE)
|
|||||||
install(FILES ${MAN_FILES} DESTINATION ${MAN_PATH})
|
install(FILES ${MAN_FILES} DESTINATION ${MAN_PATH})
|
||||||
endif(MAINTAINER_MODE)
|
endif(MAINTAINER_MODE)
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
|
install(FILES conky.desktop DESTINATION share/applications)
|
||||||
|
install(FILES logo/conky-logomark-violet.svg DESTINATION share/icons/hicolor/scalable/apps)
|
||||||
|
endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
|
|
||||||
|
|
||||||
if(CHECK_CODE_QUALITY)
|
if(CHECK_CODE_QUALITY)
|
||||||
# Set up clang-tidy
|
# Set up clang-tidy
|
||||||
set(CLANG_TIDY_BIN_NAME
|
set(CLANG_TIDY_BIN_NAME
|
||||||
|
51
appimage/build.sh
Executable file
@ -0,0 +1,51 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
|
# building in temporary directory to keep system clean
|
||||||
|
# use RAM disk if possible (as in: not building on CI system like Travis, and RAM disk is available)
|
||||||
|
if [ "$CI" == "" ] && [ -d /dev/shm ]; then
|
||||||
|
TEMP_BASE=/dev/shm
|
||||||
|
else
|
||||||
|
TEMP_BASE=/tmp
|
||||||
|
fi
|
||||||
|
|
||||||
|
BUILD_DIR=$(mktemp -d -p "$TEMP_BASE" AppImageLauncher-build-XXXXXX)
|
||||||
|
|
||||||
|
# make sure to clean up build dir, even if errors occur
|
||||||
|
cleanup () {
|
||||||
|
if [ -d "$BUILD_DIR" ]; then
|
||||||
|
rm -rf "$BUILD_DIR"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap cleanup EXIT
|
||||||
|
|
||||||
|
# store repo root as variable
|
||||||
|
REPO_ROOT=$(readlink -f $(dirname $(dirname $0)))
|
||||||
|
OLD_CWD=$(readlink -f .)
|
||||||
|
|
||||||
|
# switch to build dir
|
||||||
|
pushd "$BUILD_DIR"
|
||||||
|
|
||||||
|
# configure build files with cmake
|
||||||
|
# we need to explicitly set the install prefix, as CMake's default is /usr/local for some reason...
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX=/usr "$REPO_ROOT"
|
||||||
|
|
||||||
|
# build project and install files into AppDir
|
||||||
|
make -j4
|
||||||
|
make install DESTDIR=AppDir
|
||||||
|
|
||||||
|
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
|
||||||
|
|
||||||
|
# make them executable
|
||||||
|
chmod +x linuxdeploy-x86_64.AppImage
|
||||||
|
|
||||||
|
./linuxdeploy-x86_64.AppImage \
|
||||||
|
--appdir AppDir \
|
||||||
|
-e AppDir/usr/bin/conky \
|
||||||
|
-i AppDir/usr/share/icons/hicolor/scalable/apps/conky-logomark-violet.svg \
|
||||||
|
-d AppDir/usr/share/applications/conky.desktop \
|
||||||
|
--output appimage
|
||||||
|
|
||||||
|
mv conky*.AppImage "$OLD_CWD"
|
8
conky.desktop
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=conky
|
||||||
|
Exec=conky --daemonize --pause=1
|
||||||
|
StartupNotify=false
|
||||||
|
Terminal=false
|
||||||
|
Icon=conky-logomark-violet
|
||||||
|
Categories=System;Monitor;
|
Before Width: | Height: | Size: 219 KiB After Width: | Height: | Size: 219 KiB |
Before Width: | Height: | Size: 408 KiB After Width: | Height: | Size: 408 KiB |
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 64 KiB After Width: | Height: | Size: 64 KiB |
Before Width: | Height: | Size: 52 KiB After Width: | Height: | Size: 52 KiB |