48eb7bf48a
build.sx now `#import`s the sx bundler and `default_pipeline` delegates to its
`bundle_main` when a bundle was requested (emit + link, then wrap the binary into
the `.app`/`.apk`); otherwise it just emit+links via the shared `emit_and_link`
core. The Zig `--bundle`/`post_link_module` dispatch shim is removed — the CLI
bundle flags only feed `BuildConfig`, and `default_pipeline` branches on
`bundle_path()`. Validated end-to-end on macOS: `sx build --bundle App.app
--bundle-id … foo.sx` on a plain program AND auto-bundle from `set_bundle_path`
both produce a valid signed `.app` (correct `Contents/MacOS/` layout, Info.plist,
passes `codesign`, binary runs). Also fixed a pre-existing host-build bug:
target_triple was left empty for host builds → `is_macos()` false → wrong flat
layout; main.zig now exposes the host triple when `--target` is absent.
bundle_main no longer re-calls `build_options()` (the handle is already its `opts`
param).
Fix issue 0125 (root cause): the type-match dispatcher unboxed each interned array
tag to the concrete array type — a whole-array load — and passed it to
`array_to_string` by value, which LLVM scalarized into one SelectionDAG node per
element (~12s / segfault at [65536]u8). The bundler's `format("…{}…")` instantiates
`any_to_string`, so importing it into the prelude surfaced 0125 for any large-array
program. Fix (route 1): `any_to_string`'s `case array:` arm calls `slice_to_string`,
and `lowerRuntimeDispatchCall` detects an ARRAY tag bound to a SLICE param and builds
a `{ptr,len}` slice VIEW of the payload pointer (`unbox_any → [*]elem` is an
int-to-ptr with NO load, paired with the array length) instead of loading the array.
Output is byte-identical (`[a, b, c]`). Pinned as
examples/0056-basic-large-array-format-no-blowup.sx; 0055 drops 12s → 0.2s.
37 `.ir` snapshots regenerated (build.sx now pulls in the bundler's types + the
array-format lowering changed); verified `.ir`-only, zero behavior-stream diffs.
705/0 both gates.
151 lines
8.3 KiB
Plaintext
151 lines
8.3 KiB
Plaintext
// `List` (for the default build script) + the compiler-API build primitives
|
|
// (`emit_object`/`link`/`c_object_paths`/…). The std↔build import cycle (std's
|
|
// tail imports cli.sx which imports this file) is handled by the resolver.
|
|
#import "modules/std.sx";
|
|
#import "modules/compiler.sx";
|
|
// The sx-side `.app`/`.apk` bundler. `default_pipeline` delegates to its
|
|
// `bundle_main` when a bundle was requested. The bundler is `abi(.compiler)`
|
|
// (comptime-only, never emitted into the binary), and the build↔bundle import
|
|
// cycle resolves like the std↔build one.
|
|
#import "modules/platform/bundle.sx";
|
|
|
|
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 : i64 = 8;
|
|
|
|
// An opaque compile-time build-configuration handle. `build_options()` hands one
|
|
// back; its real state lives on the compiler's threaded `BuildConfig`. The handle
|
|
// itself is a null-sentinel word (never dereferenced) — every accessor below takes
|
|
// it as an ignored `self` and reads/writes the `BuildConfig` instead. The accessors
|
|
// are free `abi(.compiler)` functions (resolved on `opt.method(...)` via UFCS) and
|
|
// serviced by `comptime_vm.callCompilerFn` — migrated off the old `struct #compiler`
|
|
// hook surface (Phase 5.5).
|
|
BuildOptions :: struct { }
|
|
|
|
build_options :: () -> BuildOptions abi(.compiler);
|
|
|
|
// ── BuildOptions accessors (free `abi(.compiler)` functions, UFCS) ───────────
|
|
|
|
add_link_flag :: ufcs (self: BuildOptions, flag: [:0]u8) abi(.compiler);
|
|
add_framework :: ufcs (self: BuildOptions, name: [:0]u8) abi(.compiler);
|
|
set_output_path :: ufcs (self: BuildOptions, path: [:0]u8) abi(.compiler);
|
|
set_wasm_shell :: ufcs (self: BuildOptions, path: [:0]u8) abi(.compiler);
|
|
|
|
// 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: zipped under
|
|
// `<dest>/` at the APK root. Idiomatic form is
|
|
// `opts.add_asset_dir("assets", "assets")`.
|
|
add_asset_dir :: ufcs (self: BuildOptions, src: [:0]u8, dest: [:0]u8) abi(.compiler);
|
|
asset_dir_count :: ufcs (self: BuildOptions) -> i64 abi(.compiler);
|
|
asset_dir_src_at :: ufcs (self: BuildOptions, i: i64) -> string abi(.compiler);
|
|
asset_dir_dest_at :: ufcs (self: BuildOptions, i: i64) -> string abi(.compiler);
|
|
|
|
// Name-based alternative to `on_build`. The compiler resolves
|
|
// `<module_name>.bundle_main` after linking.
|
|
set_post_link_module :: ufcs (self: BuildOptions, module_name: [:0]u8) abi(.compiler);
|
|
|
|
// Path of the freshly-linked binary, only meaningful while a
|
|
// post-link callback is running. Returns "" before linking.
|
|
binary_path :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
|
|
// 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 :: ufcs (self: BuildOptions, path: [:0]u8) abi(.compiler);
|
|
set_bundle_id :: ufcs (self: BuildOptions, id: [:0]u8) abi(.compiler);
|
|
set_codesign_identity :: ufcs (self: BuildOptions, identity: [:0]u8) abi(.compiler);
|
|
set_provisioning_profile :: ufcs (self: BuildOptions, path: [:0]u8) abi(.compiler);
|
|
|
|
bundle_path :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
bundle_id :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
codesign_identity :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
provisioning_profile :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
|
|
// 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 :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
is_macos :: ufcs (self: BuildOptions) -> bool abi(.compiler);
|
|
is_ios :: ufcs (self: BuildOptions) -> bool abi(.compiler);
|
|
is_ios_device :: ufcs (self: BuildOptions) -> bool abi(.compiler);
|
|
is_ios_simulator :: ufcs (self: BuildOptions) -> bool abi(.compiler);
|
|
is_android :: ufcs (self: BuildOptions) -> bool abi(.compiler);
|
|
|
|
// 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/`. Indexed form (slice returns are expressible
|
|
// now via `List`, but the bundler still walks these by index).
|
|
framework_count :: ufcs (self: BuildOptions) -> i64 abi(.compiler);
|
|
framework_at :: ufcs (self: BuildOptions, i: i64) -> string abi(.compiler);
|
|
framework_path_count :: ufcs (self: BuildOptions) -> i64 abi(.compiler);
|
|
framework_path_at :: ufcs (self: BuildOptions, i: i64) -> string abi(.compiler);
|
|
|
|
// Android APK bundling parameters. `manifest_path` overrides the
|
|
// bundler's auto-generated AndroidManifest.xml; `keystore_path`
|
|
// overrides the default `$HOME/.android/debug.keystore`. Accessors
|
|
// return "" when unset.
|
|
set_manifest_path :: ufcs (self: BuildOptions, path: [:0]u8) abi(.compiler);
|
|
set_keystore_path :: ufcs (self: BuildOptions, path: [:0]u8) abi(.compiler);
|
|
manifest_path :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
keystore_path :: ufcs (self: BuildOptions) -> string abi(.compiler);
|
|
|
|
// `#jni_main #jni_class("path") { ... }` decls collected during
|
|
// lowering. The Android bundler walks `0..jni_main_count()` and
|
|
// for each entry writes a `.java` file at
|
|
// `<stage>/java/<runtime_path>.java`, compiles via javac + d8, and
|
|
// bundles the resulting classes.dex into the APK.
|
|
jni_main_count :: ufcs (self: BuildOptions) -> i64 abi(.compiler);
|
|
jni_main_runtime_path_at :: ufcs (self: BuildOptions, i: i64) -> string abi(.compiler);
|
|
jni_main_java_source_at :: ufcs (self: BuildOptions, i: i64) -> string abi(.compiler);
|
|
|
|
// The build callback registrar (Phase 5). Registers the sx function that drives
|
|
// the build — the compiler invokes it after codegen with the `BuildOptions`
|
|
// handle. `#run on_build(build);` (from inside a `#run` block) is the override
|
|
// form, where `build :: (opt: BuildOptions) -> bool abi(.compiler) { … }`; the
|
|
// last registration wins. With no override the compiler auto-invokes the stdlib
|
|
// `default_pipeline` (below). This is the sole post-build callback mechanism.
|
|
on_build :: (cb: (opt: BuildOptions) -> bool abi(.compiler)) abi(.compiler);
|
|
|
|
// ── The default build script ────────────────────────────────────────────────
|
|
//
|
|
// `emit_and_link` is the build CORE: emit the sx object, gather the C companion
|
|
// objects, and link them into the output with the build's libraries / frameworks /
|
|
// flags / target. Shared by `default_pipeline` AND `platform.bundle.bundle_main`
|
|
// (which wraps it with the per-target `.app` / `.apk` bundling) so a bundler
|
|
// override doesn't re-implement emit+link.
|
|
emit_and_link :: (opt: BuildOptions) -> bool abi(.compiler) {
|
|
obj := emit_object();
|
|
objs := c_object_paths();
|
|
objs.append(obj);
|
|
link(objs, build_output(), link_libraries(), build_frameworks(), build_flags(), build_target());
|
|
return true;
|
|
}
|
|
|
|
// `default_pipeline` is the stdlib build driver: the compiler invokes it after
|
|
// codegen (everything is sx-driven — there is no auto-emit/auto-link). It emits +
|
|
// links the program via `emit_and_link`. A user overrides the whole pipeline with
|
|
// their own `#run on_build(custom);` in main.sx (last-wins) — e.g. bundling is
|
|
// `#import "modules/platform/bundle.sx"; #run on_build(bundle_main);`, where
|
|
// `bundle_main` runs `emit_and_link` then wraps the binary into a `.app` / `.apk`.
|
|
// The compiler FORCE-LOWERS this well-known name and auto-invokes it after codegen
|
|
// when no `on_build` override was registered (no library `#run` needed).
|
|
//
|
|
// When a bundle was requested (`--bundle`/`--apk` or `set_bundle_path`), delegate
|
|
// to the per-target bundler (`bundle_main` runs the emit+link core then wraps the
|
|
// `.app`/`.apk`); otherwise just emit + link.
|
|
default_pipeline :: (opt: BuildOptions) -> bool abi(.compiler) {
|
|
if opt.bundle_path().len > 0 {
|
|
return bundle_main(opt);
|
|
}
|
|
return emit_and_link(opt);
|
|
}
|