Campaign Weeks 3-6 of /Users/agra/.claude/plans/lets-plan-to-move-splendid-pumpkin.md
land in one push: the bundling pipeline that used to live in
src/target.zig (createBundle, embedFramework, extractEntitlements,
buildInfoPlist, codesign) now lives in
library/modules/platform/bundle.sx and runs in the IR interpreter
after target.link() returns.
New language-side surface:
- library/modules/fs.sx — POSIX libc bindings (open/read/write/close,
mkdir/unlink/rmdir, chmod, rename, access, basename/dirname). Variadic
open() lowers to C's varargs via the new args: ..T form. Direct libc
calls bypass *File method dispatch so they work from the post-link
IR interpreter.
- library/modules/process.sx — popen-based run(cmd) returning
ProcessResult{ exit_code, stdout }, plus env() and find_executable().
- library/modules/std.sx — xml_escape(s) and variadic path_join(parts).
- library/modules/compiler.sx — BuildOptions grows
set_post_link_callback / set_post_link_module / binary_path
accessors; bundle_path/bundle_id/codesign_identity/provisioning_profile
setters + accessors; per-target predicates is_macos/is_ios/
is_ios_device/is_ios_simulator + target_triple; framework_count /
framework_at(i) / framework_path_count / framework_path_at(i);
add_asset_dir(src, dest) + asset_dir_count / src_at / dest_at.
Compiler-side wiring:
- src/ir/compiler_hooks.zig — BuildConfig now carries post_link_callback_fn,
post_link_module, binary_path, bundle_*, target_triple,
target_frameworks, target_framework_paths, asset_dirs. Hook registry
exposes every accessor; getters return "" / 0 for unset fields so
bundle.sx can treat absent values uniformly.
- src/ir/host_ffi.zig (new) — dlsym(RTLD_DEFAULT) + arity-switched cdecl
trampolines so #foreign("c") declarations resolve through the host
libc during #run / post-link interpretation.
- src/ir/interp.zig — callForeign dispatch; build_config pointer
injection so accessor hooks see live state during re-entry.
- src/core.zig — keeps the IR module alive past generateCode; exposes
invokeByName / invokeByFuncId so main.zig can re-enter the
interpreter after linking.
- src/main.zig — wires bundle/codesign/provisioning CLI flags +
target_triple + framework lists into BuildConfig; invokes the
post-link callback (by FuncId or by <module>.bundle_main lookup) once
target.link() returns. When --bundle is set but no callback is
registered, auto-falls-back to post_link_module = "platform.bundle"
so the legacy --bundle CLI keeps working for any program that imports
modules/platform/bundle.sx.
Apple .app bundler (library/modules/platform/bundle.sx):
- Single bundle_main entry covers macOS, iOS simulator, iOS device.
Per-target Info.plist switch keys off is_ios()/is_ios_simulator() —
iOS emits UIDeviceFamily / LSRequiresIPhoneOS /
UIApplicationSceneManifest / DTPlatformName (iPhoneOS or
iPhoneSimulator); macOS emits the minimal CFBundle* set.
- iOS-only steps:
- Provisioning embed: fs.read_file + fs.write_file to
<bundle>/embedded.mobileprovision.
- Framework embed: recursive cp -R per -F search path into
<bundle>/Frameworks/<Name>.framework/ (until fs.sx grows list_dir).
- Entitlements extraction: four process.run calls (security cms -D,
plutil -extract Entitlements xml1, plutil -extract
ApplicationIdentifierPrefix.0, plutil -replace application-identifier)
resolving the wildcard <TEAM>.* -> <TEAM>.<bundle_id>.
- Real codesign with --entitlements when present.
- Asset dirs (add_asset_dir): recursive cp -R src/. into <bundle>/dest/.
Missing src is treated as "nothing to do" so projects can register
add_asset_dir("assets", "assets") unconditionally.
Parser:
- parseStmt() now accepts #import \"path\"; and #framework \"Name\"; as
statement-position tokens. Needed for top-level
inline if OS == .android { #import \"modules/platform/android.sx\"; }
blocks (issue-0042 flatten pass surfaces them); chess's
inline-if-with-#import was rejected at parse time before this fix.
Removals from src/target.zig:
- createBundle, embedFramework, extractEntitlements, buildInfoPlist,
codesign (~210 lines). main.zig no longer calls createBundle after
link(); the sx callback is the single entry point.
Tests / regression markers (all run under sx run host JIT):
- examples/115-post-link-callback.sx — callback registration round-trip.
- examples/116-fs-roundtrip.sx — fs.write_file -> fs.read_file -> exists.
- examples/117-process-roundtrip.sx — process.run + env + find_executable.
- examples/118-macos-bundle.sx — macOS .app via bundle_main callback.
- examples/119-interp-cast-ptr-cmp.sx — cast(T) val under interpreter.
- examples/120-interp-variadic-any.sx — variadic ..Any indexing in IR
interpreter.
- examples/121-ios-sim-bundle.sx — iOS-sim cross-compile + .app with
iOS-shaped Info.plist (added to tests/cross_compile.sh as the
ios-sim tuple).
- examples/122-ios-device-bundle.sx — iOS device cross-compile +
full codesign pipeline (provisioning embed + entitlements
extraction + --entitlements codesign). Manually verified end-to-end:
installed via xcrun devicectl device install app + launched
successfully on iPhone 17 Pro.
- examples/123-inline-if-import-in-body.sx — locks in the parser fix.
zig build && zig build test && bash tests/run_examples.sh => 141 passed,
0 failed; bash tests/cross_compile.sh => 7 passed, 0 failed.
269 lines
8.7 KiB
Plaintext
269 lines
8.7 KiB
Plaintext
#import "std.sx";
|
|
|
|
// =====================================================================
|
|
// fs.sx — file system stdlib (POSIX backend, macOS values).
|
|
//
|
|
// Allocation contract: every returned `string` or slice is allocated
|
|
// from `context.allocator`. Callers are responsible for releasing it
|
|
// (typically via an arena reset).
|
|
//
|
|
// Handle ownership: `File` is a small value-typed handle wrapping the
|
|
// POSIX file descriptor. Methods are provided for read/write/close;
|
|
// the value is invalid (fd == -1) after `close()`.
|
|
//
|
|
// Scope (Phase 1A): file I/O + directory creation/deletion + path
|
|
// helpers needed for `.app` bundling. Recursive walkers, `stat`, and
|
|
// the full path module land in subsequent phases.
|
|
// =====================================================================
|
|
|
|
libc :: #library "c";
|
|
|
|
// ── Low-level libc bindings ─────────────────────────────────────────
|
|
// These declare the actual libc symbols and must use the libc names
|
|
// verbatim (no prefix), so they live at module top-level. The public
|
|
// API below wraps them. Users should not call these directly.
|
|
//
|
|
// macOS `open` is variadic in C (`int open(const char*, int, ...)`);
|
|
// declared with `args: ..s32` so the mode is passed via the C
|
|
// variadic tail. Without that, the mode arg goes to the wrong
|
|
// register on arm64 and the file ends up with mode 0.
|
|
|
|
open :: (path: [:0]u8, flags: s32, args: ..s32) -> s32 #foreign libc;
|
|
close :: (fd: s32) -> s32 #foreign libc;
|
|
read :: (fd: s32, buf: [*]u8, count: usize) -> isize #foreign libc;
|
|
write :: (fd: s32, buf: [*]u8, count: usize) -> isize #foreign libc;
|
|
lseek :: (fd: s32, offset: s64, whence: s32) -> s64 #foreign libc;
|
|
unlink :: (path: [:0]u8) -> s32 #foreign libc;
|
|
rmdir :: (path: [:0]u8) -> s32 #foreign libc;
|
|
mkdir :: (path: [:0]u8, mode: u32) -> s32 #foreign libc;
|
|
access :: (path: [:0]u8, mode: s32) -> s32 #foreign libc;
|
|
chmod :: (path: [:0]u8, mode: u32) -> s32 #foreign libc;
|
|
rename :: (oldp: [:0]u8, newp: [:0]u8) -> s32 #foreign libc;
|
|
|
|
// macOS POSIX constants. Linux values differ; split into platform-
|
|
// conditional includes when we gain a Linux host.
|
|
O_RDONLY :s32: 0x0000;
|
|
O_WRONLY :s32: 0x0001;
|
|
O_RDWR :s32: 0x0002;
|
|
O_APPEND :s32: 0x0008;
|
|
O_CREAT :s32: 0x0200;
|
|
O_TRUNC :s32: 0x0400;
|
|
|
|
SEEK_SET :s32: 0;
|
|
SEEK_CUR :s32: 1;
|
|
SEEK_END :s32: 2;
|
|
|
|
F_OK :s32: 0;
|
|
|
|
// ── Public types ─────────────────────────────────────────────────────
|
|
|
|
OpenMode :: enum {
|
|
read; // O_RDONLY
|
|
write; // O_WRONLY | O_CREAT | O_TRUNC
|
|
append; // O_WRONLY | O_CREAT | O_APPEND
|
|
read_write; // O_RDWR
|
|
}
|
|
|
|
SeekFrom :: enum { set; current; end; }
|
|
|
|
File :: struct {
|
|
fd: s32 = -1;
|
|
|
|
is_valid :: (self: *File) -> bool { self.fd >= 0; }
|
|
|
|
close :: (self: *File) -> bool {
|
|
if self.fd < 0 { return false; }
|
|
rc := close(self.fd);
|
|
self.fd = -1;
|
|
rc == 0;
|
|
}
|
|
|
|
read :: (self: *File, buf: string) -> s64 {
|
|
if self.fd < 0 { return -1; }
|
|
n := read(self.fd, buf.ptr, xx buf.len);
|
|
cast(s64) n;
|
|
}
|
|
|
|
write :: (self: *File, data: string) -> s64 {
|
|
if self.fd < 0 { return -1; }
|
|
n := write(self.fd, data.ptr, xx data.len);
|
|
cast(s64) n;
|
|
}
|
|
|
|
seek :: (self: *File, offset: s64, whence: SeekFrom) -> s64 {
|
|
if self.fd < 0 { return -1; }
|
|
w := SEEK_SET;
|
|
if whence == .current { w = SEEK_CUR; }
|
|
if whence == .end { w = SEEK_END; }
|
|
lseek(self.fd, offset, w);
|
|
}
|
|
}
|
|
|
|
// ── High-level file API ─────────────────────────────────────────────
|
|
// Named `open_file` (not `open`) so they don't shadow libc's `open`
|
|
// symbol; the latter is needed for `#foreign libc` to resolve. Same
|
|
// idea for `delete_file`/`delete_dir` vs libc's `unlink`/`rmdir`,
|
|
// `set_mode` vs libc's `chmod`, etc.
|
|
|
|
mode_to_flags :: (m: OpenMode) -> s32 {
|
|
if m == .read { return O_RDONLY; }
|
|
if m == .write { return O_WRONLY | O_CREAT | O_TRUNC; }
|
|
if m == .append { return O_WRONLY | O_CREAT | O_APPEND; }
|
|
if m == .read_write { return O_RDWR; }
|
|
O_RDONLY;
|
|
}
|
|
|
|
open_file :: (path: [:0]u8, mode: OpenMode) -> ?File {
|
|
fd := open(path, mode_to_flags(mode), 420); // 0o644 = 420
|
|
if fd < 0 { return null; }
|
|
File.{ fd = fd };
|
|
}
|
|
|
|
// One-shot read: opens, slurps the whole file into a fresh buffer,
|
|
// closes. Returns null on any failure. Uses libc directly (not File
|
|
// methods) so it remains callable from the post-link IR interpreter,
|
|
// which doesn't yet handle `*Self` method dispatch on locally-
|
|
// unwrapped optionals.
|
|
read_file :: (path: [:0]u8) -> ?string {
|
|
fd := open(path, O_RDONLY, 0);
|
|
if fd < 0 { return null; }
|
|
size := lseek(fd, 0, SEEK_END);
|
|
if size < 0 { close(fd); return null; }
|
|
lseek(fd, 0, SEEK_SET);
|
|
buf := cstring(size);
|
|
n := read(fd, buf.ptr, xx size);
|
|
close(fd);
|
|
if cast(s64) n != size { return null; }
|
|
buf;
|
|
}
|
|
|
|
// One-shot write: creates / truncates and writes the whole buffer.
|
|
write_file :: (path: [:0]u8, data: string) -> bool {
|
|
fd := open(path, O_WRONLY | O_CREAT | O_TRUNC, 420); // 0o644
|
|
if fd < 0 { return false; }
|
|
n := write(fd, data.ptr, xx data.len);
|
|
close(fd);
|
|
cast(s64) n == cast(s64) data.len;
|
|
}
|
|
|
|
append_file :: (path: [:0]u8, data: string) -> bool {
|
|
fd := open(path, O_WRONLY | O_CREAT | O_APPEND, 420);
|
|
if fd < 0 { return false; }
|
|
n := write(fd, data.ptr, xx data.len);
|
|
close(fd);
|
|
cast(s64) n == cast(s64) data.len;
|
|
}
|
|
|
|
// ── Single-syscall ops ───────────────────────────────────────────────
|
|
|
|
exists :: (path: [:0]u8) -> bool {
|
|
access(path, F_OK) == 0;
|
|
}
|
|
|
|
delete_file :: (path: [:0]u8) -> bool {
|
|
unlink(path) == 0;
|
|
}
|
|
|
|
delete_dir :: (path: [:0]u8) -> bool {
|
|
rmdir(path) == 0;
|
|
}
|
|
|
|
create_dir :: (path: [:0]u8) -> bool {
|
|
mkdir(path, 493) == 0; // 0o755 = 493
|
|
}
|
|
|
|
set_mode :: (path: [:0]u8, mode: u32) -> bool {
|
|
chmod(path, mode) == 0;
|
|
}
|
|
|
|
move :: (oldp: [:0]u8, newp: [:0]u8) -> bool {
|
|
rename(oldp, newp) == 0;
|
|
}
|
|
|
|
// Recursive mkdir -p. Walks the path and creates each missing
|
|
// segment. Treats existing directories as success.
|
|
create_dir_all :: (path: [:0]u8) -> bool {
|
|
if path.len == 0 { return true; }
|
|
if exists(path) { return true; }
|
|
last := path.len - 1;
|
|
while last > 0 {
|
|
if path[last] == 47 { break; }
|
|
last -= 1;
|
|
}
|
|
if last > 0 {
|
|
parent := cstring(last);
|
|
memcpy(parent.ptr, path.ptr, last);
|
|
if !create_dir_all(parent) { return false; }
|
|
}
|
|
create_dir(path);
|
|
}
|
|
|
|
// Copy a file by streaming through a 64KB buffer. Uses libc directly
|
|
// (not File methods) — same interpreter-compat reason as read_file.
|
|
// No metadata is preserved beyond what `open` creates (mode 0644).
|
|
// Caller is responsible for setting executable bits with `set_mode`.
|
|
copy_file :: (src: [:0]u8, dst: [:0]u8) -> bool {
|
|
src_fd := open(src, O_RDONLY, 0);
|
|
if src_fd < 0 { return false; }
|
|
dst_fd := open(dst, O_WRONLY | O_CREAT | O_TRUNC, 420);
|
|
if dst_fd < 0 {
|
|
close(src_fd);
|
|
return false;
|
|
}
|
|
ok := true;
|
|
buf := cstring(65536);
|
|
loop := true;
|
|
while loop {
|
|
n := read(src_fd, buf.ptr, 65536);
|
|
if n < 0 { ok = false; loop = false; }
|
|
if n == 0 { loop = false; }
|
|
if n > 0 {
|
|
w := write(dst_fd, buf.ptr, xx n);
|
|
if w != cast(isize) n { ok = false; loop = false; }
|
|
}
|
|
}
|
|
close(src_fd);
|
|
close(dst_fd);
|
|
ok;
|
|
}
|
|
|
|
// ── Path helpers ─────────────────────────────────────────────────────
|
|
// `path_join` is in std.sx (used widely beyond fs). These are the
|
|
// fs-adjacent helpers — basename/dirname operate purely on text.
|
|
|
|
basename :: (p: string) -> string {
|
|
if p.len == 0 { return ""; }
|
|
last := p.len - 1;
|
|
while last > 0 {
|
|
if p[last] != 47 { break; }
|
|
last -= 1;
|
|
}
|
|
end := last + 1;
|
|
while last > 0 {
|
|
if p[last - 1] == 47 { return substr(p, last, end - last); }
|
|
last -= 1;
|
|
}
|
|
substr(p, 0, end);
|
|
}
|
|
|
|
dirname :: (p: string) -> string {
|
|
if p.len == 0 { return ""; }
|
|
last := p.len - 1;
|
|
while last > 0 {
|
|
if p[last] != 47 { break; }
|
|
last -= 1;
|
|
}
|
|
while last > 0 {
|
|
if p[last] == 47 {
|
|
while last > 0 {
|
|
if p[last - 1] != 47 { break; }
|
|
last -= 1;
|
|
}
|
|
return substr(p, 0, last);
|
|
}
|
|
last -= 1;
|
|
}
|
|
if p[0] == 47 { return "/"; }
|
|
".";
|
|
}
|