oxen-io
/
lokinet-control-panel
mirror of https://github.com/oxen-io/lokinet-control-panel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Put lokinet-gui.app building behind a cmake option 

This lets someone build and use it locally just the same way they would
on Linux, but still allows building the bundle for producing an "app".
This commit is contained in:
Jason Rhinelander 2020-04-18 14:40:25 -03:00
parent 71b2f5fd91
commit 4b52f7d57a
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
CMakeLists.txt
View File

@ -39,36 +39,39 @@ set_target_properties(lokinet-gui
AUTOMOC ON # Does... whatever automoc is
)
if(APPLE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/mk-icns.sh ${CMAKE_CURRENT_SOURCE_DIR}/res/images/icon.svg ${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/icon.svg ${CMAKE_CURRENT_SOURCE_DIR}/tools/mk-icns.sh)
option(MACOS_APP "Build a lokinet-gui.app bundle instead of a binary" OFF)
target_sources(lokinet-gui PRIVATE
src/process/MacOSLokinetProcessManager.cpp
${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns)
target_sources(lokinet-gui PRIVATE src/process/MacOSLokinetProcessManager.cpp)
set_target_properties(lokinet-gui
PROPERTIES
MACOSX_BUNDLE TRUE
RESOURCE "${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns")
if(MACOS_APP)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/mk-icns.sh ${CMAKE_CURRENT_SOURCE_DIR}/res/images/icon.svg ${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/icon.svg ${CMAKE_CURRENT_SOURCE_DIR}/tools/mk-icns.sh)
set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.lokinet.lokinet-gui)
set(MACOSX_BUNDLE_INFO_STRING "Lokinet control panel")
set(MACOSX_BUNDLE_ICON_FILE lokinet-gui.icns)
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION})
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
set(MACOSX_BUNDLE_COPYRIGHT "© 2020, The Loki Project")
target_sources(lokinet-gui PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns)
get_target_property(uic_location Qt5::uic IMPORTED_LOCATION)
get_filename_component(qt_dir ${uic_location} DIRECTORY)
add_custom_command(TARGET lokinet-gui
POST_BUILD
COMMAND "${qt_dir}/macdeployqt" lokinet-gui.app
)
set_target_properties(lokinet-gui
PROPERTIES
MACOSX_BUNDLE TRUE
RESOURCE "${CMAKE_CURRENT_BINARY_DIR}/lokinet-gui.icns")
set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.lokinet.lokinet-gui)
set(MACOSX_BUNDLE_INFO_STRING "Lokinet control panel")
set(MACOSX_BUNDLE_ICON_FILE lokinet-gui.icns)
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${PROJECT_VERSION})
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
set(MACOSX_BUNDLE_COPYRIGHT "© 2020, The Loki Project")
get_target_property(uic_location Qt5::uic IMPORTED_LOCATION)
get_filename_component(qt_dir ${uic_location} DIRECTORY)
add_custom_command(TARGET lokinet-gui
POST_BUILD
COMMAND "${qt_dir}/macdeployqt" lokinet-gui.app
)
endif()
elseif(WIN32)
target_sources(lokinet-gui PRIVATE src/process/WindowsLokinetProcessManager.cpp)
else()

12
README.md
View File

@ -30,6 +30,18 @@ The app can be compiled to support `systemd` for starting and stopping `lokinet`
Note that interactions with systemd may require privilege escalation, which is handled through `polkit`. A graphical polkit backend must be running for this to work.
### MacOS
The above commands work to build a working executable, however if you also want to bundle it into a
`.app` bundle invoke cmake as:
cmake -DMACOS_APP=ON ..
which will produce a lokinet-gui.app executable app bundle directory containing the binary,
resources, and dependencies.
Note that building this way additionally requires imagemagick installed and built with SVG support.
### Usage
By default, the app starts running in the background with access available through the system tray. Click on the system tray icon to interact with the app.