feat: add DTK6 documentation package and improve build profiles

1. Added new libdtk6core-doc package for DTK6 documentation with
conditional build profile (!nodtk6 !nodoc)
2. Added new install file for libdtk6core-doc to install dtkcore.qch
documentation
3. Reordered build dependencies: moved cmake to top and added
conditional build profiles for Qt5/Qt6 tools and documentation
4. Updated debian/rules to enable BUILD_TESTING for both DTK5 and DTK6
builds
5. Modified DTK6 version check to use full DTK6_VERSION instead of
MAJOR_MINOR for shared library versioning
6. Enabled BUILD_DOCS for DTK6 builds when documentation profile is
active

Log: Added separate documentation package for DTK6 Core library

Influence:
1. Test building with different profiles (nodtk5, nodtk6, nodoc) to
ensure conditional dependencies work correctly
2. Verify libdtk6core-doc package installation and documentation file
placement
3. Test that BUILD_TESTING flag enables test builds properly
4. Verify shared library versioning uses correct version format for DTK6
5. Ensure backward compatibility with existing DTK5 packages

feat: 添加DTK6文档包并改进构建配置

1. 新增libdtk6core-doc包用于DTK6文档，包含条件构建配置(!nodtk6 !nodoc)
2. 新增libdtk6core-doc安装文件以安装dtkcore.qch文档
3. 重新排序构建依赖：将cmake移至顶部，并为Qt5/Qt6工具和文档添加条件构建
配置
4. 更新debian/rules以同时为DTK5和DTK6构建启用BUILD_TESTING
5. 修改DTK6版本检查，使用完整DTK6_VERSION而非MAJOR_MINOR进行共享库版本
控制
6. 当文档配置激活时，为DTK6构建启用BUILD_DOCS

Log: 为DTK6核心库新增独立的文档包

Influence:
1. 测试使用不同配置(nodtk5, nodtk6, nodoc)构建，确保条件依赖正常工作
2. 验证libdtk6core-doc包安装和文档文件放置位置
3. 测试BUILD_TESTING标志是否正确启用测试构建
4. 验证共享库版本控制对DTK6使用正确的版本格式
5. 确保与现有DTK5包的向后兼容性

Author: 18202781743

debian/control

@@ -3,24 +3,24 @@ Section: libdevel
 Priority: optional
 Maintainer: Shanshan Ye <yeshanshan@uniontech.com>
 Build-Depends: debhelper-compat ( =12),
+    cmake,
     pkg-config,
     libgtest-dev,
     libdtkcommon-dev,
     libicu-dev,
     libuchardet-dev,
     libdbus-1-dev,
-    qttools5-dev-tools,
-    qttools5-dev,
-    libgsettings-qt-dev,
-    libdtklog-dev,
-    doxygen,
-    qtbase5-private-dev,
-    qt6-base-dev-tools,
-    qt6-base-dev,
-    qt6-base-private-dev,
-    libdtk6log-dev,
-    qt6-tools-dev,
-    cmake
+    qttools5-dev-tools <!nodtk5>,
+    qttools5-dev <!nodtk5>,
+    libgsettings-qt-dev <!nodtk5>,
+    libdtklog-dev <!nodtk5>,
+    qtbase5-private-dev <!nodtk5>,
+    qt6-base-dev-tools <!nodtk6>,
+    qt6-base-dev <!nodtk6>,
+    qt6-base-private-dev <!nodtk6>,
+    libdtk6log-dev <!nodtk6>,
+    qt6-tools-dev <!nodtk6>,
+    doxygen <!nodoc>
 Standards-Version: 3.9.8
 
 Package: libdtk6core
@@ -53,6 +53,14 @@ Description: Development ToolKit Core Devel Library (DTK6 with Qt6)
  .
  This package contains the header files and development library symbolic links of DTK6 Core.
 
+Package: libdtk6core-doc
+Architecture: any
+Build-Profiles: <!nodtk6 !nodoc>
+Description: Development ToolKit Core Documentation
+ DTK Core is the base library of deepin Qt/C++ applications.
+ .
+ This package contains the doc files of DtkCore.
+
 Package: libdtkcore5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lshw

debian/libdtk6core-doc.install

@@ -0,0 +1 @@
+usr/share/qt6/doc/dtkcore.qch

debian/rules

@@ -28,7 +28,6 @@ endif
 endif
 
 DTK5_MAJOR_MINOR := $(shell echo $(DTK5_VERSION) | cut -d '.' -f 1,2)
-DTK6_MAJOR_MINOR := $(shell echo $(DTK6_VERSION) | cut -d '.' -f 1,2)
 BUILD_DOCS := $(if $(filter nodoc,$(DEB_BUILD_PROFILES)),OFF,ON)
 BUILD_DTK5 := $(if $(filter nodtk5,$(DEB_BUILD_PROFILES)),OFF,ON)
 BUILD_DTK6 := $(if $(filter nodtk6,$(DEB_BUILD_PROFILES)),OFF,ON)
