@git.zone/tsrust 1.5.0 โ 1.7.0
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/.smartconfig.json +10 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/mod_cargo/classes.cargorunner.d.ts +4 -1
- package/dist_ts/mod_cargo/classes.cargorunner.js +8 -6
- package/dist_ts/mod_cargo/classes.targetcache.d.ts +37 -0
- package/dist_ts/mod_cargo/classes.targetcache.js +260 -0
- package/dist_ts/mod_cargo/index.d.ts +1 -0
- package/dist_ts/mod_cargo/index.js +2 -1
- package/dist_ts/mod_cli/classes.tsrustcli.d.ts +13 -0
- package/dist_ts/mod_cli/classes.tsrustcli.js +126 -8
- package/dist_ts/mod_elf/classes.provenance.d.ts +24 -0
- package/dist_ts/mod_elf/classes.provenance.js +0 -0
- package/dist_ts/mod_elf/index.d.ts +1 -0
- package/dist_ts/mod_elf/index.js +2 -1
- package/package.json +2 -2
- package/readme.md +39 -8
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/mod_cargo/classes.cargorunner.ts +8 -6
- package/ts/mod_cargo/classes.targetcache.ts +304 -0
- package/ts/mod_cargo/index.ts +1 -0
- package/ts/mod_cli/classes.tsrustcli.ts +142 -7
- package/ts/mod_elf/classes.provenance.ts +0 -0
- package/ts/mod_elf/index.ts +1 -0
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
import * as fs from 'fs';
|
|
1
2
|
import * as path from 'path';
|
|
2
3
|
import * as os from 'os';
|
|
3
4
|
import * as plugins from '../plugins.js';
|
|
4
5
|
import { CargoConfig } from '../mod_cargo/index.js';
|
|
5
6
|
import { CargoRunner } from '../mod_cargo/index.js';
|
|
6
|
-
import {
|
|
7
|
+
import { applyTsrustPrunePlan, createTsrustPrunePlan, getCargoArtifactDir, parseSizeToBytes, resolveManagedTargetDir, writeTargetCacheMarker, } from '../mod_cargo/index.js';
|
|
8
|
+
import { ElfInspector, ProvenanceStamper } from '../mod_elf/index.js';
|
|
7
9
|
import { FsHelpers } from '../mod_fs/index.js';
|
|
8
10
|
import { ToolchainManager } from '../mod_toolchain/index.js';
|
|
11
|
+
import { commitinfo } from '../00_commitinfo_data.js';
|
|
9
12
|
/** Maps friendly target names to Rust target triples */
|
|
10
13
|
const targetAliasMap = {
|
|
11
14
|
linux_amd64: 'x86_64-unknown-linux-gnu',
|
|
@@ -59,6 +62,43 @@ export class TsRustCli {
|
|
|
59
62
|
registerCommands() {
|
|
60
63
|
this.registerStandardCommand();
|
|
61
64
|
this.registerCleanCommand();
|
|
65
|
+
this.registerPruneCommand();
|
|
66
|
+
this.registerInspectCommand();
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Collects build provenance once per run: consuming project identity,
|
|
70
|
+
* git commit, and the tsrust version doing the build. Tolerant of
|
|
71
|
+
* non-git checkouts and missing package metadata.
|
|
72
|
+
*/
|
|
73
|
+
async collectBuildProvenance() {
|
|
74
|
+
let projectName = 'unknown';
|
|
75
|
+
let projectVersion = 'unknown';
|
|
76
|
+
try {
|
|
77
|
+
const packageJson = JSON.parse(fs.readFileSync(path.join(this.cwd, 'package.json'), 'utf8'));
|
|
78
|
+
projectName = packageJson.name || projectName;
|
|
79
|
+
projectVersion = packageJson.version || projectVersion;
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
// package.json optional for pure Rust workspaces
|
|
83
|
+
}
|
|
84
|
+
let gitCommit = 'unknown';
|
|
85
|
+
try {
|
|
86
|
+
const shell = new plugins.smartshell.Smartshell({ executor: 'bash' });
|
|
87
|
+
const result = await shell.execSilent(`git -C ${JSON.stringify(this.cwd)} rev-parse HEAD`);
|
|
88
|
+
if (result.exitCode === 0) {
|
|
89
|
+
gitCommit = result.stdout.trim();
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
// not a git checkout
|
|
94
|
+
}
|
|
95
|
+
return {
|
|
96
|
+
projectName,
|
|
97
|
+
projectVersion,
|
|
98
|
+
gitCommit,
|
|
99
|
+
builtAt: new Date().toISOString(),
|
|
100
|
+
tsrustVersion: commitinfo.version,
|
|
101
|
+
};
|
|
62
102
|
}
|
|
63
103
|
/**
|
|
64
104
|
* Resolves the Rust toolchain to use. Tries system cargo first,
|
|
@@ -107,6 +147,8 @@ export class TsRustCli {
|
|
|
107
147
|
const shouldClean = !!argvArg.clean;
|
|
108
148
|
const distDir = path.join(this.cwd, 'dist_rust');
|
|
109
149
|
const profile = isDebug ? 'debug' : 'release';
|
|
150
|
+
const managedTargetDir = resolveManagedTargetDir(this.cwd, this.config.targetDir);
|
|
151
|
+
await writeTargetCacheMarker(managedTargetDir);
|
|
110
152
|
// Parse --target flag (can appear multiple times), fall back to smartconfig.json config
|
|
111
153
|
const cliTargets = argvArg.target;
|
|
112
154
|
const targets = cliTargets
|
|
@@ -120,6 +162,7 @@ export class TsRustCli {
|
|
|
120
162
|
if (rustflags.length > 0) {
|
|
121
163
|
console.log(`Using additional Rust flags: ${rustflags.join(' ')}`);
|
|
122
164
|
}
|
|
165
|
+
const buildProvenance = await this.collectBuildProvenance();
|
|
123
166
|
if (targets.length > 0) {
|
|
124
167
|
// Cross-compilation mode
|
|
125
168
|
const resolvedTargets = targets.map((t) => ({
|
|
@@ -140,13 +183,13 @@ export class TsRustCli {
|
|
|
140
183
|
target: triple,
|
|
141
184
|
crtStatic: useStatic && wantsCrtStatic(triple),
|
|
142
185
|
rustflags,
|
|
186
|
+
targetDir: managedTargetDir,
|
|
143
187
|
});
|
|
144
188
|
if (!buildResult.success) {
|
|
145
189
|
console.error(`Build failed for target ${triple} with exit code ${buildResult.exitCode}`);
|
|
146
190
|
process.exit(1);
|
|
147
191
|
}
|
|
148
|
-
|
|
149
|
-
const targetDir = path.join(rustDir, 'target', triple, profile);
|
|
192
|
+
const targetDir = getCargoArtifactDir(managedTargetDir, profile, triple);
|
|
150
193
|
for (const binName of workspaceInfo.binTargets) {
|
|
151
194
|
const srcBinary = path.join(targetDir, binName);
|
|
152
195
|
const destName = `${binName}_${friendly}`;
|
|
@@ -166,6 +209,12 @@ export class TsRustCli {
|
|
|
166
209
|
}
|
|
167
210
|
console.log(`Verified statically linked: dist_rust/${destName}`);
|
|
168
211
|
}
|
|
212
|
+
await ProvenanceStamper.stamp(destBinary, {
|
|
213
|
+
...buildProvenance,
|
|
214
|
+
binary: binName,
|
|
215
|
+
target: friendly,
|
|
216
|
+
});
|
|
217
|
+
console.log(`Stamped provenance: ${buildProvenance.projectName}@${buildProvenance.projectVersion} ${buildProvenance.gitCommit.slice(0, 12)} (${friendly})`);
|
|
169
218
|
}
|
|
170
219
|
// Only clean on first iteration
|
|
171
220
|
if (shouldClean) {
|
|
@@ -191,14 +240,13 @@ export class TsRustCli {
|
|
|
191
240
|
target: nativeTriple,
|
|
192
241
|
crtStatic: !!nativeTriple && wantsCrtStatic(nativeTriple),
|
|
193
242
|
rustflags,
|
|
243
|
+
targetDir: managedTargetDir,
|
|
194
244
|
});
|
|
195
245
|
if (!buildResult.success) {
|
|
196
246
|
console.error(`Build failed with exit code ${buildResult.exitCode}`);
|
|
197
247
|
process.exit(1);
|
|
198
248
|
}
|
|
199
|
-
const targetDir = nativeTriple
|
|
200
|
-
? path.join(rustDir, 'target', nativeTriple, profile)
|
|
201
|
-
: path.join(rustDir, 'target', profile);
|
|
249
|
+
const targetDir = getCargoArtifactDir(managedTargetDir, profile, nativeTriple);
|
|
202
250
|
await FsHelpers.ensureEmptyDir(distDir);
|
|
203
251
|
for (const binName of workspaceInfo.binTargets) {
|
|
204
252
|
const srcBinary = path.join(targetDir, binName);
|
|
@@ -218,12 +266,31 @@ export class TsRustCli {
|
|
|
218
266
|
}
|
|
219
267
|
console.log(`Verified statically linked: dist_rust/${binName}`);
|
|
220
268
|
}
|
|
269
|
+
await ProvenanceStamper.stamp(destBinary, {
|
|
270
|
+
...buildProvenance,
|
|
271
|
+
binary: binName,
|
|
272
|
+
target: nativeTriple || 'native',
|
|
273
|
+
});
|
|
274
|
+
console.log(`Stamped provenance: ${buildProvenance.projectName}@${buildProvenance.projectVersion} ${buildProvenance.gitCommit.slice(0, 12)} (${nativeTriple || 'native'})`);
|
|
221
275
|
}
|
|
222
276
|
}
|
|
277
|
+
if (this.shouldPruneAfterBuild()) {
|
|
278
|
+
const plan = await createTsrustPrunePlan({
|
|
279
|
+
workspace: this.cwd,
|
|
280
|
+
targetDir: managedTargetDir,
|
|
281
|
+
days: 0,
|
|
282
|
+
});
|
|
283
|
+
await applyTsrustPrunePlan(plan);
|
|
284
|
+
console.log('Pruned marked tsrust target cache after successful build.');
|
|
285
|
+
}
|
|
223
286
|
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
224
287
|
console.log(`\nDone in ${elapsed}s`);
|
|
225
288
|
});
|
|
226
289
|
}
|
|
290
|
+
shouldPruneAfterBuild() {
|
|
291
|
+
const normalized = process.env.TSRUST_PRUNE_AFTER_BUILD?.toLowerCase();
|
|
292
|
+
return normalized === '1' || normalized === 'true' || normalized === 'yes' || normalized === 'y' || this.config.pruneAfterBuild === true;
|
|
293
|
+
}
|
|
227
294
|
buildRustflags(rustDir) {
|
|
228
295
|
const rustflags = [...(this.config.rustflags || [])];
|
|
229
296
|
if (this.config.remapLocalPaths) {
|
|
@@ -240,6 +307,28 @@ export class TsRustCli {
|
|
|
240
307
|
}
|
|
241
308
|
return rustflags;
|
|
242
309
|
}
|
|
310
|
+
/**
|
|
311
|
+
* `tsrust inspect <binary>` โ prints the embedded build provenance so any
|
|
312
|
+
* environment can answer "what is this binary built from" definitively.
|
|
313
|
+
*/
|
|
314
|
+
registerInspectCommand() {
|
|
315
|
+
this.cli.addCommand('inspect').subscribe(async (argvArg) => {
|
|
316
|
+
const binaryPath = argvArg._?.[1];
|
|
317
|
+
if (!binaryPath) {
|
|
318
|
+
console.error('Usage: tsrust inspect <path-to-binary>');
|
|
319
|
+
process.exit(1);
|
|
320
|
+
}
|
|
321
|
+
const resolvedPath = path.isAbsolute(binaryPath)
|
|
322
|
+
? binaryPath
|
|
323
|
+
: path.join(this.cwd, binaryPath);
|
|
324
|
+
const info = await ProvenanceStamper.read(resolvedPath);
|
|
325
|
+
if (!info) {
|
|
326
|
+
console.error(`No tsrust build provenance found in ${resolvedPath} (built before tsrust 1.7.0?).`);
|
|
327
|
+
process.exit(1);
|
|
328
|
+
}
|
|
329
|
+
console.log(JSON.stringify(info, null, 2));
|
|
330
|
+
});
|
|
331
|
+
}
|
|
243
332
|
registerCleanCommand() {
|
|
244
333
|
this.cli.addCommand('clean').subscribe(async (_argvArg) => {
|
|
245
334
|
// Clean cargo build
|
|
@@ -248,7 +337,7 @@ export class TsRustCli {
|
|
|
248
337
|
const envPrefix = await this.resolveToolchain();
|
|
249
338
|
console.log('Running cargo clean...');
|
|
250
339
|
const runner = new CargoRunner(rustDir, envPrefix);
|
|
251
|
-
await runner.clean();
|
|
340
|
+
await runner.clean({ targetDir: resolveManagedTargetDir(this.cwd, this.config.targetDir) });
|
|
252
341
|
console.log('Cargo clean complete.');
|
|
253
342
|
}
|
|
254
343
|
// Remove dist_rust/
|
|
@@ -260,6 +349,35 @@ export class TsRustCli {
|
|
|
260
349
|
console.log('Clean complete.');
|
|
261
350
|
});
|
|
262
351
|
}
|
|
352
|
+
registerPruneCommand() {
|
|
353
|
+
this.cli.addCommand('prune').subscribe(async (argvArg) => {
|
|
354
|
+
const workspace = argvArg.workspace || this.cwd;
|
|
355
|
+
const daysArg = argvArg.days;
|
|
356
|
+
const days = daysArg === undefined ? 14 : Number(daysArg);
|
|
357
|
+
const maxSizeBytes = parseSizeToBytes(argvArg.maxSize);
|
|
358
|
+
const apply = !!argvArg.apply;
|
|
359
|
+
const plan = await createTsrustPrunePlan({
|
|
360
|
+
workspace,
|
|
361
|
+
targetDir: resolveManagedTargetDir(workspace, this.config.targetDir),
|
|
362
|
+
days: Number.isFinite(days) ? days : 14,
|
|
363
|
+
maxSizeBytes,
|
|
364
|
+
});
|
|
365
|
+
console.log(apply ? 'tsrust prune apply plan:' : 'tsrust prune dry-run plan:');
|
|
366
|
+
if (plan.length === 0) {
|
|
367
|
+
console.log('No Rust target caches found.');
|
|
368
|
+
}
|
|
369
|
+
for (const candidate of plan) {
|
|
370
|
+
const action = candidate.shouldPrune ? (apply ? 'remove' : 'would remove') : 'report';
|
|
371
|
+
console.log(`${action}: ${candidate.path} (${FsHelpers.formatFileSize(candidate.bytes)}) - ${candidate.reason}`);
|
|
372
|
+
}
|
|
373
|
+
if (apply) {
|
|
374
|
+
await applyTsrustPrunePlan(plan);
|
|
375
|
+
}
|
|
376
|
+
else {
|
|
377
|
+
console.log('Dry-run only. Re-run with --apply to remove marked tsrust target caches.');
|
|
378
|
+
}
|
|
379
|
+
});
|
|
380
|
+
}
|
|
263
381
|
async detectRustDir() {
|
|
264
382
|
// Check rust/ first
|
|
265
383
|
const rustDir = path.join(this.cwd, 'rust');
|
|
@@ -281,4 +399,4 @@ export const runCli = async () => {
|
|
|
281
399
|
const cli = new TsRustCli();
|
|
282
400
|
cli.run();
|
|
283
401
|
};
|
|
284
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsrustcli.js","sourceRoot":"","sources":["../../ts/mod_cli/classes.tsrustcli.ts"],"names":[],"mappings":"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"}
|
|
402
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.tsrustcli.js","sourceRoot":"","sources":["../../ts/mod_cli/classes.tsrustcli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Build provenance embedded into produced binaries so any environment can
|
|
3
|
+
* answer "what exactly is this binary built from" without guessing from
|
|
4
|
+
* strings or timestamps. Appended as a magic-delimited JSON trailer โ ELF
|
|
5
|
+
* loaders ignore trailing bytes, so runtime behavior is unaffected.
|
|
6
|
+
*/
|
|
7
|
+
export interface ITsrustBuildInfo {
|
|
8
|
+
binary: string;
|
|
9
|
+
target: string;
|
|
10
|
+
projectName: string;
|
|
11
|
+
projectVersion: string;
|
|
12
|
+
gitCommit: string;
|
|
13
|
+
builtAt: string;
|
|
14
|
+
tsrustVersion: string;
|
|
15
|
+
}
|
|
16
|
+
export declare class ProvenanceStamper {
|
|
17
|
+
/** Appends (or replaces awareness of) the provenance trailer on a binary. */
|
|
18
|
+
static stamp(binaryPath: string, info: ITsrustBuildInfo): Promise<void>;
|
|
19
|
+
/**
|
|
20
|
+
* Reads the most recent provenance trailer from a binary.
|
|
21
|
+
* Returns undefined when no trailer is present or it cannot be parsed.
|
|
22
|
+
*/
|
|
23
|
+
static read(binaryPath: string): Promise<ITsrustBuildInfo | undefined>;
|
|
24
|
+
}
|
|
Binary file
|
package/dist_ts/mod_elf/index.js
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export { ElfInspector } from './classes.elfinspector.js';
|
|
2
|
-
|
|
2
|
+
export { ProvenanceStamper } from './classes.provenance.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2RfZWxmL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQXlCLE1BQU0seUJBQXlCLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@git.zone/tsrust",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A tool for compiling Rust projects, detecting Cargo workspaces, building with cargo, and placing binaries in a conventional dist_rust directory.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@git.zone/tsbuild": "^4.4.2",
|
|
42
42
|
"@git.zone/tsrun": "^2.0.4",
|
|
43
43
|
"@git.zone/tstest": "^3.6.6",
|
|
44
|
-
"@types/node": "^25.9.
|
|
44
|
+
"@types/node": "^25.9.3"
|
|
45
45
|
},
|
|
46
46
|
"files": [
|
|
47
47
|
"ts/**/*",
|
package/readme.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @git.zone/tsrust
|
|
2
2
|
|
|
3
|
-
A CLI build tool for Rust projects that follows the same conventions as `@git.zone/tsbuild`. It detects your `rust/` source directory, parses `Cargo.toml` (including workspaces), runs `cargo build --release
|
|
3
|
+
A CLI build tool for Rust projects that follows the same conventions as `@git.zone/tsbuild`. It detects your `rust/` source directory, parses `Cargo.toml` (including workspaces), runs `cargo build --release` with a managed target cache, and copies the resulting binaries into a clean `dist_rust/` directory at the project root.
|
|
4
4
|
|
|
5
5
|
## Issue Reporting and Security
|
|
6
6
|
|
|
@@ -48,8 +48,9 @@ This will:
|
|
|
48
48
|
2. Locate your `rust/` directory (containing `Cargo.toml`)
|
|
49
49
|
3. Parse the workspace to discover all `[[bin]]` targets
|
|
50
50
|
4. Run `cargo build --release` with full streaming output
|
|
51
|
-
5.
|
|
52
|
-
6.
|
|
51
|
+
5. Store Cargo intermediates in `.nogit/tsrust-target` by default
|
|
52
|
+
6. Copy each binary to `dist_rust/` with executable permissions (`chmod 755`)
|
|
53
|
+
7. Report file sizes and total build time
|
|
53
54
|
|
|
54
55
|
**Example output:**
|
|
55
56
|
|
|
@@ -58,7 +59,7 @@ Using cargo 1.90.0 (840b83a10 2025-07-30)
|
|
|
58
59
|
Found Rust project at: rust
|
|
59
60
|
Detected Cargo workspace
|
|
60
61
|
Binary targets: rustproxy
|
|
61
|
-
Running: cargo build --release
|
|
62
|
+
Running: CARGO_TARGET_DIR="/path/to/project/.nogit/tsrust-target" cargo build --release
|
|
62
63
|
Compiling rustproxy v0.1.0
|
|
63
64
|
Finished `release` profile [optimized] target(s) in 29.01s
|
|
64
65
|
Copied rustproxy (13.4 MB) -> dist_rust/rustproxy
|
|
@@ -85,7 +86,7 @@ Build with the debug profile instead of release:
|
|
|
85
86
|
tsrust --debug
|
|
86
87
|
```
|
|
87
88
|
|
|
88
|
-
Binaries are taken from
|
|
89
|
+
Binaries are taken from `.nogit/tsrust-target/debug/` instead of `.nogit/tsrust-target/release/`.
|
|
89
90
|
|
|
90
91
|
### ๐งน Clean Before Building
|
|
91
92
|
|
|
@@ -138,13 +139,17 @@ You can set default cross-compilation targets in your project's `.smartconfig.js
|
|
|
138
139
|
```json
|
|
139
140
|
{
|
|
140
141
|
"@git.zone/tsrust": {
|
|
141
|
-
"targets": ["linux_arm64", "linux_amd64"]
|
|
142
|
+
"targets": ["linux_arm64", "linux_amd64"],
|
|
143
|
+
"targetDir": ".nogit/tsrust-target",
|
|
144
|
+
"pruneAfterBuild": false
|
|
142
145
|
}
|
|
143
146
|
}
|
|
144
147
|
```
|
|
145
148
|
|
|
146
149
|
When targets are configured in `.smartconfig.json`, simply running `tsrust` will cross-compile for all listed targets. CLI `--target` flags take full precedence โ if any `--target` is provided, the `.smartconfig.json` targets are ignored entirely.
|
|
147
150
|
|
|
151
|
+
`targetDir` is optional. It must point to a tsrust-owned path under `.nogit/`, such as `.nogit/tsrust-target` or `.nogit/tsrust-custom-target`. You can also set `TSRUST_TARGET_DIR` for one-off runs. `pruneAfterBuild: true` or `TSRUST_PRUNE_AFTER_BUILD=true` removes the marked managed target cache after binaries have been copied to `dist_rust/`.
|
|
152
|
+
|
|
148
153
|
### Static Linking
|
|
149
154
|
|
|
150
155
|
`tsrust` can produce fully statically linked Linux binaries (static-pie) that run on both glibc distros (Debian/Ubuntu) and musl distros (Alpine). Enable it via `.smartconfig.json`:
|
|
@@ -211,6 +216,29 @@ tsrust clean
|
|
|
211
216
|
|
|
212
217
|
This runs `cargo clean` in the Rust directory and deletes the `dist_rust/` output directory.
|
|
213
218
|
|
|
219
|
+
### ๐งน Prune Rust Target Caches
|
|
220
|
+
|
|
221
|
+
Report Rust target caches without deleting anything:
|
|
222
|
+
|
|
223
|
+
```bash
|
|
224
|
+
tsrust prune
|
|
225
|
+
```
|
|
226
|
+
|
|
227
|
+
Apply cleanup to marked tsrust-managed target caches:
|
|
228
|
+
|
|
229
|
+
```bash
|
|
230
|
+
tsrust prune --apply --days 14 --max-size 5GiB
|
|
231
|
+
```
|
|
232
|
+
|
|
233
|
+
| Option | Description |
|
|
234
|
+
| --- | --- |
|
|
235
|
+
| `--apply` | Remove marked managed target caches that match the filters |
|
|
236
|
+
| `--days <n>` | Prune marked caches whose newest file is at least `n` days old; default `14` |
|
|
237
|
+
| `--max-size <size>` | Prune marked caches at or above a size such as `5GiB` |
|
|
238
|
+
| `--workspace <path>` | Inspect another workspace path |
|
|
239
|
+
|
|
240
|
+
Conventional `rust/target` and `ts_rust/target` directories are report-only, even if they carry a marker. Only managed `.nogit/tsrust*` target directories are eligible for `--apply`; arbitrary app data is never marked or removed.
|
|
241
|
+
|
|
214
242
|
## Project Structure
|
|
215
243
|
|
|
216
244
|
`tsrust` expects your project to follow this layout:
|
|
@@ -230,6 +258,8 @@ my-project/
|
|
|
230
258
|
โ โโโ src/
|
|
231
259
|
โโโ dist_rust/ # ๐ฆ Output: compiled binaries go here
|
|
232
260
|
โ โโโ my-binary
|
|
261
|
+
โโโ .nogit/
|
|
262
|
+
โ โโโ tsrust-target/ # ๐งน Managed Cargo target cache
|
|
233
263
|
โโโ ts/ # (your TypeScript code, built by tsbuild)
|
|
234
264
|
โโโ dist_ts/ # (TypeScript output)
|
|
235
265
|
โโโ package.json
|
|
@@ -253,7 +283,7 @@ If no `rust/` directory is found, `tsrust` checks for `ts_rust/` as a fallback.
|
|
|
253
283
|
`tsrust` exports its internals for use in other Node.js/TypeScript tools:
|
|
254
284
|
|
|
255
285
|
```typescript
|
|
256
|
-
import { CargoConfig, CargoRunner, FsHelpers, TsRustCli } from '@git.zone/tsrust';
|
|
286
|
+
import { CargoConfig, CargoRunner, FsHelpers, TsRustCli, resolveManagedTargetDir } from '@git.zone/tsrust';
|
|
257
287
|
|
|
258
288
|
// Parse a Cargo workspace
|
|
259
289
|
const config = new CargoConfig('/path/to/rust');
|
|
@@ -263,7 +293,8 @@ console.log(info.binTargets); // ['rustproxy']
|
|
|
263
293
|
|
|
264
294
|
// Run cargo build
|
|
265
295
|
const runner = new CargoRunner('/path/to/rust');
|
|
266
|
-
const
|
|
296
|
+
const targetDir = resolveManagedTargetDir('/path/to/project');
|
|
297
|
+
const result = await runner.build({ debug: false, clean: false, targetDir });
|
|
267
298
|
console.log(result.success); // true
|
|
268
299
|
console.log(result.exitCode); // 0
|
|
269
300
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -29,10 +29,10 @@ export class CargoRunner {
|
|
|
29
29
|
return result.stdout.trim();
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
public async build(options: { debug?: boolean; clean?: boolean; target?: string; crtStatic?: boolean; rustflags?: string[] } = {}): Promise<ICargoRunResult> {
|
|
32
|
+
public async build(options: { debug?: boolean; clean?: boolean; target?: string; crtStatic?: boolean; rustflags?: string[]; targetDir?: string } = {}): Promise<ICargoRunResult> {
|
|
33
33
|
if (options.clean) {
|
|
34
34
|
console.log('Cleaning previous build...');
|
|
35
|
-
await this.clean();
|
|
35
|
+
await this.clean({ targetDir: options.targetDir });
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
// crt-static may only be injected together with an explicit --target:
|
|
@@ -53,9 +53,10 @@ export class CargoRunner {
|
|
|
53
53
|
rustflags.unshift('-C', 'target-feature=+crt-static');
|
|
54
54
|
}
|
|
55
55
|
const rustflagsPrefix = rustflags.length ? `RUSTFLAGS=${this.shellQuote(rustflags.join(' '))} ` : '';
|
|
56
|
-
const
|
|
56
|
+
const targetDirPrefix = options.targetDir ? `CARGO_TARGET_DIR=${this.shellQuote(options.targetDir)} ` : '';
|
|
57
|
+
const command = `${this.envPrefix}cd ${this.rustDir} && ${targetDirPrefix}${rustflagsPrefix}cargo build${profile}${targetFlag}`;
|
|
57
58
|
|
|
58
|
-
console.log(`Running: ${rustflagsPrefix}cargo build${profile}${targetFlag}`);
|
|
59
|
+
console.log(`Running: ${targetDirPrefix}${rustflagsPrefix}cargo build${profile}${targetFlag}`);
|
|
59
60
|
const result = await this.shell.exec(command);
|
|
60
61
|
|
|
61
62
|
return {
|
|
@@ -85,8 +86,9 @@ export class CargoRunner {
|
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
88
|
|
|
88
|
-
public async clean(): Promise<ICargoRunResult> {
|
|
89
|
-
const
|
|
89
|
+
public async clean(options: { targetDir?: string } = {}): Promise<ICargoRunResult> {
|
|
90
|
+
const targetDirPrefix = options.targetDir ? `CARGO_TARGET_DIR=${this.shellQuote(options.targetDir)} ` : '';
|
|
91
|
+
const command = `${this.envPrefix}cd ${this.rustDir} && ${targetDirPrefix}cargo clean`;
|
|
90
92
|
const result = await this.shell.exec(command);
|
|
91
93
|
|
|
92
94
|
return {
|