An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Copy Harmony headers only to the shared include directory
Daniel152670eb642f
diff --git a/docs/RELEASE-VERIFICATION.zh-CN.md b/docs/RELEASE-VERIFICATION.zh-CN.mdindex ffa84beabf..c369c0042f 100644--- a/docs/RELEASE-VERIFICATION.zh-CN.md+++ b/docs/RELEASE-VERIFICATION.zh-CN.md@@ -318,7 +318,7 @@ python -X utf8 scripts/verify-release.py check D:/releases/siyuan --version 3.8.- Android 在本次临时目录生成新 AAR,确认内核版本和架构后复制到工程;生成并复制新 `app.zip`,再运行 `gradlew clean buildReleaseTask` 生成四个渠道包;官方版收集为 `siyuan-版本号.apk`(例如 `siyuan-3.8.6.apk`),不带 `official` 或 `release` 后缀,其他渠道保持原文件名- 鸿蒙先构建并复制 ARM64 内核,再构建并复制 x86_64 内核,避免同名 `libkernel.so` 被覆盖后拷错;使用同一份新 `app.zip`,通过 Hvigor release 模式执行 `assembleApp`,对应 DevEco Studio 的“构建 - 编译 Hap(s)/APP(s) - 编译 APP(s)”,只收集 `build/outputs/default/siyuan-harmony-default-signed.app`,缺少签名产物时失败,不收集 `unsigned.app` 或单独的 HAP- 每条命令失败立即停止,产物必须是本次生成,复制时再次核对摘要-- 鸿蒙各架构内核构建后同时复制构建目录中的 `.h` 文件到对应 `entry/libs/<ABI>/`,并将 ARM64 的头文件同步到 `entry/src/main/cpp/include/`;`libkernel.h` 必须为本次生成,`lan_sync_bridge.h` 若由构建目录提供则同步,否则保留工程中维护的版本,缺少必需头文件时停止构建+- 鸿蒙各架构的 `entry/libs/<ABI>/` 只接收 `libkernel.so`,头文件仅从 ARM64 构建目录同步到 `entry/src/main/cpp/include/`;`libkernel.h` 必须为本次生成,`lan_sync_bridge.h` 若由构建目录提供则同步,否则保留工程中维护的版本,缺少必需头文件时停止构建- 各平台产物生成后立即复制到桌面 `siyuan`,不覆盖同名包;最后统一检查桌面目录,失败时保留已复制的包。需要重新构建同名包时,先人工移走旧包;校验失败修复后可直接对桌面目录重跑 `verify-release.py check`。保留已有的 `SHA256SUMS.txt`,校验和清单由发布者最终手动生成- 构建目录保留在系统临时目录,控制台打印实际路径,失败后可检查并取回产物;不会自动提交、推送、打标签、上传或发布公告diff --git a/scripts/build-release.py b/scripts/build-release.pyindex 8f7553afcd..efff2d0715 100644--- a/scripts/build-release.py+++ b/scripts/build-release.py@@ -558,11 +558,9 @@ class Builder:header = source.with_suffix(".h")if not header.is_file() or header.stat().st_mtime < started - 2:raise BuildError(f"鸿蒙内核头文件未更新:{header}")- # 各架构保存配套头文件,正式版原生模块使用 ARM64 的公共头文件。- headers = sorted(source.parent.glob("*.h"))- for path in headers:- copy_verified(path, self.args.harmony_dir / "entry/libs" / abi / path.name, self.args.harmony_dir)- if architecture == "arm64":+ # 原生模块从公共包含目录读取头文件,使用 ARM64 构建生成的版本。+ if architecture == "arm64":+ for path in sorted(source.parent.glob("*.h")):copy_verified(path, self.args.harmony_dir / "entry/src/main/cpp/include" / path.name,self.args.harmony_dir)for name in ("libkernel.h", "lan_sync_bridge.h"):diff --git a/scripts/test_build_release.py b/scripts/test_build_release.pyindex 5c048af94c..f2580a2149 100644--- a/scripts/test_build_release.py+++ b/scripts/test_build_release.py@@ -230,7 +230,9 @@ class BuildTests(unittest.TestCase):self.assertEqual(self.builder.artifacts[0].read_bytes(), b"signed app")self.assertEqual((self.args.harmony_dir / "entry/src/main/cpp/include/libkernel.h").read_bytes(), b"arm64")self.assertEqual((self.args.harmony_dir / "entry/src/main/cpp/include/lan_sync_bridge.h").read_bytes(), b"bridge")- self.assertEqual((self.args.harmony_dir / "entry/libs/x86_64/libkernel.h").read_bytes(), b"amd64")+ for abi in ("arm64-v8a", "x86_64"):+ self.assertEqual({path.name for path in (self.args.harmony_dir / "entry/libs" / abi).iterdir()},+ {"libkernel.so"})def test_harmony_rejects_unsigned_only_output(self):self.builder.wsl_root = self.root / "wsl"