Follow sibling binary renames and rename m4b harness to mps_tests_m4b_hello.

yanxijian · yanxijian · commit 3f92516632b3 · 2026-07-27T21:28:42.000+08:00
Resolve qte_engine / qfr_ribbon (QFluentRibbon::ribbon) for demos; drop obsolete QFR_DEV_EMBED flag from install_stack.
diff --git a/clients/python/README.md b/clients/python/README.md
@@ -25,7 +25,7 @@ python test_frame_envelope.py
 ## 对接 Host / 烟测 harness
 
 需本机有一个 `QLocalServer` 在 `--endpoint` 上监听，并在收到 `Hello` 后回 `HelloAck`。  
-CMake 目标 `mps_m4b_python_hello`（需 Qt）会拉起本脚本并完成握手。
+CMake 目标 `mps_tests_m4b_hello`（需 Qt）会拉起本脚本并完成握手。
 
 手动：
 
diff --git a/cmake/MPSQFluentRibbon.cmake b/cmake/MPSQFluentRibbon.cmake
@@ -6,13 +6,13 @@ set(MPS_QFR_SOURCE_DIR "" CACHE PATH "Path to QFluentRibbon sources when MPS_DEV
 set(_mps_have_qfr FALSE)
 set(MPS_QFR_VIA_SOURCE FALSE)
 
-if(TARGET QFluentRibbon::qfluentribbon OR TARGET qfluentribbon)
+if(TARGET QFluentRibbon::ribbon OR TARGET qfr_ribbon)
   set(_mps_have_qfr TRUE)
 else()
   find_package(QFluentRibbon CONFIG QUIET)
-  if(TARGET QFluentRibbon::qfluentribbon)
+  if(TARGET QFluentRibbon::ribbon)
     set(_mps_have_qfr TRUE)
-    message(STATUS "MultiProcessShell demos: using installed QFluentRibbon::qfluentribbon")
+    message(STATUS "MultiProcessShell demos: using installed QFluentRibbon::ribbon")
   endif()
 endif()
 
@@ -24,7 +24,7 @@ if(NOT _mps_have_qfr AND MPS_DEV_EMBED_QFR)
     set(QFR_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
     set(QFR_BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(QFR_INSTALL OFF CACHE BOOL "" FORCE)
-    add_subdirectory("${MPS_QFR_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/_deps/qfluentribbon" EXCLUDE_FROM_ALL)
+    add_subdirectory("${MPS_QFR_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/_deps/qfr" EXCLUDE_FROM_ALL)
     set(_mps_have_qfr TRUE)
     set(MPS_QFR_VIA_SOURCE TRUE)
     message(STATUS "MultiProcessShell demos: DEV embed QFluentRibbon from ${MPS_QFR_SOURCE_DIR}")
@@ -38,8 +38,8 @@ if(NOT _mps_have_qfr)
     "  Or: -DMPS_DEV_EMBED_QFR=ON [-DMPS_QFR_SOURCE_DIR=...]")
 endif()
 
-if(TARGET QFluentRibbon::qfluentribbon)
-  set(MPS_QFR_TARGET QFluentRibbon::qfluentribbon)
+if(TARGET QFluentRibbon::ribbon)
+  set(MPS_QFR_TARGET QFluentRibbon::ribbon)
 else()
-  set(MPS_QFR_TARGET qfluentribbon)
+  set(MPS_QFR_TARGET qfr_ribbon)
 endif()
diff --git a/cmake/MPSQThemeEngine.cmake b/cmake/MPSQThemeEngine.cmake
@@ -6,7 +6,7 @@ set(MPS_QTE_SOURCE_DIR "" CACHE PATH "Path to QThemeEngine sources when MPS_DEV_
 set(_mps_have_qte FALSE)
 set(MPS_QTE_VIA_SOURCE FALSE)
 
-if(TARGET QThemeEngine::engine OR TARGET qtheme_engine)
+if(TARGET QThemeEngine::engine OR TARGET qte_engine)
   set(_mps_have_qte TRUE)
 else()
   find_package(QThemeEngine CONFIG QUIET)
@@ -42,5 +42,5 @@ endif()
 if(TARGET QThemeEngine::engine)
   set(MPS_QTE_TARGET QThemeEngine::engine)
 else()
-  set(MPS_QTE_TARGET qtheme_engine)
+  set(MPS_QTE_TARGET qte_engine)
 endif()
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
@@ -66,7 +66,7 @@ if(WIN32 AND MPS_BUILD_SHARED)
   endif()
   add_custom_command(TARGET mps_demo_host POST_BUILD
     ${_mps_demo_dll_copy_cmds}
-    COMMENT "Copy mps_*.dll + protobuf runtime + qtheme_engine + qfluentribbon beside demos"
+    COMMENT "Copy mps_*.dll + protobuf runtime + qte_engine + qfr_ribbon beside demos"
     VERBATIM
   )
 endif()
diff --git a/docs/en/build.md b/docs/en/build.md
@@ -4,7 +4,7 @@
 
 ## Architecture
 
-Framework DLLs are independent: `qtheme_engine`, `qfluentribbon`, and `mps_*` do **not** link each other. Demos compose them (`mps_demo_host`→QTE, `mps_demo_client`→QFR+QTE).
+Framework DLLs are independent: `qte_engine`, `qfr_ribbon`, and `mps_*` do **not** link each other. Demos compose them (`mps_demo_host`→QTE, `mps_demo_client`→QFR+QTE).
 
 ```bat
 set QTDIR=D:\Codes\Qt6.8.4
diff --git a/docs/en/demo-acceptance.md b/docs/en/demo-acceptance.md
@@ -68,4 +68,4 @@ Manual regression. Finish this list before later polish (tab overflow, REQ timeo
 ## M4b (multi-language Hello, optional)
 
 - [ ] `python clients/python/test_frame_envelope.py` passes
-- [ ] `ctest -R M4bPythonHello` (or `mps_m4b_python_hello`) passes: Python `Hello(EMBED_NONE)` ↔ `HelloAck`
+- [ ] `ctest -R M4bPythonHello` (or `mps_tests_m4b_hello`) passes: Python `Hello(EMBED_NONE)` ↔ `HelloAck`
diff --git a/docs/en/dev-plan.md b/docs/en/dev-plan.md
@@ -37,7 +37,7 @@ Scan top recommendation: ~~**wid → embed** first~~ **done**; peel Shell rules
 
 | Direction | Posture |
 |-----------|---------|
-| ~~M4b Python Hello~~ | **Done** — `hello_client.py`, offline `test_frame_envelope.py`, Qt harness `mps_m4b_python_hello` |
+| ~~M4b Python Hello~~ | **Done** — `hello_client.py`, offline `test_frame_envelope.py`, Qt harness `mps_tests_m4b_hello` |
 | M5 tear-out / merge | **Closable** (G1/G4 fixed; G2/G3 Demo Client no-op) — [gap audit](../zh/m5-gap-audit.md) |
 | ~~M6 heartbeat / unhealthy UI~~ | **Done** — `heartbeat_policy.hpp`; Client 2s EVT; Host 6s Unhealthy; tab suffix + terminate |
 | x11 / inproc / multi-client | `IEmbedBackend` next (`wid` already localized) |
diff --git a/docs/zh/build.md b/docs/zh/build.md
@@ -6,11 +6,11 @@
 
 | 库 | 依赖 |
 |----|------|
-| `qtheme_engine` | 仅 Qt |
-| `qfluentribbon` | 仅 Qt（本地 `ribbon_tokens`；不链 QTE） |
+| `qte_engine` | 仅 Qt |
+| `qfr_ribbon` | 仅 Qt（本地 `ribbon_tokens`；不链 QTE） |
 | `mps_*` | Qt + protobuf（不链 QTE/QFR） |
 
-QTE / QFR 仅由 **Demo** 链接：`mps_demo_host`→QTE，`mps_demo_client`→QFR+QTE，`qfr_gallery`→QFR+QTE。
+QTE / QFR 仅由 **Demo** 链接：`mps_demo_host`→QTE，`mps_demo_client`→QFR+QTE。
 
 ## 推荐：本地 prefix
 
diff --git a/docs/zh/demo-acceptance.md b/docs/zh/demo-acceptance.md
@@ -69,4 +69,4 @@
 ## M4b（多语言 Hello，可选）
 
 - [ ] `python clients/python/test_frame_envelope.py` 通过
-- [ ] `ctest -R M4bPythonHello`（或跑 `mps_m4b_python_hello`）通过：Python `Hello(EMBED_NONE)` ↔ Host 侧 `HelloAck`
+- [ ] `ctest -R M4bPythonHello`（或跑 `mps_tests_m4b_hello`）通过：Python `Hello(EMBED_NONE)` ↔ Host 侧 `HelloAck`
diff --git a/docs/zh/dev-plan.md b/docs/zh/dev-plan.md
@@ -45,7 +45,7 @@
 
 | 方向 | 建议姿态 |
 |------|----------|
-| ~~M4b Python Hello~~ | **完成**：`hello_client.py` + 离线 `test_frame_envelope.py` + Qt 烟测 `mps_m4b_python_hello` |
+| ~~M4b Python Hello~~ | **完成**：`hello_client.py` + 离线 `test_frame_envelope.py` + Qt 烟测 `mps_tests_m4b_hello` |
 | M5 拖出 / 合入 | **可关账**（G1/G4 已修；G2/G3 Demo Client no-op）— [m5-gap-audit.md](m5-gap-audit.md) |
 | ~~M6 心跳 / 无响应 UI~~ | **完成**：`heartbeat_policy.hpp`；Client 2s EVT；Host 6s Unhealthy；Tab 后缀 + 右键终止 |
 | x11 / inproc / 多类型 Client | 前：~~wid 后置 +~~ `IEmbedBackend`（wid 已后置） |
diff --git a/scripts/install_stack.py b/scripts/install_stack.py
@@ -138,7 +138,6 @@ def main() -> int:
             extra_defs=[
                 "-DQFR_BUILD_SHARED=ON",
                 "-DQFR_INSTALL=ON",
-                "-DQFR_DEV_EMBED_QTE=OFF",
                 "-DQFR_BUILD_TESTS=OFF",
                 "-DQFR_BUILD_EXAMPLES=ON",
             ],
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -60,33 +60,33 @@ if(MPS_PYTHON)
 endif()
 
 if(TARGET mps::ipc_qt)
-  add_executable(mps_m4b_python_hello
+  add_executable(mps_tests_m4b_hello
     test_m4b_python_hello.cpp
   )
-  target_compile_definitions(mps_m4b_python_hello
+  target_compile_definitions(mps_tests_m4b_hello
     PRIVATE
       MPS_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
   )
-  target_link_libraries(mps_m4b_python_hello
+  target_link_libraries(mps_tests_m4b_hello
     PRIVATE
       mps::ipc_qt
       GTest::gtest_main
       Qt6::Core
       Qt6::Network
   )
-  set_target_properties(mps_m4b_python_hello PROPERTIES AUTOMOC ON)
+  set_target_properties(mps_tests_m4b_hello PROPERTIES AUTOMOC ON)
   if(WIN32 AND MPS_BUILD_SHARED)
-    add_custom_command(TARGET mps_m4b_python_hello POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:mps_ipc> $<TARGET_FILE_DIR:mps_m4b_python_hello>
-      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:mps_ipc_qt> $<TARGET_FILE_DIR:mps_m4b_python_hello>
-      COMMENT "Copy mps_ipc*.dll beside mps_m4b_python_hello"
+    add_custom_command(TARGET mps_tests_m4b_hello POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:mps_ipc> $<TARGET_FILE_DIR:mps_tests_m4b_hello>
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:mps_ipc_qt> $<TARGET_FILE_DIR:mps_tests_m4b_hello>
+      COMMENT "Copy mps_ipc*.dll beside mps_tests_m4b_hello"
       VERBATIM
     )
-    mps_copy_protobuf_runtime(mps_m4b_python_hello)
+    mps_copy_protobuf_runtime(mps_tests_m4b_hello)
     # Do not bake PATH into the test ENVIRONMENT: CTest treats ';' as a list
     # separator and truncates PATH, which breaks finding python.exe / Qt DLLs.
-    gtest_discover_tests(mps_m4b_python_hello DISCOVERY_MODE PRE_TEST)
+    gtest_discover_tests(mps_tests_m4b_hello DISCOVERY_MODE PRE_TEST)
   else()
-    gtest_discover_tests(mps_m4b_python_hello)
+    gtest_discover_tests(mps_tests_m4b_hello)
   endif()
 endif()
diff --git a/tests/test_m4b_python_hello.cpp b/tests/test_m4b_python_hello.cpp
@@ -41,7 +41,7 @@ namespace
 TEST(M4bPythonHello, HelloAckOverLocalSocket)
 {
 	int argc = 1;
-	char arg0[] = "mps_m4b_python_hello";
+	char arg0[] = "mps_tests_m4b_hello";
 	char* argv[] = {arg0, nullptr};
 	QCoreApplication app(argc, argv);
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ if(WIN32 AND MPS_BUILD_SHARED)`
`66`	`66`	`endif()`
`67`	`67`	`add_custom_command(TARGET mps_demo_host POST_BUILD`
`68`	`68`	`${_mps_demo_dll_copy_cmds}`
`69`		`- COMMENT "Copy mps_*.dll + protobuf runtime + qtheme_engine + qfluentribbon beside demos"`
	`69`	`+ COMMENT "Copy mps_*.dll + protobuf runtime + qte_engine + qfr_ribbon beside demos"`
`70`	`70`	`VERBATIM`
`71`	`71`	`)`
`72`	`72`	`endif()`