V2: WASI, -r flag, CI pipeline, examples & tests cleanup
Some checks failed
CI / build-test-release (pull_request) Failing after 44s

WASI / wasm32 target support
- Auto-detect /usr/share/wasi-sysroot on Linux when target starts_with("wasm32")
- Skip -march/-mtune for wasm (clang rejects them)
- Apply -fno-exceptions -fno-c++-static-destructors -mllvm -wasm-enable-sjlj
  -D_WASI_EMULATED_SIGNAL to wasm builds (compile + std PCM, kept in sync)
- .wasm output extension in expectedOutputFor and link command
- EnableWasiBrowserRuntime(cfg): opt-in helper that drops index.html +
  runtime.js next to the .wasm; runtime.js reads window.CRAFTER_WASM_URL
  set in the templated index.html so a single shim handles any output name

-r run flag in the CLI: build then exec the artifact (host targets only;
  rejects libraries; auto .exe/.wasm extension handling)

CI pipeline (.forgejo/workflows/ci.yaml)
- Triggers: PR/push to master + manual dispatch
- Single arch-latest container job: install deps, bootstrap, self-rebuild,
  run tests, cross-compile mingw, package both archives, upload artifacts
- Rolling 'latest' release published only on push/dispatch to master

mingw cross-compile from Linux now works end-to-end:
- ExternalDependency cache key includes target so per-target glslang builds
  don't collide; CMAKE_BUILD_TYPE=Release pinned (otherwise glslang appends
  'd' to lib names and breaks linking); cross-compile cmake flags
  (CMAKE_SYSTEM_NAME=Windows, CMAKE_*_COMPILER_TARGET=...)
- project.cpp accepts --target=<triple>; Linux-only -Wl,--export-dynamic
  and -ldl are gated; mingw glslang skips the standalone exe (its libgcc_eh
  link pulls pthread which mingw doesn't link by default)
- mingw compile uses -femulated-tls so std::__once_callable etc reference
  the same emutls symbols libstdc++ provides
- mingw link auto-adds -lstdc++exp -lpthread

GetCrafterBuildHome() exposed from the Platform module; LoadProject (Linux
+ Windows) now both use it instead of duplicating the resolution.

Examples reorg: hello-world, library, with-module, wasi, tests — each with
its own README. Tests reorg: per-test directory with inner/ fixture, no
shared tests/fixtures/ tree. New Wasi test verifies .wasm magic bytes.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Jorijn van der Graaf 2026-04-28 23:24:46 +02:00
commit eaee502e8c
102 changed files with 2211 additions and 686 deletions

View file

@ -0,0 +1,6 @@
export module GreetLib;
import std;
export std::string Greet() {
return "hi";
}

View file

@ -0,0 +1,8 @@
import std;
import MathLib;
import GreetLib;
int main() {
std::println("{}={}", Greet(), Add(40, 2));
return 0;
}

View file

@ -0,0 +1,5 @@
export module MathLib;
export int Add(int a, int b) {
return a + b;
}

View file

@ -0,0 +1,47 @@
import std;
import Crafter.Build;
namespace fs = std::filesystem;
using namespace Crafter;
extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>) {
static auto MathStatic = std::make_unique<Configuration>();
MathStatic->path = "./mathlib/";
MathStatic->name = "MathLib";
MathStatic->outputName = "MathLib";
MathStatic->target = "x86_64-pc-linux-gnu";
MathStatic->type = ConfigurationType::LibraryStatic;
{
std::array<fs::path, 1> ifaces = { "MathLib" };
std::array<fs::path, 0> impls = {};
MathStatic->GetInterfacesAndImplementations(ifaces, impls);
}
static auto GreetDynamic = std::make_unique<Configuration>();
GreetDynamic->path = "./greetlib/";
GreetDynamic->name = "GreetLib";
GreetDynamic->outputName = "GreetLib";
GreetDynamic->target = "x86_64-pc-linux-gnu";
GreetDynamic->type = ConfigurationType::LibraryDynamic;
{
std::array<fs::path, 1> ifaces = { "GreetLib" };
std::array<fs::path, 0> impls = {};
GreetDynamic->GetInterfacesAndImplementations(ifaces, impls);
}
Configuration app;
app.path = "./";
app.name = "libs-app";
app.outputName = "libs-app";
app.target = "x86_64-pc-linux-gnu";
app.type = ConfigurationType::Executable;
app.dependencies = { MathStatic.get(), GreetDynamic.get() };
{
std::array<fs::path, 0> ifaces = {};
std::array<fs::path, 1> impls = { "main" };
app.GetInterfacesAndImplementations(ifaces, impls);
}
app.linkFlags.push_back("-Wl,--export-dynamic");
app.linkFlags.push_back("-ldl");
return app;
}