Jorijn van der Graaf
eaee502e8c
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>
63 lines
2.2 KiB
C++
63 lines
2.2 KiB
C++
/*
|
|
Crafter® Build
|
|
Copyright (C) 2026 Catcrafts®
|
|
Catcrafts.net
|
|
|
|
LGPL-3.0-only.
|
|
*/
|
|
|
|
import std;
|
|
import Crafter.Build;
|
|
#include "../_shared/TestUtil.h"
|
|
namespace fs = std::filesystem;
|
|
using namespace TestUtil;
|
|
using namespace Crafter;
|
|
|
|
int main() {
|
|
try {
|
|
fs::path src = fs::current_path() / "tests" / "Libraries" / "inner";
|
|
Configuration cfg = LoadFixture("Libraries", src);
|
|
fs::path work = fs::current_path();
|
|
|
|
auto br = BuildOnce(cfg);
|
|
if (!br.result.empty()) {
|
|
std::println(std::cerr, "build failed:\n{}", br.result);
|
|
return 1;
|
|
}
|
|
|
|
fs::path staticArchive = work / "mathlib" / "bin" / "MathLib-x86_64-pc-linux-gnu-native" / "libMathLib.a";
|
|
fs::path dynamicSO = work / "greetlib" / "bin" / "GreetLib-x86_64-pc-linux-gnu-native" / "libGreetLib.so";
|
|
fs::path artifact = work / "bin" / "libs-app-x86_64-pc-linux-gnu-native" / "libs-app";
|
|
|
|
if (!fs::exists(staticArchive)) {
|
|
std::println(std::cerr, "static archive missing at {}", staticArchive.string());
|
|
return 1;
|
|
}
|
|
if (!fs::exists(dynamicSO)) {
|
|
std::println(std::cerr, "dynamic .so missing at {}", dynamicSO.string());
|
|
return 1;
|
|
}
|
|
if (!fs::exists(artifact)) {
|
|
std::println(std::cerr, "exe missing at {}", artifact.string());
|
|
return 1;
|
|
}
|
|
|
|
// Linked against the dynamic .so which lives in greetlib/bin/...; set
|
|
// LD_LIBRARY_PATH explicitly for the artifact run.
|
|
auto run = RunInDir(work, std::format(
|
|
"LD_LIBRARY_PATH='{}' '{}'",
|
|
dynamicSO.parent_path().string(), artifact.string()));
|
|
if (run.exitCode != 0) {
|
|
std::println(std::cerr, "artifact exited nonzero (rc={}):\n{}", run.exitCode, run.output);
|
|
return 1;
|
|
}
|
|
if (run.output != "hi=42\n") {
|
|
std::println(std::cerr, "output mismatch:\n expected: \"hi=42\\n\"\n got: {:?}", run.output);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
} catch (const std::exception& e) {
|
|
std::println(std::cerr, "test exception: {}", e.what());
|
|
return 1;
|
|
}
|
|
}
|