5cc62e63c3
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.
76 lines
3.7 KiB
Plaintext
76 lines
3.7 KiB
Plaintext
OperatingSystem :: enum { macos; linux; windows; wasm; ios; android; unknown; }
|
|
Architecture :: enum { aarch64; x86_64; wasm32; wasm64; unknown; }
|
|
|
|
OS : OperatingSystem = .unknown;
|
|
ARCH : Architecture = .unknown;
|
|
POINTER_SIZE : s64 = 8;
|
|
|
|
BuildOptions :: struct #compiler {
|
|
add_link_flag :: (self: BuildOptions, flag: [:0]u8);
|
|
add_framework :: (self: BuildOptions, name: [:0]u8);
|
|
set_output_path :: (self: BuildOptions, path: [:0]u8);
|
|
set_wasm_shell :: (self: BuildOptions, path: [:0]u8);
|
|
|
|
// Register a directory of runtime assets to bundle alongside the
|
|
// binary. `src` is the path on disk (relative to the CWD at build
|
|
// time); `dest` is the relative location inside the bundle / APK.
|
|
// Apple .app: copied to `<bundle>/<dest>/`. Android APK (Week 7):
|
|
// zipped under `<dest>/` at the APK root. Idiomatic chess form is
|
|
// `opts.add_asset_dir("assets", "assets")`.
|
|
add_asset_dir :: (self: BuildOptions, src: [:0]u8, dest: [:0]u8);
|
|
asset_dir_count :: (self: BuildOptions) -> s64;
|
|
asset_dir_src_at :: (self: BuildOptions, i: s64) -> string;
|
|
asset_dir_dest_at :: (self: BuildOptions, i: s64) -> string;
|
|
|
|
// Post-link callback. Registers a sx function the compiler will
|
|
// invoke after `target.link()` returns. Used by the sx-side
|
|
// bundler (`platform.bundle.bundle_main`) and by user programs
|
|
// that want custom post-build steps. Return `false` to fail the build.
|
|
set_post_link_callback :: (self: BuildOptions, cb: () -> bool);
|
|
|
|
// Name-based alternative to `set_post_link_callback`. The
|
|
// compiler resolves `<module_name>.bundle_main` after linking.
|
|
set_post_link_module :: (self: BuildOptions, module_name: [:0]u8);
|
|
|
|
// Path of the freshly-linked binary, only meaningful while a
|
|
// post-link callback is running. Returns "" before linking.
|
|
binary_path :: (self: BuildOptions) -> string;
|
|
|
|
// Apple `.app` / Android `.apk` bundling parameters. Accessors
|
|
// return "" when unset so the bundler can use a single string
|
|
// type. macOS bundling needs `bundle_path` and `bundle_id`;
|
|
// codesign / provisioning are iOS-device-only.
|
|
set_bundle_path :: (self: BuildOptions, path: [:0]u8);
|
|
set_bundle_id :: (self: BuildOptions, id: [:0]u8);
|
|
set_codesign_identity :: (self: BuildOptions, identity: [:0]u8);
|
|
set_provisioning_profile :: (self: BuildOptions, path: [:0]u8);
|
|
|
|
bundle_path :: (self: BuildOptions) -> string;
|
|
bundle_id :: (self: BuildOptions) -> string;
|
|
codesign_identity :: (self: BuildOptions) -> string;
|
|
provisioning_profile :: (self: BuildOptions) -> string;
|
|
|
|
// Target accessors. Empty triple before linking; predicates mirror
|
|
// TargetConfig.is{MacOS,IOS,IOSDevice,IOSSimulator}() on the Zig
|
|
// side. Used by the sx bundler to switch Info.plist shape and
|
|
// codesigning ceremony per platform.
|
|
target_triple :: (self: BuildOptions) -> string;
|
|
is_macos :: (self: BuildOptions) -> bool;
|
|
is_ios :: (self: BuildOptions) -> bool;
|
|
is_ios_device :: (self: BuildOptions) -> bool;
|
|
is_ios_simulator :: (self: BuildOptions) -> bool;
|
|
|
|
// Framework list accessors. The bundler walks `framework_count() *
|
|
// framework_at(i)` to find each `-framework` name and recursively
|
|
// copies its `<Name>.framework` directory from one of
|
|
// `framework_path_at(0..framework_path_count())` into
|
|
// `<bundle>/Frameworks/`. Slice returns aren't natively expressible
|
|
// through the compiler-hook bridge yet, hence the indexed form.
|
|
framework_count :: (self: BuildOptions) -> s64;
|
|
framework_at :: (self: BuildOptions, i: s64) -> string;
|
|
framework_path_count :: (self: BuildOptions) -> s64;
|
|
framework_path_at :: (self: BuildOptions, i: s64) -> string;
|
|
}
|
|
|
|
build_options :: () -> BuildOptions #compiler;
|