From 936735eed82dc4011359e8ac238737419c0ab71a Mon Sep 17 00:00:00 2001 From: Raphael Dumusc Date: Wed, 15 Mar 2017 17:23:36 +0100 Subject: [PATCH] DesktopStreamer (incl. Deflect) can be released as a .deb package. The installed DesktopStreamer application can now be launched from any standard Linux desktop app menu or launcher. --- .gitexternals | 2 +- CMake/CPackConfig.cmake | 16 ---------------- CMakeLists.txt | 15 +++++++++------ apps/DesktopStreamer/CMakeLists.txt | 12 ++++-------- apps/DesktopStreamer/desktopstreamer.desktop | 8 ++++++++ apps/DesktopStreamer/desktopstreamer.png | Bin 0 -> 1965 bytes doc/Changelog.md | 3 +++ 7 files changed, 25 insertions(+), 31 deletions(-) delete mode 100644 CMake/CPackConfig.cmake create mode 100644 apps/DesktopStreamer/desktopstreamer.desktop create mode 100644 apps/DesktopStreamer/desktopstreamer.png diff --git a/.gitexternals b/.gitexternals index 411b9ec..f8893ae 100644 --- a/.gitexternals +++ b/.gitexternals @@ -1,2 +1,2 @@ # -*- mode: cmake -*- -# CMake/common https://github.com/Eyescale/CMake.git 770b264 +# CMake/common https://github.com/Eyescale/CMake.git e3a2dba diff --git a/CMake/CPackConfig.cmake b/CMake/CPackConfig.cmake deleted file mode 100644 index 92f83f5..0000000 --- a/CMake/CPackConfig.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) BBP/EPFL 2011-2015 -# Stefan.Eilemann@epfl.ch -# All rights reserved. Do not distribute without further notice. - -# General CPack configuration -# Info: http://www.itk.org/Wiki/CMake:Component_Install_With_CPack - -set(CPACK_PACKAGE_VENDOR "bluebrain.epfl.ch") -set(CPACK_PACKAGE_EXECUTABLES "${DESKTOPSTREAMER_APP_NAME}") - -# Linux Debian specific settings -set(CPACK_DEBIAN_PACKAGE_DEPENDS "qtbase5-dev, libturbojpeg" ) -set(CPACK_DEB_COMPONENT_INSTALL ON) # Set this to package only components in CPACK_COMPONENTS_ALL -set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1) # Don't make a separate package for each component - -include(CommonCPack) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca8df8a..c39eadd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ include(GitExternal) set(DEFLECT_DESCRIPTION "A fast C++ library for streaming pixels and events") set(DEFLECT_MAINTAINER "Blue Brain Project ") -set(DEFLECT_LICENSE BSD) +set(DEFLECT_LICENSE LGPL) set(DEFLECT_DEB_DEPENDS freeglut3-dev libxi-dev libxmu-dev libjpeg-turbo8-dev libturbojpeg libboost-program-options-dev libboost-test-dev @@ -52,12 +52,15 @@ if(Boost_FOUND) endif() add_subdirectory(doc) +# Name the package "desktopstreamer" instead of "deflect6" +set(COMMON_PACKAGE_ABI OFF) +set(CPACK_PACKAGE_NAME "desktopstreamer") +set(CPACK_PACKAGE_VENDOR "bluebrain.epfl.ch") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "qtbase5-dev, libturbojpeg") +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/BlueBrain/Deflect") +include(CommonCPack) # also includes CommonPackageConfig + set(COMMON_PROJECT_DOMAIN ch.epfl.bluebrain) set(DOXYGEN_MAINPAGE_MD README.md) set(DOXYGEN_EXTRA_INPUT ${PROJECT_SOURCE_DIR}/README.md) include(DoxygenRule) # must be after all targets - -set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} - # http://public.kitware.com/Bug/view.php?id=10179 - "ld: warning: duplicate dylib") -include(CTest) diff --git a/apps/DesktopStreamer/CMakeLists.txt b/apps/DesktopStreamer/CMakeLists.txt index 0689661..39a1ef0 100644 --- a/apps/DesktopStreamer/CMakeLists.txt +++ b/apps/DesktopStreamer/CMakeLists.txt @@ -25,10 +25,10 @@ set(DESKTOPSTREAMER_LINK_LIBRARIES set(DEFLECT_DESKTOPSTREAMER_HOSTS "\ -{\"DisplayWall Ground floor\", \"bbpav02.epfl.ch\"}, \ -{\"DisplayWall 3rd floor\", \"bbpav04.epfl.ch\"}, \ -{\"DisplayWall 5th floor\", \"bbpav05.epfl.ch\"}, \ -{\"DisplayWall 6th floor\", \"bbpav06.epfl.ch\"}" +{\"DisplayWall Ground floor\", \"bbpav02.bbp.epfl.ch\"}, \ +{\"DisplayWall 3rd floor\", \"bbpav04.bbp.epfl.ch\"}, \ +{\"DisplayWall 5th floor\", \"bbpav05.bbp.epfl.ch\"}, \ +{\"DisplayWall 6th floor\", \"bbpav06.bbp.epfl.ch\"}" CACHE STRING "List of default hosts for the DesktopStreamer application" ) set_source_files_properties(MainWindow.cpp PROPERTIES COMPILE_DEFINITIONS @@ -41,7 +41,6 @@ if(APPLE) set(DESKTOPSTREAMER_APP_NAME DesktopStreamer) string(TIMESTAMP _CURRENT_YEAR "%Y") set(DESKTOPSTREAMER_COPYRIGHT "EPFL/Blue Brain Project ${_CURRENT_YEAR}") - set(DESKTOPSTREAMER_ICON desktopstreamer.icns) list(APPEND DESKTOPSTREAMER_SOURCES nameUtils.mm) list(APPEND DESKTOPSTREAMER_LINK_LIBRARIES "-framework Foundation") @@ -74,6 +73,3 @@ if(APPLE) ${DESKTOPSTREAMER_APP_NAME}-${PROJECT_VERSION}.zip ${DESKTOPSTREAMER_APP_NAME}.app WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)" COMPONENT apps) endif() - -set(CPACK_PACKAGE_LICENSE "LGPL") -include(CPackConfig) diff --git a/apps/DesktopStreamer/desktopstreamer.desktop b/apps/DesktopStreamer/desktopstreamer.desktop new file mode 100644 index 0000000..2235588 --- /dev/null +++ b/apps/DesktopStreamer/desktopstreamer.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=DesktopStreamer +Comment=Stream your desktop +Keywords=streaming;deflect; +Exec=desktopstreamer +Icon=desktopstreamer +Type=Application +Categories=Utility; diff --git a/apps/DesktopStreamer/desktopstreamer.png b/apps/DesktopStreamer/desktopstreamer.png new file mode 100644 index 0000000000000000000000000000000000000000..b49d1c9966aae6032c4da151fbaf513297d0a2cc GIT binary patch literal 1965 zcma)7X*Ao39{t;6D-TsmL+ov>p%XPiDMnCx)lx%<=`xK7s->i8J4&S#rHG|k%WEfg zL2a?d9$Fpy8hb6Vl!TN#{r1j$m^0^h?(g1nKi_k2oP(XEuz-vJ006>P2y>?sj`{%* z@5yg7_USz#USAtabAbKh-ZU1aoH+bggnKXm2#Wsz2auU1bz<_}v$D0|o8uA@H56%5 zb{{=)ezr0)T3Xt6*xVS9Mm#v4O7NQ?w* zZF+|%T07YH7(b_d$EwAK`(IzEq!eH#C~zCeBElYp-7?>^!J1qZ%8_m=eWkNtgO zC3GEMLTf>747*3^lD7UEzJVV*V>8qa(svH>D zMWhyjDxhkp6+Y9E-?G`UYGSK9Yrlw8z=E{vcxCK!RWq!U5QUROI|`P@oOl&^PvTN$ z009H%f_=D+Mic32vX{_I1gq!xNxtkx0j5^;hTP$SuWID#b>raPYie9)*2lfp8IsB3y0o&h zidb{lVMZy9kE3@fGDR~xEtShAak#Sj=II<)&k)7hi`A6fEjZ)Q3`HgD;AY4WNz?&u zckHEA@SUY;#n}|{d)k^Fxvk3)b%@OD@O;_1i)$EsP(n*jF!3rhPE9*yZJz_fIcS|R zxU&|GWBa%rAYx9b4}|}ESF=1c3%gs1ZtM%6=D^4p#l(rL{%0u&m;8+cCPnNE4wWUn zgHF~HoYkg_yZm&gg1MXv3hqxQrVV8oEF%Sxp*N>wDE8^?MHG9;%tA8+RJ*pX9dwAB z))R31jKza%uFg{pm&F&u#GXJXEk_}JUbX3-)c!E8+=o>$m1;G6lRQjQeEB>^b?6mE zYWaR{MV=CKbT4-{MmC_w3@{UIcOwy#h5h{_2ElCm=uTKk(RxmS5Exo95?Hn$fk7%} z&|(7T>lbG~25n!gB@%myg)NIEZjJQy^-YF7TI4y>$HqMF-9#wo8JRCXfQ1NqU;!)THFrPtjEz}4V-%{<`N0->LJb#^*zysZW&wC8?M(>}lfu2flx~oRe zFL@2vfuGVV>u#P_PXPP0yG#%NKD*r^c-#L@8c?!Dj(OLx-E}m{Qt%Hj#L^jL7g43y z#~d@?imaL2S<L>E`rnh@Dlw7-v$K53Zt zI#qKj$kqA;s%}{%sHae^*KAaR2cr$_n+k2%ZQITY@v2p;0;-D@+Nr zDnh~{G{@4yqQe1BAA