diff --git a/CMakeLists.txt b/CMakeLists.txt index dbe862b3..29ce68bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set (PROJECT_VERSION "1.0.2") set (PROJECT_PACKAGE "xournalpp") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Xournal++: Notetaking software designed around a tablet") -string(TIMESTAMP CPACK_PACKAGE_VERSION "nightly-build-%Y-%m-%dT%H:%M:%S") +string(TIMESTAMP CPACK_PACKAGE_VERSION "nightly build-%Y-%m-%dT%H:%M:%S") set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Xournal++ Team") @@ -360,6 +360,52 @@ install (DIRECTORY ui COMPONENT xournalpp ) +# Install desktop shortcuts for Linux +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + message ("Installing desktop files") + # Install desktop entry + #install(FILES data/albert.desktop DESTINATION /share/applications ) + + # Install icons + install(FILES ui/pixmaps/xournalpp.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps) + + # Symlink are not easy to use with CMake, therefor simple install a copy... + install(FILES ui/pixmaps/application-x-xopp.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) + install(FILES ui/pixmaps/application-x-xopt.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) + install(FILES ui/pixmaps/application-x-xoj.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) + + install(FILES ui/pixmaps/gnome-mime-application-x-xopp.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) + install(FILES ui/pixmaps/application-x-xopt.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/mimetypes/) + + install(FILES desktop/xournal.xml + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/mime/packages) + install(FILES desktop/xournalpp.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) + install(FILES desktop/x-xoj.desktop + DESTINATION /usr/share/mimelnk/application) + install(FILES desktop/x-xopp.desktop + DESTINATION /usr/share/mimelnk/application) + + install(FILES desktop/xournalpp.thumbnailer + DESTINATION /usr/share/thumbnailers) + install(FILES utility/usr/local/bin/xopp-recording.sh + DESTINATION /usr/local/bin/) + + + install(CODE " + execute_process(COMMAND update-desktop-database) + execute_process(COMMAND update-mime-database ${CMAKE_INSTALL_PREFIX}/share/mime) + execute_process(COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)" + ) + +endif () + if (BUILD_POPPLER) # Manual install Poppler libs # RPATH is set before, so they will be loaded @@ -387,33 +433,8 @@ configure_file ( add_custom_target (uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake - DEPENDS desktop-uninstall - - COMMENT "Uninstall entire xournalpp" -) - -# Install desktop target -configure_file (desktop/desktop_install.sh.in desktop/desktop_install.sh @ONLY) - -add_custom_target (desktop-install-xournalpp - COMMAND desktop/desktop_install.sh install - - COMMENT "Install xournalpp desktop files" -) - -add_custom_target (desktop-install - DEPENDS desktop-install-xournalpp desktop-install-thumbnailer -) - -# Uninstall desktop target -add_custom_target (desktop-uninstall-xournalpp - COMMAND desktop/desktop_install.sh uninstall - - COMMENT "Uninstall xournalpp desktop files" -) -add_custom_target (desktop-uninstall - DEPENDS desktop-uninstall-xournalpp desktop-uninstall-thumbnailer + COMMENT "Uninstall entire Xournal++" ) message (" diff --git a/desktop/desktop_install.sh.in b/desktop/desktop_install.sh.in deleted file mode 100755 index d6b12c05..00000000 --- a/desktop/desktop_install.sh.in +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -srcdir=@PROJECT_SOURCE_DIR@ -desktopdir=@PACKAGE_DATA_DIR@ - -if test "$1" = "install"; then - mkdir -p ${desktopdir}/icons/hicolor/scalable/apps - mkdir -p ${desktopdir}/icons/hicolor/scalable/mimetypes - mkdir -p ${desktopdir}/mime/packages - mkdir -p ${desktopdir}/applications - mkdir -p /usr/share/mimelnk/application - - cp -f ${srcdir}/ui/pixmaps/xournalpp.svg ${desktopdir}/icons/hicolor/scalable/apps - cp -f ${srcdir}/ui/pixmaps/xopp.svg ${desktopdir}/icons/hicolor/scalable/mimetypes/application-x-xopp.svg - cp -f ${srcdir}/ui/pixmaps/xopt.svg ${desktopdir}/icons/hicolor/scalable/mimetypes/application-x-xopt.svg - if test ! -e ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then - ln -s ${desktopdir}/icons/hicolor/scalable/mimetypes/application-x-xopp.svg ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg - fi - ln -s ${desktopdir}/icons/hicolor/scalable/mimetypes/application-x-xopp.svg ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopp.svg - ln -s ${desktopdir}/icons/hicolor/scalable/mimetypes/application-x-xopt.svg ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopt.svg - - cp -f ${srcdir}/desktop/xournal.xml ${desktopdir}/mime/packages - cp -f ${srcdir}/desktop/xournalpp.desktop ${desktopdir}/applications - cp -f ${srcdir}/desktop/x-xoj.desktop /usr/share/mimelnk/application - cp -f ${srcdir}/desktop/x-xopp.desktop /usr/share/mimelnk/application - - cp -f ${srcdir}/desktop/xournalpp.thumbnailer /usr/share/thumbnailers - cp -f ${srcdir}/utility/usr/local/bin/xopp-recording.sh /usr/local/bin/ -else - rm -f ${desktopdir}/icons/hicolor/scalable/apps/xournalpp.svg - rm -f ${desktopdir}/icons/hicolor/scalable/mimetypes/xoj.svg - rm -f ${desktopdir}/icons/hicolor/scalable/mimetypes/xopp.svg - rm -f ${desktopdir}/icons/hicolor/scalable/mimetypes/xopt.svg - rm -f ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg - rm -f ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopp.svg - rm -f ${desktopdir}/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopt.svg - - rm -f ${desktopdir}/mime/packages/xournal.xml - rm -f ${desktopdir}/applications/xournalpp.desktop - rm -f /usr/share/mimelnk/application/x-xoj.desktop - rm -f /usr/share/thumbnailers/xournalpp.thumbnailer - rm -f /usr/local/bin/xopp-recording.sh -fi - -echo "Updating desktop, mime, and icon databases."; -update-desktop-database; -update-mime-database ${desktopdir}/mime; -gtk-update-icon-cache -f -t ${desktopdir}/icons/hicolor; diff --git a/ui/pixmaps/xopp.svg b/ui/pixmaps/application-x-xoj.svg similarity index 100% rename from ui/pixmaps/xopp.svg rename to ui/pixmaps/application-x-xoj.svg diff --git a/ui/pixmaps/application-x-xopp.svg b/ui/pixmaps/application-x-xopp.svg new file mode 100644 index 00000000..5179ff61 --- /dev/null +++ b/ui/pixmaps/application-x-xopp.svg @@ -0,0 +1,437 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/pixmaps/application-x-xopt.svg b/ui/pixmaps/application-x-xopt.svg new file mode 100644 index 00000000..5179ff61 --- /dev/null +++ b/ui/pixmaps/application-x-xopt.svg @@ -0,0 +1,437 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/pixmaps/gnome-mime-application-x-xopp.svg b/ui/pixmaps/gnome-mime-application-x-xopp.svg new file mode 100644 index 00000000..5179ff61 --- /dev/null +++ b/ui/pixmaps/gnome-mime-application-x-xopp.svg @@ -0,0 +1,437 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/pixmaps/gnome-mime-application-x-xopt.svg b/ui/pixmaps/gnome-mime-application-x-xopt.svg new file mode 100644 index 00000000..5179ff61 --- /dev/null +++ b/ui/pixmaps/gnome-mime-application-x-xopt.svg @@ -0,0 +1,437 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file