refactor: refactor CMake build system for unified DTK5/DTK6 support

1. Replaced BUILD_WITH_QT6 option with DTK5 option for unified DTK5/DTK6
build control
2. Updated project configuration to support both DTK5 (Qt5) and DTK6
(Qt6) versions
3. Modified version handling to use DTK_VERSION (5.y.z or 6.y.z) instead
of PROJECT_VERSION
4. Updated library naming: dtklog for DTK5 and dtk6log for DTK6
5. Enhanced Debian packaging to generate separate packages for DTK5
and DTK6
6. Added Build-Profiles support (nodtk5, nodtk6) for selective package
building
7. Updated installation paths to include dtk5/ and dtk6/ subdirectories
8. Modified CMake config files to use DTK_NAME_SUFFIX for proper target
naming

Log: Updated build system to support both DTK5 and DTK6 versions

Influence:
1. Test building with DTK5=ON (default) to ensure Qt5 compatibility
2. Test building with DTK5=OFF to ensure Qt6 compatibility
3. Verify library naming: libdtklog.so for DTK5, libdtk6log.so for DTK6
4. Check installation paths: include/dtk5/ for DTK5, include/dtk6/ for
DTK6
5. Test Debian package building with different profiles (nodtk5, nodtk6)
6. Verify CMake config files generate correct target names (DtkLog vs
Dtk6Log)
7. Ensure pkg-config files have correct dependencies (Qt5Core vs
Qt6Core)

refactor: 重构CMake构建系统以支持统一的DTK5/DTK6构建

1. 将BUILD_WITH_QT6选项替换为DTK5选项，用于统一的DTK5/DTK6构建控制
2. 更新项目配置以同时支持DTK5（Qt5）和DTK6（Qt6）版本
3. 修改版本处理逻辑，使用DTK_VERSION（5.y.z或6.y.z）替代PROJECT_VERSION
4. 更新库命名：DTK5使用dtklog，DTK6使用dtk6log
5. 增强Debian打包系统，为DTK5和DTK6生成独立的软件包
6. 添加Build-Profiles支持（nodtk5, nodtk6）用于选择性构建软件包
7. 更新安装路径，包含dtk5/和dtk6/子目录
8. 修改CMake配置文件以使用DTK_NAME_SUFFIX进行正确的目标命名

Log: 更新构建系统以同时支持DTK5和DTK6版本

Influence:
1. 测试使用DTK5=ON（默认）构建，确保Qt5兼容性
2. 测试使用DTK5=OFF构建，确保Qt6兼容性
3. 验证库命名：DTK5使用libdtklog.so，DTK6使用libdtk6log.so
4. 检查安装路径：DTK5使用include/dtk5/，DTK6使用include/dtk6/
5. 测试使用不同配置文件（nodtk5, nodtk6）构建Debian软件包
6. 验证CMake配置文件生成正确的目标名称（DtkLog vs Dtk6Log）
7. 确保pkg-config文件具有正确的依赖关系（Qt5Core vs Qt6Core）

Author: 18202781743

CMakeLists.txt

@@ -4,29 +4,39 @@ SET(CMAKE_CXX_STANDARD 11)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_AUTOMOC ON)
 
