From 4938066c623fc05f96be6a150a0ef00d1fabb813 Mon Sep 17 00:00:00 2001 From: "Daniel M. Capella" Date: Tue, 7 Aug 2018 01:34:11 -0400 Subject: Consolidate UI Makes it more convenient when packaging the daemon separately from the UI[]. []: https://aur.archlinux.org/cgit/aur.git/commit/?h=razercfg&id=7ce2b3258c916f3e140a8b5dcfe12ff0ae3865da --- CMakeLists.txt | 27 ----------------- icons/LICENSE | 7 ----- icons/razercfg-alt.svg | 68 ----------------------------------------- icons/razercfg-icon.svg | 72 -------------------------------------------- icons/razercfg-snake.svg | 47 ----------------------------- razercfg.desktop.template | 6 ---- ui/CMakeLists.txt | 33 ++++++++++++++++++-- ui/icons/LICENSE | 7 +++++ ui/icons/razercfg-alt.svg | 68 +++++++++++++++++++++++++++++++++++++++++ ui/icons/razercfg-icon.svg | 72 ++++++++++++++++++++++++++++++++++++++++++++ ui/icons/razercfg-snake.svg | 47 +++++++++++++++++++++++++++++ ui/razercfg.desktop.template | 6 ++++ 12 files changed, 230 insertions(+), 230 deletions(-) delete mode 100644 icons/LICENSE delete mode 100644 icons/razercfg-alt.svg delete mode 100644 icons/razercfg-icon.svg delete mode 100644 icons/razercfg-snake.svg delete mode 100644 razercfg.desktop.template create mode 100644 ui/icons/LICENSE create mode 100644 ui/icons/razercfg-alt.svg create mode 100644 ui/icons/razercfg-icon.svg create mode 100644 ui/icons/razercfg-snake.svg create mode 100644 ui/razercfg.desktop.template diff --git a/CMakeLists.txt b/CMakeLists.txt index 142690f..1427bfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,32 +54,5 @@ if(SYSTEMD_UNIT_DIR) WORLD_READ) endif(SYSTEMD_UNIT_DIR) -configure_file("razercfg.desktop.template" "razercfg.desktop") - -install(FILES ${CMAKE_BINARY_DIR}/razercfg.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ - PERMISSIONS OWNER_READ OWNER_WRITE - GROUP_READ - WORLD_READ) - -install(FILES ${CMAKE_SOURCE_DIR}/icons/razercfg-icon.svg - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ - RENAME razercfg.svg - PERMISSIONS OWNER_READ OWNER_WRITE - GROUP_READ - WORLD_READ) - -install(FILES ${CMAKE_SOURCE_DIR}/icons/razercfg-alt.svg - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ - PERMISSIONS OWNER_READ OWNER_WRITE - GROUP_READ - WORLD_READ) - -install(FILES ${CMAKE_SOURCE_DIR}/icons/razercfg-snake.svg - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ - PERMISSIONS OWNER_READ OWNER_WRITE - GROUP_READ - WORLD_READ) - add_subdirectory(razerd) add_subdirectory(ui) diff --git a/icons/LICENSE b/icons/LICENSE deleted file mode 100644 index 843f03e..0000000 --- a/icons/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Razer Config Tool Icons: - razercfg-alt.svg - razercfg-icon.svg - razercfg-snake.svg -Copyright by Jan Stümmel, licensed under a -Creative Commons Attribution 4.0 International License. -http://creativecommons.org/licenses/by/4.0/ diff --git a/icons/razercfg-alt.svg b/icons/razercfg-alt.svg deleted file mode 100644 index 705e63f..0000000 --- a/icons/razercfg-alt.svg +++ /dev/null @@ -1,68 +0,0 @@ - - -image/svg+xml diff --git a/icons/razercfg-icon.svg b/icons/razercfg-icon.svg deleted file mode 100644 index dbb4a7e..0000000 --- a/icons/razercfg-icon.svg +++ /dev/null @@ -1,72 +0,0 @@ - - -image/svg+xml diff --git a/icons/razercfg-snake.svg b/icons/razercfg-snake.svg deleted file mode 100644 index 75882ab..0000000 --- a/icons/razercfg-snake.svg +++ /dev/null @@ -1,47 +0,0 @@ - - -image/svg+xml diff --git a/razercfg.desktop.template b/razercfg.desktop.template deleted file mode 100644 index bce227f..0000000 --- a/razercfg.desktop.template +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Categories=Application;System; -Name=Razer Configuration -Exec=@CMAKE_INSTALL_PREFIX@/bin/qrazercfg -Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/razercfg.svg diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 96a092a..ed785a5 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -7,8 +7,7 @@ set(PYRAZER_DEPS "${CMAKE_CURRENT_SOURCE_DIR}/pyrazer/__init__.py" set(PYRAZER_BUILD "${CMAKE_CURRENT_SOURCE_DIR}/build") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in" - "${CMAKE_CURRENT_SOURCE_DIR}/setup.py") +configure_file("setup.py.in" "${CMAKE_BINARY_DIR}/setup.py") add_custom_command(OUTPUT ${PYRAZER_BUILD}/stamp COMMAND ${PYTHON} "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" build -b "${PYRAZER_BUILD}" @@ -24,7 +23,7 @@ install(CODE if (\"\${PYDESTDIR}\" STREQUAL \"\") set(PYDESTDIR /) endif() - execute_process(COMMAND ${PYTHON} \"${CMAKE_CURRENT_SOURCE_DIR}/setup.py\" + execute_process(COMMAND ${PYTHON} \"${CMAKE_BINARY_DIR}/setup.py\" install --root \"\${PYDESTDIR}\" --prefix \"${CMAKE_INSTALL_PREFIX}\" WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" RESULT_VARIABLE pyrazer_install_res) @@ -35,3 +34,31 @@ install(CODE install(PROGRAMS razer-gamewrapper DESTINATION bin) + +configure_file("razercfg.desktop.template" + "${CMAKE_BINARY_DIR}/razercfg.desktop") + +install(FILES ${CMAKE_BINARY_DIR}/razercfg.desktop + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ + PERMISSIONS OWNER_READ OWNER_WRITE + GROUP_READ + WORLD_READ) + +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/razercfg-icon.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ + RENAME razercfg.svg + PERMISSIONS OWNER_READ OWNER_WRITE + GROUP_READ + WORLD_READ) + +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/razercfg-alt.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ + PERMISSIONS OWNER_READ OWNER_WRITE + GROUP_READ + WORLD_READ) + +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/razercfg-snake.svg + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ + PERMISSIONS OWNER_READ OWNER_WRITE + GROUP_READ + WORLD_READ) diff --git a/ui/icons/LICENSE b/ui/icons/LICENSE new file mode 100644 index 0000000..843f03e --- /dev/null +++ b/ui/icons/LICENSE @@ -0,0 +1,7 @@ +Razer Config Tool Icons: + razercfg-alt.svg + razercfg-icon.svg + razercfg-snake.svg +Copyright by Jan Stümmel, licensed under a +Creative Commons Attribution 4.0 International License. +http://creativecommons.org/licenses/by/4.0/ diff --git a/ui/icons/razercfg-alt.svg b/ui/icons/razercfg-alt.svg new file mode 100644 index 0000000..705e63f --- /dev/null +++ b/ui/icons/razercfg-alt.svg @@ -0,0 +1,68 @@ + + +image/svg+xml diff --git a/ui/icons/razercfg-icon.svg b/ui/icons/razercfg-icon.svg new file mode 100644 index 0000000..dbb4a7e --- /dev/null +++ b/ui/icons/razercfg-icon.svg @@ -0,0 +1,72 @@ + + +image/svg+xml diff --git a/ui/icons/razercfg-snake.svg b/ui/icons/razercfg-snake.svg new file mode 100644 index 0000000..75882ab --- /dev/null +++ b/ui/icons/razercfg-snake.svg @@ -0,0 +1,47 @@ + + +image/svg+xml diff --git a/ui/razercfg.desktop.template b/ui/razercfg.desktop.template new file mode 100644 index 0000000..bce227f --- /dev/null +++ b/ui/razercfg.desktop.template @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Categories=Application;System; +Name=Razer Configuration +Exec=@CMAKE_INSTALL_PREFIX@/bin/qrazercfg +Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/razercfg.svg -- cgit v1.2.3