Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions plugins/opentest_sonodaq_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@ set(_sonodaq_sdk_default_library "")
if(WIN32)
set(_sonodaq_sdk_default_root "${CMAKE_CURRENT_LIST_DIR}/windows/sonodaq-sdk-1.4.0-windows-x64-cpp")
endif()
if(APPLE)
set(_sonodaq_sdk_default_root "${CMAKE_CURRENT_LIST_DIR}/macos/sonodaq-sdk-1.4.0-macos-arm64-cpp")
endif()
set(SONODAQ_SDK_ROOT "${_sonodaq_sdk_default_root}" CACHE PATH "Root of the matching SonoDAQ C++ SDK package")
if(WIN32 AND SONODAQ_SDK_ROOT)
set(_sonodaq_sdk_default_library "${SONODAQ_SDK_ROOT}/sdk/lib/crydaqwrapper.lib")
endif()
if(APPLE AND SONODAQ_SDK_ROOT)
set(_sonodaq_sdk_default_library "${SONODAQ_SDK_ROOT}/sdk/lib/libcrydaqwrapper.dylib")
endif()
set(SONODAQ_SDK_LIBRARY "${_sonodaq_sdk_default_library}" CACHE FILEPATH "SonoDAQ crydaqwrapper import library")
set(SONODAQ_SDK_INCLUDE "${OPENTEST_REPOSITORY_ROOT}/include/cry_opendaq")
if(SONODAQ_SDK_ROOT)
Expand Down
2 changes: 1 addition & 1 deletion plugins/opentest_sonodaq_plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cmake -S plugins/opentest_sonodaq_plugin -B ../OpenTest-Plugins-build/sonodaq -G
cmake --build ../OpenTest-Plugins-build/sonodaq --config Release --target OpenTestSonoDaqDevicePlugin --parallel
```

Windows 默认使用随目录提供的 SDK 1.4.0。`SONODAQ_SDK_ROOT` 和 `SONODAQ_SDK_LIBRARY` 可覆盖 SDK 目录及导入库。当前源码使用 SDK 1.4 的 CAN、primitive connection 和 control 接口。不再随仓库提供旧版 macOS SDK 1.3.7;macOS 和 Linux 完整构建都需要另行提供匹配平台的 SDK 1.4/runtime,并通过 `SONODAQ_SDK_ROOT` 指定。
Windows 默认使用随目录提供的 SDK 1.4.0。`SONODAQ_SDK_ROOT` 和 `SONODAQ_SDK_LIBRARY` 可覆盖 SDK 目录及导入库。当前源码使用 SDK 1.4 的 CAN、primitive connection 和 control 接口。macOS 默认使用随目录提供的 ARM64 SDK 1.4.0,最低系统为 macOS 26,构建及打包说明见 [macOS](macos/README.zh-CN.md)。Linux 完整构建仍需另行提供匹配平台的 SDK 1.4/runtime,并通过 `SONODAQ_SDK_ROOT` 指定。

专属测试及 CMake 配置位于本目录 `tests/`,只依赖公共 SDK 和厂商 SDK。`SONODAQ_BUILD_TESTS` 默认 `ON`,使用公共 SDK 和适配的厂商 SDK 构建,再执行 `ctest --test-dir <build-directory> -C Release --output-on-failure`。

Expand Down
17 changes: 17 additions & 0 deletions plugins/opentest_sonodaq_plugin/macos/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# SonoDAQ macOS ARM64

The bundled headers, import dylib and complete runtime come from the official [SDK 1.4.0 release](https://github.com/crysound/sonodaq-sdk/releases/tag/v1.4.0). Archive SHA-256: `b439b4663174fdf2c71fce2e960791313d0a1beb7d106f5a462db2452e201d5b`. Vendor SDK bytes are unchanged. Examples and test programs are not bundled. The SDK requires macOS 26; this is separate from the core OpenTest runtime's macOS 12 minimum.

From the plugin repository, with sibling OpenTest sources:

```sh
cmake -S plugins/opentest_sonodaq_plugin -B ../OpenTest-Plugins-build/macos -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=26.0 -DCMAKE_CXX_FLAGS="-ffile-prefix-map=$HOME=/build"
cmake --build ../OpenTest-Plugins-build/macos --parallel 4
ctest --test-dir ../OpenTest-Plugins-build/macos --output-on-failure
cmake --install ../OpenTest-Plugins-build/macos --prefix ../OpenTest-Plugins-build/install
python3 plugins/opentest_sonodaq_plugin/package/publish-macos.py --library ../OpenTest-Plugins-build/install/lib/libOpenTestSonoDaqDevicePlugin.dylib --stage ../OpenTest-Plugins-build/package-stage --output dist --framework ../OpenTest/apps/native
```

The packaging stage must be empty. It strips debug/local symbols from copies, verifies that exported symbols are unchanged, and signs the staged dylibs ad hoc. All SDK modules remain present. This brings the expanded payload below the host's 128 MiB limit. The vendor SDK source files remain unchanged. SDK internal development paths have not been redacted.

Validation: Release compilation and staged SDK/module loading succeeded. The earlier 14/14 root CTest result used shared runtime fixes from OpenTest commit `10dced55`; those fixes have been withdrawn from the macOS PR as unrelated scope. That result is historical and does not establish that the current companion branch passes all root tests. Property payload length and channel-scoped streaming tests require separate owner triage. The previously generated local package also used those withdrawn fixes and must not be treated as a release artifact for the current branch. No hardware acceptance has been performed.
7 changes: 7 additions & 0 deletions plugins/opentest_sonodaq_plugin/macos/README.zh-CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# SonoDAQ macOS ARM64

随仓库提供官方 SDK 1.4.0 的头文件、链接动态库及完整 runtime;原始 SDK 文件保持不变。下载来源和 SHA-256 见 [英文说明](README.md)。不包含示例和测试程序。SDK 最低要求 macOS 26,与核心 OpenTest 的 macOS 12 要求不同。

构建、测试、安装和打包命令见英文说明。打包暂存目录必须为空。脚本仅对暂存副本移除调试及局部符号,核对全部导出符号不变后执行临时签名,保留全部 SDK 模块,使解压大小满足宿主的 128 MiB 限制。厂商 SDK 内部开发路径未脱敏。

验证:Release 编译及暂存 SDK/模块加载已通过。此前根 CTest 14/14 的结果使用了 OpenTest 提交 `10dced55` 的共享运行时修复;这些修复已作为无关范围从 macOS PR 撤出,因此历史结果不代表当前配套分支全部测试通过。属性字符串长度、通道运行状态相关测试交由对应维护者另行排查。此前本地生成的插件包也使用了已撤出的修复,不能作为当前分支的发布产物。尚未完成真机验收。
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"sdkVersion": "1.4.0",
"language": "cpp",
"headerLayout": "compact",
"targetPlatform": "macos-arm64",
"distribution": "public",
"configuration": "Release"
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Compact C++ SDK headers

Include <workflow.h> or <primitive.h>; include both when using both domains.
Link the SDK libraries as usual.
The split header paths are not included in this layout. Use this complete include
directory instead of overlaying it onto a modular SDK installation.
The optional opendaq_interop.h still needs the matching openDAQ SDK.
See ../docs/install_package_usage.md and ../docs/build-info/amalgamation-manifest.json.
Loading
Loading