Skip to content

Commit 2a2d1a4

Browse files
committed
fix: remove DTK version mapping for unified build
Removed DTK5 and DTK6 version mapping logic from debian/rules file. The DTK5_VERSION, DTK6_VERSION, and DTK5_MAJOR_MINOR variables are no longer needed since DTK5 and DTK6 now use consistent version numbers. Also removed the override_dh_makeshlibs target that was using these version variables for setting shared library dependencies. This change is part of the DTK unified build transformation where DTK5 and DTK6 versions are now aligned, eliminating the need for separate version mapping logic. The build system can now use the same version numbers for both DTK5 and DTK6 components. Influence: 1. Verify that DTK5 and DTK6 packages build successfully without version mapping 2. Test that shared library dependencies are correctly handled without manual version overrides 3. Ensure build profiles (nodtk5, nodtk6) still work correctly 4. Check that documentation builds properly with BUILD_DOCS flag 5. Validate that both build5 and build6 directories are still properly cleaned fix: 移除DTK版本映射以实现统一构建 从debian/rules文件中移除了DTK5和DTK6版本映射逻辑。由于DTK5和DTK6现在使用 一致的版本号,不再需要DTK5_VERSION、DTK6_VERSION和DTK5_MAJOR_MINOR变量。 同时移除了使用这些版本变量设置共享库依赖的override_dh_makeshlibs目标。 此变更是DTK统一构建改造的一部分,DTK5和DTK6版本现已对齐,无需单独的版本 映射逻辑。构建系统现在可以为DTK5和DTK6组件使用相同的版本号。 Influence: 1. 验证DTK5和DTK6包在没有版本映射的情况下能成功构建 2. 测试共享库依赖在没有手动版本覆盖的情况下能正确处理 3. 确保构建配置文件(nodtk5、nodtk6)仍能正常工作 4. 检查文档构建是否仍能正确使用BUILD_DOCS标志 5. 验证build5和build6目录是否仍能被正确清理
1 parent a40c953 commit 2a2d1a4

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

debian/rules

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_BUILD_RPATH=ON
1414
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
1515
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
1616

17-
# 版本映射:x.y.z -> 5.y.z 和 6.y.z
18-
DTK5_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/5\1/')
19-
DTK6_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed -E 's/^[0-9]+(\.|[^0-9]|$$)/6\1/')
20-
DTK5_MAJOR_MINOR := $(shell echo $(DTK5_VERSION) | cut -d '.' -f 1,2)
21-
2217
# Build-Profiles 控制
2318
BUILD_DOCS := $(if $(filter nodoc,$(DEB_BUILD_PROFILES)),OFF,ON)
2419
BUILD_DTK5 := $(if $(filter nodtk5,$(DEB_BUILD_PROFILES)),OFF,ON)
@@ -73,14 +68,6 @@ ifeq ($(BUILD_DTK6),ON)
7368
dh_auto_test --builddirectory=build6
7469
endif
7570

76-
override_dh_makeshlibs:
77-
ifeq ($(BUILD_DTK5),ON)
78-
dh_makeshlibs -V "libdtkwidget5 (>= $(DTK5_MAJOR_MINOR))" -plibdtkwidget5
79-
endif
80-
ifeq ($(BUILD_DTK6),ON)
81-
dh_makeshlibs -V "libdtk6widget (>= $(DTK6_VERSION))" -plibdtk6widget
82-
endif
83-
8471
override_dh_auto_clean:
8572
dh_auto_clean --builddirectory=build5
8673
dh_auto_clean --builddirectory=build6

0 commit comments

Comments
 (0)