From 7fb38c60e57e7cd76a9193aac256e18073518a1b Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Fri, 14 Nov 2025 10:39:33 +0800 Subject: [PATCH] chore: adapt debugging settings function Using linuxdeepin/dde-control-center f86903a87b52048189d0d869c1828fc13da28c03 as reference. Log: --- .reuse/dep5 | 5 +++++ dconfig-center/dde-dconfig-daemon/CMakeLists.txt | 6 ++++++ .../deepin-debug-config/dde-dconfig-daemon.json | 11 +++++++++++ .../misc/deepin-log-config/dde-dconfig-daemon.json | 14 ++++++++++++++ debian/dde-dconfig-daemon.install | 2 ++ 5 files changed, 38 insertions(+) create mode 100644 dconfig-center/dde-dconfig-daemon/misc/deepin-debug-config/dde-dconfig-daemon.json create mode 100644 dconfig-center/dde-dconfig-daemon/misc/deepin-log-config/dde-dconfig-daemon.json diff --git a/.reuse/dep5 b/.reuse/dep5 index b7caf91..e335248 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -28,6 +28,11 @@ Files: dconfig-center/dde-dconfig-editor/*.qrc Copyright: None License: CC0-1.0 +# log-related config +Files: dconfig-center/dde-dconfig-daemon/misc/**/*.json +Copyright: None +License: CC0-1.0 + # example Files: dconfig-center/example/configs/* dconfig-center/example/*.pro Copyright: None diff --git a/dconfig-center/dde-dconfig-daemon/CMakeLists.txt b/dconfig-center/dde-dconfig-daemon/CMakeLists.txt index e5ed619..4a22a8b 100644 --- a/dconfig-center/dde-dconfig-daemon/CMakeLists.txt +++ b/dconfig-center/dde-dconfig-daemon/CMakeLists.txt @@ -42,3 +42,9 @@ install(FILES services/dde-dconfig-daemon.service DESTINATION ${CMAKE_INSTALL_PR ## bin install(TARGETS dde-dconfig-daemon DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# debug config file +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/deepin-debug-config/dde-dconfig-daemon.json + DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-debug-config/deepin-debug-config.d) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/misc/deepin-log-config/dde-dconfig-daemon.json + DESTINATION ${CMAKE_INSTALL_DATADIR}/deepin-log-viewer/deepin-log.conf.d) diff --git a/dconfig-center/dde-dconfig-daemon/misc/deepin-debug-config/dde-dconfig-daemon.json b/dconfig-center/dde-dconfig-daemon/misc/deepin-debug-config/dde-dconfig-daemon.json new file mode 100644 index 0000000..88211f0 --- /dev/null +++ b/dconfig-center/dde-dconfig-daemon/misc/deepin-debug-config/dde-dconfig-daemon.json @@ -0,0 +1,11 @@ +{ + "name": "dde-dconfig-daemon", + "group": "dde", + "submodules": [ + { + "name": "dde-dconfig-daemon", + "exec": "dde-dconfig-daemon.sh" + } + ], + "version": "V1.0" +} diff --git a/dconfig-center/dde-dconfig-daemon/misc/deepin-log-config/dde-dconfig-daemon.json b/dconfig-center/dde-dconfig-daemon/misc/deepin-log-config/dde-dconfig-daemon.json new file mode 100644 index 0000000..8106a29 --- /dev/null +++ b/dconfig-center/dde-dconfig-daemon/misc/deepin-log-config/dde-dconfig-daemon.json @@ -0,0 +1,14 @@ +{ + "name": "dde-dconfig-daemon", + "group": "dde", + "submodules": [ + { + "name": "dsg.config", + "filter": "dsg.config", + "exec": "/usr/bin/dde-dconfig-daemon", + "logType": "journal" + } + ], + "visible": 1, + "version": "V1.0" +} diff --git a/debian/dde-dconfig-daemon.install b/debian/dde-dconfig-daemon.install index e18faa4..7ba26ba 100644 --- a/debian/dde-dconfig-daemon.install +++ b/debian/dde-dconfig-daemon.install @@ -6,4 +6,6 @@ usr/share/dbus-1/system.d/* usr/share/dbus-1/interfaces/* usr/share/dbus-1/system-services/* usr/share/dde-dconfig/translations/* +usr/share/deepin-debug-config/deepin-debug-config.d/*.json +usr/share/deepin-log-viewer/deepin-log.conf.d/*.json usr/lib/systemd/system/*