cj-tauri 2.3.4 → 2.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjpm.toml +1 -1
- package/cli/cjpm.toml +12 -1
- package/cli/src/project.cj +1 -1
- package/cli/src/sync.cj +10 -2
- package/package.json +1 -1
- package/src/version.cj +1 -1
package/cjpm.toml
CHANGED
package/cli/cjpm.toml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
cjc-version = "1.0.5"
|
|
3
3
|
name = "cli"
|
|
4
4
|
description = "cj-tauri CLI:脚手架 create / dev / build / run / info"
|
|
5
|
-
version = "2.3.
|
|
5
|
+
version = "2.3.6"
|
|
6
6
|
target-dir = ""
|
|
7
7
|
output-type = "executable"
|
|
8
8
|
compile-option = ""
|
|
@@ -15,6 +15,17 @@
|
|
|
15
15
|
[target.x86_64-unknown-linux-gnu.bin-dependencies]
|
|
16
16
|
path-option = ["${CANGJIE_STDX}"]
|
|
17
17
|
|
|
18
|
+
[target.x86_64-w64-mingw32]
|
|
19
|
+
# -lcrypt32:CLI 的 sign_login / sign_agc 走 stdx.net.tls(HTTPS 登录与签名),它把 stdx.crypto.x509
|
|
20
|
+
# 带进来,那套代码读 Windows 系统证书存储(SystemRootCerts)。CertOpenSystemStoreA /
|
|
21
|
+
# CertEnumCertificatesInStore / CertCloseStore 三个符号都在 crypt32.dll 里,而仓颉默认链接行只给
|
|
22
|
+
# advapi32 / shell32 / user32 / kernel32 —— 少了这个库,Windows 上 `cjpm build` 直接死在链接期:
|
|
23
|
+
# `undefined symbol: __declspec(dllimport) CertOpenSystemStoreA`
|
|
24
|
+
# `>>> referenced by libstdx.crypto.x509.a(rootca.c.o):(DYN_CJ_SystemRootCerts)`
|
|
25
|
+
# 表象像「stdx 装坏了 / 版本不匹配」,其实只差一行链接选项。libcrypt32.a 随 SDK 的
|
|
26
|
+
# third_party/mingw/lib 一起发布,不需要任何外部依赖。
|
|
27
|
+
link-option = "-lcrypt32"
|
|
28
|
+
|
|
18
29
|
[target.x86_64-w64-mingw32.bin-dependencies]
|
|
19
30
|
# 与根 cjpm.toml 同口径:CLI 也 import stdx.encoding.json,Windows 上缺这一段时
|
|
20
31
|
# cjpm 报的是 `root package 'cli' imports package 'stdx.encoding.json' … not added as a
|
package/cli/src/project.cj
CHANGED
package/cli/src/sync.cj
CHANGED
|
@@ -206,10 +206,18 @@ func checkThreeWay(m: Manifest): Bool {
|
|
|
206
206
|
setVariable("CJ_TAURI_MANIFEST", "json")
|
|
207
207
|
var outText = ""
|
|
208
208
|
try {
|
|
209
|
-
let (code, raw,
|
|
209
|
+
let (code, raw, errRaw) = executeWithOutput(binPath, [])
|
|
210
210
|
outText = String.fromUtf8(raw)
|
|
211
211
|
if (code != 0) {
|
|
212
|
-
|
|
212
|
+
// 子进程的 stderr 以前被丢掉了:缺 libcjtbridge.dll / stdx 动态库时退出码是
|
|
213
|
+
// 0xC0000135(十进制 3221225781),而真正的「缺哪个库」只写在 stderr 里。
|
|
214
|
+
// 接住它拼进诊断——否则这条错误看起来就像骨架漂移。
|
|
215
|
+
let errText = String.fromUtf8(errRaw).trimAscii()
|
|
216
|
+
var detail = errText
|
|
217
|
+
if (detail == "") {
|
|
218
|
+
detail = "(子进程没有 stderr 输出;先查 libcjtbridge.dll 与 stdx 的 dynamic/stdx 是否在 PATH / LD_LIBRARY_PATH)"
|
|
219
|
+
}
|
|
220
|
+
eprintln("[cj-tauri] 三方比对:无头导出退出异常(code=${code}):${detail}")
|
|
213
221
|
return true
|
|
214
222
|
}
|
|
215
223
|
} catch (e: Exception) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cj-tauri",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.6",
|
|
4
4
|
"description": "Tauri for the Cangjie language: a scaffold CLI for hybrid desktop apps — Cangjie backend (statically compiled) plus a system WebView frontend (HTML/CSS/JS), with a bidirectional IPC bridge and a capability-based security model. Windows, Linux and HarmonyOS PC.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cangjie",
|
package/src/version.cj
CHANGED