diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bbe4f2..bc52fb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ set(CMAKE_AUTORCC ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(THREADS_PREFER_PTHREAD_FLAG ON) -set(BUILD_EXAMPLES ON CACHE BOOL "Whether to build examples or not.") -set(DDE_DDE_DEBUG_MODE ON CACHE BOOL "start a dde-applicatiom-manager service for debug") +set(BUILD_EXAMPLES OFF CACHE BOOL "Whether to build examples or not.") +set(DDE_AM_USE_DEBUG_DBUS_NAME OFF CACHE BOOL "build a dbus service using a different bus name for debug.") set(PROFILING_MODE OFF CACHE BOOL "run a valgrind performance profiling.") find_package(Qt6 REQUIRED COMPONENTS Core DBus Concurrent) @@ -22,8 +22,8 @@ find_package(Threads REQUIRED) set(APP_LAUNCH_HELPER_BIN app-launch-helper) -if(DDE_DEBUG_MODE) - add_compile_definitions(-DDDE_DEBUG_MODE) +if(DDE_AM_USE_DEBUG_DBUS_NAME) + add_compile_definitions(-DDDE_AM_USE_DEBUG_DBUS_NAME) endif() if(PROFILING_MODE) diff --git a/debian/rules b/debian/rules index f300042..50f6511 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,6 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk export QT_SELECT = qt6 -export DEB_CXXFLAGS_MAINT_APPEND = -O3 %: dh $@ --buildsystem=cmake - -override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DDDE_DEBUG_MODE=OFF -DBUILD_TESTING=ON diff --git a/src/constant.h b/src/constant.h index 0d2bb35..38603c0 100644 --- a/src/constant.h +++ b/src/constant.h @@ -9,7 +9,7 @@ constexpr auto SystemdService = u8"org.freedesktop.systemd1"; constexpr auto SystemdObjectPath = u8"/org/freedesktop/systemd1"; constexpr auto SystemdInterfaceName = u8"org.freedesktop.systemd1.Manager"; constexpr auto DDEApplicationManager1ServiceName = -#ifdef DDE_DEBUG_MODE +#ifdef DDE_AM_USE_DEBUG_DBUS_NAME u8"org.deepin.dde.debug.ApplicationManager1"; #else u8"org.deepin.dde.ApplicationManager1"; @@ -22,14 +22,14 @@ constexpr auto DesktopFileEntryKey = u8"Desktop Entry"; constexpr auto DesktopFileActionKey = u8"Desktop Action "; constexpr auto ApplicationManagerServerDBusName = -#ifdef DDE_DEBUG_MODE +#ifdef DDE_AM_USE_DEBUG_DBUS_NAME u8"deepin_application_manager_debug_server_bus"; #else u8"deepin_application_manager_server_bus"; #endif constexpr auto ApplicationManagerDestDBusName = -#ifdef DDE_DEBUG_MODE +#ifdef DDE_AM_USE_DEBUG_DBUS_NAME u8"deepin_application_manager_debug_dest_bus"; #else u8"deepin_application_manager_dest_bus"; diff --git a/src/desktopentry.cpp b/src/desktopentry.cpp index 57eddea..bd3e332 100644 --- a/src/desktopentry.cpp +++ b/src/desktopentry.cpp @@ -426,17 +426,13 @@ std::optional DesktopEntry::value(const QString &groupKey, { const auto &destGroup = group(groupKey); if (!destGroup) { -#ifdef DDE_DEBUG_MODE - qWarning() << "group " << groupKey << " can't be found."; -#endif + qDebug() << "group " << groupKey << " can't be found."; return std::nullopt; } auto it = destGroup->find(valueKey); if (it == destGroup->cend()) { -#ifdef DDE_DEBUG_MODE - qWarning() << "value " << valueKey << " can't be found."; -#endif + qDebug() << "value " << valueKey << " can't be found."; return std::nullopt; } return *it; diff --git a/tools/profiling.sh b/tools/profiling.sh index 1377674..823327e 100755 --- a/tools/profiling.sh +++ b/tools/profiling.sh @@ -10,7 +10,6 @@ BUILD_DIR=${BUILD_DIR:="build-prof"} cmake -B "$BUILD_DIR" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DDDE_DEBUG_MODE=OFF \ -DPROFILING_MODE=ON cmake --build "$BUILD_DIR" -j$(nproc)