From 8387f48130e954bfbc33a3e93809ba3ebe3e88fa Mon Sep 17 00:00:00 2001 From: cnc Date: Mon, 1 Jun 2026 21:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E8=BD=AE=E5=8F=AA=E6=8E=A8=E8=BF=9B?= =?UTF-8?q?=E5=90=88=E7=90=86=E9=80=82=E9=87=8F=E7=9A=84=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E6=96=87=E3=80=81=E7=A6=81=E6=AD=A2=E9=A1=BA=E6=89=8B=E6=89=A9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20smoke=EF=BC=9A=E8=A1=A5=E5=85=85tripod?= =?UTF-8?q?=E8=BF=90=E5=8A=A8=E5=AD=A6=E6=BA=90=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结论：第2组 kinematics manifest 补充 LinuxCNC tripod.ini、tripodsim.hal、TkLinuxCNC README 和 tripodkins manpage 源，并在轻量 manifest 校验中固定这些 source coverage；native/source-link 均复用增量构建，没有触发慢编译。 --- check-linuxcnc-inputs.sh | 24 ++++++++++++++++++++++++ linuxcnc-kinematics-source-files.txt | 4 ++++ test-native.sh | 8 +++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/check-linuxcnc-inputs.sh b/check-linuxcnc-inputs.sh index 818648f..8cd7869 100755 --- a/check-linuxcnc-inputs.sh +++ b/check-linuxcnc-inputs.sh @@ -690,6 +690,30 @@ if [[ -n "$manifest" && "$require_complete" == "--require-kinematics-complete" ] exit 1 fi + required_tripod_asset_sources=( + configs/sim/tklinuxcnc/tripod.ini + lib/hallib/tripodsim.hal + configs/sim/tklinuxcnc/README + ) + missing_tripod_asset_sources=() + for source in "${required_tripod_asset_sources[@]}"; do + if ! printf '%s\n' "${manifest_asset_sources[@]}" | grep -Fx -- "$source" >/dev/null; then + missing_tripod_asset_sources+=("$source") + fi + done + if ((${#missing_tripod_asset_sources[@]} > 0)); then + echo "manifest does not cover LinuxCNC tripod kinematics INI/HAL sources as asset sources: $manifest" >&2 + printf 'missing tripod kinematics asset source: %s\n' "${missing_tripod_asset_sources[@]}" >&2 + exit 1 + fi + + required_tripod_metadata_source=docs/man/man9/tripodkins.9 + if ! printf '%s\n' "${manifest_metadata_sources[@]}" | grep -Fx -- "$required_tripod_metadata_source" >/dev/null; then + echo "manifest does not cover LinuxCNC tripodkins manpage source: $manifest" >&2 + printf 'missing tripodkins metadata source: %s\n' "$required_tripod_metadata_source" >&2 + exit 1 + fi + resolve_vismach_loadusr_source() { local command_name=$1 case "$command_name" in diff --git a/linuxcnc-kinematics-source-files.txt b/linuxcnc-kinematics-source-files.txt index 1362ab4..2bbda91 100644 --- a/linuxcnc-kinematics-source-files.txt +++ b/linuxcnc-kinematics-source-files.txt @@ -66,6 +66,9 @@ asset:configs/sim/axis/rose_engine/rose_engine.halshow:rose engine halshow asset asset:configs/sim/axis/rose_engine/rcone.ngc:rose engine NGCGUI subroutine source referenced by rose_engine INI asset:configs/sim/axis/rose_engine/rcone_demo.ngc:rose engine OPEN_FILE demo source referenced by rose_engine INI asset:configs/sim/axis/rose_engine/README:rose engine configuration source notes adjacent to rosekins coverage +asset:configs/sim/tklinuxcnc/tripod.ini:TkLinuxCNC tripod KINEMATICS source for LinuxCNC tripodkins coverage +asset:lib/hallib/tripodsim.hal:tripod HALFILE source wiring tripodkins geometry pins +asset:configs/sim/tklinuxcnc/README:TkLinuxCNC configuration notes referencing tripod.ini config:configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.ini:XYZAB table dual rotary MACHINE/KINEMATICS and M428/M429 remap configuration source config:configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr-postgui.hal:XYZAB table dual rotary POSTGUI_HALFILE source referenced by M428/M429 switchkins config config:configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.ini:XYZAC TRT switchkins HAL parameter source used by M428 coverage @@ -241,6 +244,7 @@ metadata:docs/src/man/man1/xyzbc-trt-gui.1.adoc:LinuxCNC XYZBC TRT vismach GUI c metadata:src/objects/hal/components/corexy_by_hal.mak:halcompile-generated CoreXY component make metadata metadata:src/objects/man/man9/corexy_by_hal.9.adoc:halcompile-generated CoreXY component manpage source metadata:docs/src/man/man9/rosekins.9.adoc:LinuxCNC rosekins manpage source referenced by rose engine README +metadata:docs/man/man9/tripodkins.9:LinuxCNC tripodkins generated manpage source aliasing kins documentation metadata:src/objects/hal/components/matrixkins.mak:halcompile-generated matrixkins make metadata adjacent to generated kinematics source metadata:src/objects/hal/components/millturn.mak:halcompile-generated millturn make metadata adjacent to generated kinematics source metadata:src/objects/hal/components/userkins.mak:halcompile-generated userkins make metadata adjacent to generated kinematics source diff --git a/test-native.sh b/test-native.sh index 92d4f22..55148c9 100755 --- a/test-native.sh +++ b/test-native.sh @@ -214,6 +214,12 @@ grep -Fx "configs/sim/axis/rose_engine/README" "$kinematics_manifest_sources" >/ grep -Fx "docs/src/man/man9/rosekins.9.adoc" "$kinematics_manifest_sources" >/dev/null grep -F 'manifest does not cover LinuxCNC rose engine kinematics INI/NGC/demo sources as asset sources' check-linuxcnc-inputs.sh >/dev/null grep -F 'manifest does not cover LinuxCNC rosekins manpage source' check-linuxcnc-inputs.sh >/dev/null +grep -Fx "configs/sim/tklinuxcnc/tripod.ini" "$kinematics_manifest_sources" >/dev/null +grep -Fx "lib/hallib/tripodsim.hal" "$kinematics_manifest_sources" >/dev/null +grep -Fx "configs/sim/tklinuxcnc/README" "$kinematics_manifest_sources" >/dev/null +grep -Fx "docs/man/man9/tripodkins.9" "$kinematics_manifest_sources" >/dev/null +grep -F 'manifest does not cover LinuxCNC tripod kinematics INI/HAL sources as asset sources' check-linuxcnc-inputs.sh >/dev/null +grep -F 'manifest does not cover LinuxCNC tripodkins manpage source' check-linuxcnc-inputs.sh >/dev/null grep -Fx "configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.ini" "$kinematics_manifest_sources" >/dev/null grep -Fx "configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.ini" "$kinematics_manifest_sources" >/dev/null grep -Fx "configs/sim/axis/vismach/5axis/bridgemill/5axis.ini" "$kinematics_manifest_sources" >/dev/null @@ -304,7 +310,7 @@ grep -Fx "configs/sim/axis/vismach/melfa-sim/README" "$kinematics_manifest_sourc grep -Fx "configs/sim/axis/vismach/millturn/README" "$kinematics_manifest_sources" >/dev/null grep -Fx "configs/sim/axis/vismach/puma/README" "$kinematics_manifest_sources" >/dev/null grep -Fx "configs/sim/axis/vismach/scara/README" "$kinematics_manifest_sources" >/dev/null -if [[ "$(grep -Ec '/README$' "$kinematics_manifest_sources")" -ne 12 ]]; then +if [[ "$(grep -Ec '/README$' "$kinematics_manifest_sources")" -ne 13 ]]; then echo "expected kinematics manifest to cover all tracked LinuxCNC README sources adjacent to kinematics INI files" >&2 exit 1 fi