cj-tauri 2.4.1 → 2.4.2
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/bin/cj-tauri.js +32 -6
- package/cjpm.toml +1 -1
- package/cli/cjpm.toml +13 -3
- package/cli/src/project.cj +1 -1
- package/package.json +1 -1
- package/src/version.cj +1 -1
package/bin/cj-tauri.js
CHANGED
|
@@ -122,7 +122,7 @@ function resolveCjpm(home) {
|
|
|
122
122
|
* 宿主目标的库文件,链上去就是 `lld: error: unable to find library -lstdx.encoding.json`
|
|
123
123
|
* (2026-11-12 Windows 实测)。用户显式设置的 CANGJIE_STDX 仍然优先(那是他自己的选择),
|
|
124
124
|
* 但若路径里带 ohos 会打一行警告。 */
|
|
125
|
-
function resolveStdx(home) {
|
|
125
|
+
function resolveStdx(home, layerOverride) {
|
|
126
126
|
const looksRight = (p) => {
|
|
127
127
|
try {
|
|
128
128
|
// 必须能找到实际要链的库(libstdx.encoding.json.*):指到「包根」而不是
|
|
@@ -139,12 +139,16 @@ function resolveStdx(home) {
|
|
|
139
139
|
const platKey = IS_WIN ? 'windows' : (process.platform === 'darwin' ? 'darwin' : 'linux');
|
|
140
140
|
const hostUsable = (pkgName) => pkgName.includes(platKey) && !pkgName.includes('ohos');
|
|
141
141
|
// stdx 里实际被引用的那一层**按链接形态**:静态产物(cjpm 常规 build 的默认形态)吃
|
|
142
|
-
// static
|
|
143
|
-
// CLI
|
|
144
|
-
|
|
142
|
+
// static/stdx 的 .a(2026-11-13 用户实测);--dynamic-std 的动态产物才用 dynamic/stdx。
|
|
143
|
+
// 这里的层选择服务**应用构建**(CLI spawn cjpm 时继承 CANGJIE_STDX)——保持平台口径:
|
|
144
|
+
// Windows 常规 build 吃 static,Linux 吃 dynamic(历史实测)。CLI 本体自己的源码构建
|
|
145
|
+
// 自 2.4.2 起静态化(--static --static-std),在 buildCli 里传 layerOverride='static'
|
|
146
|
+
// 单独取层(且该模式下**跳过**用户显式的 CANGJIE_STDX——它多半是为应用构建设的 dynamic
|
|
147
|
+
// 层,拿去编静态 CLI 必报 imports not added)。
|
|
148
|
+
const stdxLayer = layerOverride || (IS_WIN ? 'static' : 'dynamic');
|
|
145
149
|
|
|
146
150
|
const candidates = [];
|
|
147
|
-
if (process.env.CANGJIE_STDX && fs.existsSync(process.env.CANGJIE_STDX)) {
|
|
151
|
+
if (!layerOverride && process.env.CANGJIE_STDX && fs.existsSync(process.env.CANGJIE_STDX)) {
|
|
148
152
|
if (process.env.CANGJIE_STDX.includes('ohos')) {
|
|
149
153
|
note('告警: CANGJIE_STDX 指向 ohos 包(给鸿蒙交叉编译用),主机构建用不了,请改指宿主平台的 stdx');
|
|
150
154
|
}
|
|
@@ -309,6 +313,24 @@ function copyDir(from, to, skipNames) {
|
|
|
309
313
|
}
|
|
310
314
|
}
|
|
311
315
|
|
|
316
|
+
/**
|
|
317
|
+
* CLI 本体源码构建的专用环境:cli/cjpm.toml 自 2.4.2 起静态化(--static --static-std),
|
|
318
|
+
* cjpm 必须拿到 **static 层**的 stdx 才能链接 .a——直接复用应用构建的 env 会在 Linux 上
|
|
319
|
+
* 炸「imports package ... not added as a dependency」(那层是给应用动态构建用的 dynamic)。
|
|
320
|
+
* 探测不到 static 层时回落传入的 env(保持旧行为 + 让 cjpm 自己报可诊断的错)。
|
|
321
|
+
*/
|
|
322
|
+
function buildEnvForCliBuild(env, home) {
|
|
323
|
+
const staticStdx = resolveStdx(home, 'static');
|
|
324
|
+
if (!staticStdx) {
|
|
325
|
+
verbose('未探测到 static/stdx 层,CLI 静态构建将使用现有 CANGJIE_STDX(可能失败)');
|
|
326
|
+
return env;
|
|
327
|
+
}
|
|
328
|
+
const buildEnv2 = Object.assign({}, env);
|
|
329
|
+
buildEnv2.CANGJIE_STDX = staticStdx;
|
|
330
|
+
verbose(`CLI 静态构建使用 stdx static 层: ${staticStdx}`);
|
|
331
|
+
return buildEnv2;
|
|
332
|
+
}
|
|
333
|
+
|
|
312
334
|
/**
|
|
313
335
|
* 用本机 cjpm 构建 CLI 本体,产物落缓存。
|
|
314
336
|
* 刻意把源码拷到缓存目录再构建:`cjpm build` 会写 target/,
|
|
@@ -327,7 +349,11 @@ function buildCli(env, cjpm) {
|
|
|
327
349
|
fs.rmSync(buildDir, { recursive: true, force: true });
|
|
328
350
|
copyDir(path.join(PKG_ROOT, 'cli'), buildDir, ['target']);
|
|
329
351
|
|
|
330
|
-
const r = spawnSync(cjpm, ['build'], {
|
|
352
|
+
const r = spawnSync(cjpm, ['build'], {
|
|
353
|
+
cwd: buildDir,
|
|
354
|
+
env: buildEnvForCliBuild(env, home),
|
|
355
|
+
stdio: 'inherit',
|
|
356
|
+
});
|
|
331
357
|
const produced = path.join(buildDir, 'target', 'release', 'bin', BUILT_CLI_FILE);
|
|
332
358
|
if (r.status !== 0 || !fs.existsSync(produced)) {
|
|
333
359
|
note(`错误: CLI 本体构建失败(cjpm 退出码 ${r.status === null ? 'null' : r.status})`);
|
package/cjpm.toml
CHANGED
package/cli/cjpm.toml
CHANGED
|
@@ -2,10 +2,15 @@
|
|
|
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.4.
|
|
5
|
+
version = "2.4.2"
|
|
6
6
|
target-dir = ""
|
|
7
7
|
output-type = "executable"
|
|
8
|
-
|
|
8
|
+
# 静态三件套(npm 预编译分发的硬前提,issue:用户机缺环境时「首次构建失败」体验差):
|
|
9
|
+
# CLI 不依赖 cjTauri 框架包([dependencies] 为空),静态化后产物不链 libcangjie-runtime /
|
|
10
|
+
# libstdx.*.so|dll——没装 SDK 的用户机拿到 prebuilt/ 里的二进制直接能跑。
|
|
11
|
+
# 代价:构建要吃 stdx 的 static 层(${CANGJIE_STDX} 需指 static/stdx,npm 启动器与
|
|
12
|
+
# cli/cj-tauri.sh|bat 的探测已同步)。静态产物体积大,交付前 --strip-all 压回。
|
|
13
|
+
compile-option = "--static --static-std"
|
|
9
14
|
override-compile-option = ""
|
|
10
15
|
link-option = ""
|
|
11
16
|
package-configuration = {}
|
|
@@ -24,7 +29,12 @@
|
|
|
24
29
|
# `>>> referenced by libstdx.crypto.x509.a(rootca.c.o):(DYN_CJ_SystemRootCerts)`
|
|
25
30
|
# 表象像「stdx 装坏了 / 版本不匹配」,其实只差一行链接选项。libcrypt32.a 随 SDK 的
|
|
26
31
|
# third_party/mingw/lib 一起发布,不需要任何外部依赖。
|
|
27
|
-
|
|
32
|
+
# 静态交叉构建的系统库:CLI 用到网络(ws2_32)与 TLS 证书库(crypt32,见上)。
|
|
33
|
+
# 刻意**不照搬**宿主桥的全套清单(ole32/oleaut32/uuid/comdlg32 是 COM 用的)——
|
|
34
|
+
# SDK 自带的 third_party/mingw/lib 里没有它们,交叉构建直接报
|
|
35
|
+
# `lld: error: unable to find library -lole32`;CLI 也不引用这些符号,列了纯属报错。
|
|
36
|
+
# advapi32/shell32/user32/kernel32 由 crt 链接行默认给出,无需重复。
|
|
37
|
+
link-option = "-lcrypt32 -lws2_32"
|
|
28
38
|
|
|
29
39
|
[target.x86_64-w64-mingw32.bin-dependencies]
|
|
30
40
|
# 与根 cjpm.toml 同口径:CLI 也 import stdx.encoding.json,Windows 上缺这一段时
|
package/cli/src/project.cj
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cj-tauri",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.2",
|
|
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