-FILE (READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION)
-STRING (STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION)
-SET (DLOG_VERSION "${DTK_FILE_VERSION}" CACHE STRING "define project version")
-SET (BUILD_WITH_SYSTEMD OFF CACHE BOOL "Build with systemd")
-SET (BUILD_WITH_QT6 OFF CACHE BOOL "Build with Qt6")
-
-IF(BUILD_WITH_QT6)
-  SET(QT_VERSION_MAJOR "6")
-  SET(DTK_VERSION_MAJOR "6")
-ELSE()
-  SET(QT_VERSION_MAJOR "5")
-ENDIF()
+FILE (READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" FILE_VERSION)
+STRING (STRIP "${FILE_VERSION}" FILE_VERSION)
 
-SET (DLog "Dtk${DTK_VERSION_MAJOR}Log")
-PROJECT(${DLog}
-  VERSION ${DLOG_VERSION}
+PROJECT(DtkLog
+  VERSION ${FILE_VERSION}
   DESCRIPTION "Simple, convinient and thread safe logger for Qt-based C++ apps"
+  HOMEPAGE_URL "https://github.com/linuxdeepin/dtklog"
   LANGUAGES CXX
 )
 
+SET (BUILD_WITH_SYSTEMD OFF CACHE BOOL "Build with systemd")
+
+# 引入 DTK5/DTK6 构建选项
+option(DTK5 "Build DTK5." ON)
+if(DTK5)
+    set(DTK_VERSION_MAJOR "5")
+    set(DTK_NAME_SUFFIX "")     # DTK5 产品名称后缀为空
+else()
+    set(DTK_VERSION_MAJOR "6")
+    set(DTK_NAME_SUFFIX "6")    # DTK6 产品名称后缀为 "6"
+endif()
+
+set(DTK_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(DTK_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(DTK_VERSION "${DTK_VERSION_MAJOR}.${DTK_VERSION_MINOR}.${DTK_VERSION_PATCH}")
+# 官方约定：DTK5 使用 Qt5，DTK6 使用 Qt6
+set(QT_VERSION_MAJOR ${DTK_VERSION_MAJOR})
+
+SET (DLog "Dtk${DTK_NAME_SUFFIX}Log")
+
 INCLUDE(GNUInstallDirs)
 INCLUDE(CMakePackageConfigHelpers) # configure_package_config_file
-SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${QT_VERSION_MAJOR}/DLog")
+SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dtk${DTK_VERSION_MAJOR}/DLog")
 SET (LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
 SET (CONFIG_CMAKE_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/cmake/${DLog}" CACHE STRING "Install dir for cmake config files")
 SET (MKSPECS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/qt${QT_VERSION_MAJOR}/mkspecs/modules" CACHE STRING "Install dir for qt pri files")
@@ -77,7 +87,7 @@ IF(BUILD_WITH_SYSTEMD)
   SET(includes ${includes} include/JournalAppender.h)
 ENDIF(BUILD_WITH_SYSTEMD)
 
-SET(library_target dtk${DTK_VERSION_MAJOR}log)
+SET(library_target dtk${DTK_NAME_SUFFIX}log)
 
 ADD_LIBRARY(${library_target} SHARED ${sources} ${includes})
 
@@ -92,8 +102,8 @@ TARGET_LINK_DIRECTORIES(${library_target} INTERFACE
 )
 
 SET_TARGET_PROPERTIES(${library_target} PROPERTIES
-  VERSION ${CMAKE_PROJECT_VERSION}
-  SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR}
+  VERSION ${DTK_VERSION}
+  SOVERSION ${DTK_VERSION_MAJOR}
   EXPORT_NAME Log
 )
 
@@ -142,7 +152,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(misc/DLogConfig.cmake.in
 )
 WRITE_BASIC_PACKAGE_VERSION_FILE(
     "${CMAKE_CURRENT_BINARY_DIR}/${DLog}ConfigVersion.cmake"
-    VERSION ${DLOG_VERSION}
+    VERSION ${DTK_VERSION}
     COMPATIBILITY SameMajorVersion
 )
 

debian/control

@@ -1,19 +1,46 @@
 Source: dtklog
 Section: libdevel
 Priority: optional
-Maintainer: Deepin Packages Builder <packages@deepin.com>
-Build-Depends: debhelper-compat ( =12), pkg-config, qtbase5-private-dev, cmake, libspdlog-dev, libsystemd-dev
+Maintainer: Shanshan Ye <yeshanshan@uniontech.com>
+Build-Depends: debhelper-compat ( =12),
+    cmake,
+    pkg-config,
+    libspdlog-dev,
+    libsystemd-dev,
+    qtbase5-dev <!nodtk5>,
+    qtbase5-private-dev <!nodtk5>,
+    qt6-base-dev <!nodtk6>,
+    qt6-base-private-dev <!nodtk6>
 Standards-Version: 3.9.8
 
+Package: libdtk6log
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Build-Profiles: <!nodtk6>
+Description: Simple, convinient and thread safe logger for Qt-based C++ apps (DTK6 with Qt6)
+ This package contains the shared libraries.
+
+Package: libdtk6log-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libdtk6log( =${binary:Version})
+Build-Profiles: <!nodtk6>
+Description: Simple, convinient and thread safe logger for Qt-based C++ apps (DTK6 with Qt6)
+ This package contains the header files and static libraries of dlog
+
 Package: libdtklog
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
-Description: Simple, convinient and thread safe logger for Qt-based C++ apps.
+Build-Profiles: <!nodtk5>
+Description: Simple, convinient and thread safe logger for Qt-based C++ apps (DTK5 with Qt5)
  This package contains the shared libraries.
 
 Package: libdtklog-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdtklog( =${binary:Version})
-Description: Simple, convinient and thread safe logger for Qt-based C++ apps.
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libdtklog( =${binary:Version})
+Build-Profiles: <!nodtk5>
+Description: Simple, convinient and thread safe logger for Qt-based C++ apps (DTK5 with Qt5)
  This package contains the header files and static libraries of dlog

debian/libdtk6log-dev.install

@@ -0,0 +1,5 @@
+usr/include/dtk6/
+usr/lib/*/libdtk6log.so
+usr/lib/*/pkgconfig/dtk6log.pc
+usr/lib/*/qt6/mkspecs/
+usr/lib/*/cmake/Dtk6Log/

debian/libdtk6log.install

@@ -0,0 +1 @@
+usr/lib/*/libdtk6log.so.6*

debian/libdtklog-dev.install

@@ -1,5 +1,5 @@
-usr/include
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*.pc
-usr/lib/*/qt5/*
-usr/lib/*/cmake/*/*.cmake
+usr/include/dtk5/
+usr/lib/*/libdtklog.so
+usr/lib/*/pkgconfig/dtklog.pc
+usr/lib/*/qt5/mkspecs/
+usr/lib/*/cmake/DtkLog/

debian/libdtklog.install

@@ -1 +1 @@
-usr/lib/*/lib*.so.*
+usr/lib/*/libdtklog.so.5*

debian/rules

@@ -1,34 +1,74 @@
 #!/usr/bin/make -f
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
-export QT_SELECT = qt5
-export DEB_CXXFLAGS_MAINT_APPEND = -Ofast
 
 # 安全编译参数
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wall
 export DEB_CXXFLAGS_MAINT_APPEND = -Wall
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-E
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# reproducible 编译参数
+DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_BUILD_RPATH=ON
 
-VERSION = $(DEB_VERSION_UPSTREAM)
-PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}')
+# 版本映射：x.y.z -> 5.y.z 和 6.y.z
+DTK5_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/5\1/')
+DTK6_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/6\1/')
+DTK5_MAJOR_MINOR := $(shell echo $(DTK5_VERSION) | cut -d '.' -f 1,2)
 
-# Calculate build version:
-# 5.6.8 -> 0; 5.6.8.7 -> 7; 5.6.8+u001 -> 1; 5.6.8.7+u001 -> 7; 5.6.8.0+u001 -> 0
-BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}' | awk -F'.' '{print $$4}' | sed 's/[^0-9]//g' | awk '{print int($$1)}')
-ifeq ($(BUILD_VER), 0)
-ifeq ($(shell expr $(shell echo "$(VERSION)" | awk -F. '{print NF-1}') '<' 3), 1)
-	BUILD_VER=$(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}'  | sed 's/[^0-9]//g' | awk '{print int($$1)}')
-endif
-endif
+# Build-Profiles 控制
+BUILD_DTK5 := $(if $(filter nodtk5,$(DEB_BUILD_PROFILES)),OFF,ON)
+BUILD_DTK6 := $(if $(filter nodtk6,$(DEB_BUILD_PROFILES)),OFF,ON)
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DDLOG_VERSION=$(PACK_VER) -DBUILD_WITH_SYSTEMD=ON
+ifeq ($(BUILD_DTK5),ON)
+	mkdir -p build-dtk5
+	QT_SELECT=qt5 dh_auto_configure --builddirectory=build-dtk5 -- \
+		$(DEB_CMAKE_EXTRA_FLAGS) \
+		-DBUILD_TESTING=OFF \
+		-DBUILD_WITH_SYSTEMD=ON \
+		-DDTK5=ON
+endif
+ifeq ($(BUILD_DTK6),ON)
+	mkdir -p build-dtk6
+	dh_auto_configure --builddirectory=build-dtk6 -- \
+		$(DEB_CMAKE_EXTRA_FLAGS) \
+		-DBUILD_TESTING=OFF \
+		-DBUILD_WITH_SYSTEMD=ON \
+		-DDTK5=OFF
+endif
+
+override_dh_auto_build:
+ifeq ($(BUILD_DTK5),ON)
+	QT_SELECT=qt5 dh_auto_build --builddirectory=build-dtk5
+endif
+ifeq ($(BUILD_DTK6),ON)
+	dh_auto_build --builddirectory=build-dtk6
+endif
+
+override_dh_auto_install:
+ifeq ($(BUILD_DTK5),ON)
+	QT_SELECT=qt5 dh_auto_install --builddirectory=build-dtk5
+endif
+ifeq ($(BUILD_DTK6),ON)
+	dh_auto_install --builddirectory=build-dtk6
+endif
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V "libdtklog (>= $(shell echo $(VERSION) | cut -d '.' -f 1,2))"
+ifeq ($(BUILD_DTK5),ON)
+	dh_makeshlibs -V "libdtklog (>= $(DTK5_MAJOR_MINOR))" -plibdtklog
+endif
+ifeq ($(BUILD_DTK6),ON)
+	dh_makeshlibs -V "libdtk6log (>= $(DTK6_VERSION))" -plibdtk6log
+endif
+
+override_dh_auto_test:
+	# 测试在 build 阶段已执行
+
+override_dh_auto_clean:
+	dh_auto_clean --builddirectory=build-dtk5
+	dh_auto_clean --builddirectory=build-dtk6
+	rm -rf build-dtk5 build-dtk6

misc/DLogConfig.cmake.in

@@ -7,7 +7,7 @@ include(CMakeFindDependencyMacro)
 
 include(${CMAKE_CURRENT_LIST_DIR}/@DLog@Targets.cmake)
 
-get_target_property(Dtk@DTK_VERSION_MAJOR@Log_INCLUDE_DIRS Dtk@DTK_VERSION_MAJOR@::Log INTERFACE_INCLUDE_DIRECTORIES)
-get_target_property(Dtk@DTK_VERSION_MAJOR@Log_LIBRARY_DIRS Dtk@DTK_VERSION_MAJOR@::Log INTERFACE_LINK_DIRECTORIES)
+get_target_property(Dtk@DTK_NAME_SUFFIX@Log_INCLUDE_DIRS Dtk@DTK_NAME_SUFFIX@::Log INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(Dtk@DTK_NAME_SUFFIX@Log_LIBRARY_DIRS Dtk@DTK_NAME_SUFFIX@::Log INTERFACE_LINK_DIRECTORIES)
 check_required_components(@DLog@)
 

misc/dtklog.pc.in

@@ -4,7 +4,8 @@ libdir=${prefix}/@LIBRARY_INSTALL_DIR@
 includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
 Name: @library_target@
-Description: @CMAKE_PROJECT_DESCRIPTION@
-Version: @CMAKE_PROJECT_VERSION@
+Description: @PROJECT_DESCRIPTION@
+Version: @DTK_VERSION@
 Libs: -L${libdir} -l@library_target@
 Cflags: -I${includedir}
+Requires: Qt@QT_VERSION_MAJOR@Core

misc/qt_lib_dtklog.pri.in

@@ -1,9 +1,9 @@
-QT.dtklog.VERSION = @CMAKE_PROJECT_VERSION@
-QT.dtklog.MAJOR_VERSION = @PROJECT_VERSION_MAJOR@
-QT.dtklog.MINOR_VERSION = @PROJECT_VERSION_MINOR@
-QT.dtklog.PATCH_VERSION = @PROJECT_VERSION_PATCH@
-QT.dtklog.name = dtklog
-QT.dtklog.module = dtk@DTK_VERSION_MAJOR@log
+QT.dtklog.VERSION = @DTK_VERSION@
+QT.dtklog.MAJOR_VERSION = @DTK_VERSION_MAJOR@
+QT.dtklog.MINOR_VERSION = @DTK_VERSION_MINOR@
+QT.dtklog.PATCH_VERSION = @DTK_VERSION_PATCH@
+QT.dtklog.name = dtk@DTK_NAME_SUFFIX@log
+QT.dtklog.module = dtk@DTK_NAME_SUFFIX@log
 QT.dtklog.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@
 QT.dtklog.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@
 QT.dtklog.frameworks =