@@ -38,36 +37,36 @@ BUILD_DTK6 := $(if $(filter nodtk6,$(DEB_BUILD_PROFILES)),OFF,ON)
 
 override_dh_auto_configure:
 ifeq ($(BUILD_DTK5),ON)
-	mkdir -p build-dtk5
-	QT_SELECT=qt5 dh_auto_configure --builddirectory=build-dtk5 -- $(DEB_CMAKE_EXTRA_FLAGS) -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=$(BUILD_DOCS) -DBUILD_VERSION=$(BUILD_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata -DDTK5=ON
+	mkdir -p build5
+	QT_SELECT=qt5 dh_auto_configure --builddirectory=build5 -- $(DEB_CMAKE_EXTRA_FLAGS) -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DBUILD_DOCS=$(BUILD_DOCS) -DBUILD_VERSION=$(BUILD_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata -DDTK5=ON
 endif
 ifeq ($(BUILD_DTK6),ON)
-	mkdir -p build-dtk6
-	dh_auto_configure --builddirectory=build-dtk6 -- $(DEB_CMAKE_EXTRA_FLAGS) -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DBUILD_VERSION=$(BUILD_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata -DDTK5=OFF
+	mkdir -p build6
+	dh_auto_configure --builddirectory=build6 -- $(DEB_CMAKE_EXTRA_FLAGS) -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DBUILD_DOCS=$(BUILD_DOCS) -DBUILD_VERSION=$(BUILD_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata -DDTK5=OFF
 endif
 
 override_dh_auto_build:
 ifeq ($(BUILD_DTK5),ON)
-	QT_SELECT=qt5 dh_auto_build --builddirectory=build-dtk5
+	QT_SELECT=qt5 dh_auto_build --builddirectory=build5
 endif
 ifeq ($(BUILD_DTK6),ON)
-	dh_auto_build --builddirectory=build-dtk6
+	dh_auto_build --builddirectory=build6
 endif
 
 override_dh_auto_install:
 ifeq ($(BUILD_DTK5),ON)
-	QT_SELECT=qt5 dh_auto_install --builddirectory=build-dtk5
+	QT_SELECT=qt5 dh_auto_install --builddirectory=build5
 endif
 ifeq ($(BUILD_DTK6),ON)
-	dh_auto_install --builddirectory=build-dtk6
+	dh_auto_install --builddirectory=build6
 endif
 
 override_dh_makeshlibs:
 ifeq ($(BUILD_DTK5),ON)
 	dh_makeshlibs -V "libdtkcore5 (>= $(DTK5_MAJOR_MINOR))" -plibdtkcore5
 endif
 ifeq ($(BUILD_DTK6),ON)
-	dh_makeshlibs -V "libdtk6core (>= $(DTK6_MAJOR_MINOR))" -plibdtk6core
+	dh_makeshlibs -V "libdtk6core (>= $(DTK6_VERSION))" -plibdtk6core
 endif
 
 override_dh_link:
@@ -80,8 +79,8 @@ endif
 
 override_dh_auto_test:
 ifeq ($(BUILD_DTK5),ON)
-	QT_SELECT=qt5 dh_auto_test --builddirectory=build-dtk5
+	QT_SELECT=qt5 dh_auto_test --builddirectory=build5
 endif
 ifeq ($(BUILD_DTK6),ON)
-	dh_auto_test --builddirectory=build-dtk6
+	dh_auto_test --builddirectory=build6
 endif

dtkcore.cmake

@@ -19,6 +19,7 @@ set (DSYSINFO_PREFIX "" CACHE STRING "PREFIX of DSysInfo")
 
 set (BUILD_EXAMPLES ON CACHE BOOL "Build examples")
 set (BUILD_VERSION "0" CACHE STRING "buildversion")
+option(BUIILD_TESTING "Build tests" OFF)
 
 if(UNIX AND NOT APPLE)
   set(LINUX TRUE)
@@ -38,9 +39,6 @@ else()
   # dtk6 not build doc
   set (BUILD_DOCS OFF CACHE BOOL "Generate doxygen-based documentation")
 endif()
-if (NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE Release)
-endif()
 
 if(NOT MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra")

tests/CMakeLists.txt

@@ -9,8 +9,10 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 # dbus
 set(CMAKE_CXX_FLAGS "-fno-access-control")
-add_compile_options(-fsanitize=address)
-add_link_options(-fsanitize=address)
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_options(-fsanitize=address)
+    add_link_options(-fsanitize=address)
+endif()
 
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
@@ -118,4 +120,9 @@ target_include_directories( ${BIN_NAME} PUBLIC
     ./testso/
 )
 
+# Set RPATH to find libvtabletest*.so in the build directory
+set_target_properties(${BIN_NAME} PROPERTIES
+    SKIP_BUILD_RPATH FALSE
+)
+
 gtest_discover_tests(${BIN_NAME})