Commit 8c8651e
committed
refactor: unify DTK5/DTK6 build system
1. Replaced PROJECT_VERSION_MAJOR-based Qt version detection with
explicit DTK5/DTK6 build option
2. Added DTK5 CMake option (default ON) to control DTK5 vs DTK6 builds
3. Updated DTK_VERSION calculation to use DTK_VERSION_MAJOR from build
option instead of PROJECT_VERSION_MAJOR
4. Modified CMake logic to conditionally build wayland plugin only for
DTK5 builds
5. Restructured debian/control to support both DTK5 and DTK6 packages
with Build-Profiles
6. Added new dde-qt6xcb-plugin package for DTK6 builds
7. Implemented separate build directories (build-dtk5, build-dtk6) in
debian/rules for parallel builds
8. Added build profile support (nodtk5, nodtk6) to control which
packages are built
9. Updated package descriptions to clearly indicate DTK5/Qt5 vs DTK6/
Qt6 versions
Log: Updated build system to support both DTK5 and DTK6 versions
Influence:
1. Test building with default settings (DTK5=ON) to ensure DTK5 builds
work
2. Test building with DTK5=OFF to verify DTK6 builds work correctly
3. Verify that wayland plugin is only built for DTK5 builds
4. Test package generation with different build profiles (nodtk5,
nodtk6)
5. Verify that both dde-qt5xcb-plugin and dde-qt6xcb-plugin packages are
created correctly
6. Test installation of both DTK5 and DTK6 packages on appropriate
systems
7. Verify plugin paths are correct (Qt5 vs Qt6 plugin directories)
refactor: 统一DTK5/DTK6构建系统
1. 将基于PROJECT_VERSION_MAJOR的Qt版本检测改为显式的DTK5/DTK6构建选项
2. 添加DTK5 CMake选项(默认开启)来控制DTK5与DTK6构建
3. 更新DTK_VERSION计算,使用构建选项中的DTK_VERSION_MAJOR而非
PROJECT_VERSION_MAJOR
4. 修改CMake逻辑,仅对DTK5构建有条件地构建wayland插件
5. 重构debian/control以支持带有Build-Profiles的DTK5和DTK6包
6. 为DTK6构建添加新的dde-qt6xcb-plugin包
7. 在debian/rules中实现独立的构建目录(build-dtk5, build-dtk6)用于并行
构建
8. 添加构建配置文件支持(nodtk5, nodtk6)来控制构建哪些包
9. 更新包描述以清晰标明DTK5/Qt5与DTK6/Qt6版本
Log: 更新构建系统以支持DTK5和DTK6版本
Influence:
1. 使用默认设置(DTK5=ON)测试构建,确保DTK5构建正常工作
2. 使用DTK5=OFF测试构建,验证DTK6构建正确工作
3. 验证wayland插件仅对DTK5构建进行构建
4. 使用不同的构建配置文件(nodtk5, nodtk6)测试包生成
5. 验证dde-qt5xcb-plugin和dde-qt6xcb-plugin包都正确创建
6. 在适当的系统上测试DTK5和DTK6包的安装
7. 验证插件路径正确(Qt5与Qt6插件目录)1 parent da1e171 commit 8c8651e
File tree
6 files changed
+130
-31
lines changed- archlinux
- debian
- tests
6 files changed
+130
-31
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | | - | |
| 7 | + | |
| 8 | + | |
10 | 9 | | |
11 | 10 | | |
12 | | - | |
| 11 | + | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
30 | 27 | | |
31 | | - | |
| 28 | + | |
32 | 29 | | |
33 | | - | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
34 | 37 | | |
35 | 38 | | |
36 | 39 | | |
| |||
48 | 51 | | |
49 | 52 | | |
50 | 53 | | |
51 | | - | |
| 54 | + | |
52 | 55 | | |
53 | 56 | | |
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
57 | 60 | | |
58 | | - | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
26 | | - | |
| 25 | + | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
15 | 46 | | |
16 | 47 | | |
17 | 48 | | |
| |||
21 | 52 | | |
22 | 53 | | |
23 | 54 | | |
24 | | - | |
| 55 | + | |
| 56 | + | |
25 | 57 | | |
26 | 58 | | |
27 | 59 | | |
28 | 60 | | |
29 | 61 | | |
30 | | - | |
| 62 | + | |
| 63 | + | |
31 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
2 | 4 | | |
3 | 5 | | |
4 | 6 | | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
8 | 10 | | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
9 | 15 | | |
10 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
11 | 57 | | |
12 | 58 | | |
13 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
30 | | - | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
31 | 34 | | |
32 | 35 | | |
33 | 36 | | |
| |||
68 | 71 | | |
69 | 72 | | |
70 | 73 | | |
| 74 | + | |
| 75 | + | |
0 commit comments