2026-04-23 01:57:25 +02:00
|
|
|
/*
|
|
|
|
|
Crafter® Build
|
|
|
|
|
Copyright (C) 2026 Catcrafts®
|
|
|
|
|
Catcrafts.net
|
|
|
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
License version 3.0 as published by the Free Software Foundation;
|
|
|
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
License along with this library; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
*/
|
|
|
|
|
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
module;
|
|
|
|
|
#include "Crafter.Build-Api.h"
|
2026-04-23 01:57:25 +02:00
|
|
|
export module Crafter.Build:Clang;
|
|
|
|
|
import std;
|
|
|
|
|
import :Shader;
|
2026-04-27 07:04:42 +02:00
|
|
|
import :Interface;
|
|
|
|
|
import :Implementation;
|
|
|
|
|
import :External;
|
2026-04-23 01:57:25 +02:00
|
|
|
namespace fs = std::filesystem;
|
|
|
|
|
|
|
|
|
|
export namespace Crafter {
|
|
|
|
|
struct BuildResult {
|
|
|
|
|
std::string result;
|
|
|
|
|
bool repack;
|
|
|
|
|
std::unordered_set<std::string> libs;
|
2026-05-01 19:02:14 +02:00
|
|
|
// Compile flags (typically -I include paths) the dep wants its
|
|
|
|
|
// consumers to see — sourced from its external dependencies' include
|
|
|
|
|
// dirs so headers a dep exposes in its public modules are reachable
|
|
|
|
|
// when a consumer #includes them directly. Propagates transitively.
|
|
|
|
|
std::unordered_set<std::string> publicCompileFlags;
|
2026-04-27 07:04:42 +02:00
|
|
|
};
|
2026-04-23 01:57:25 +02:00
|
|
|
|
2026-04-27 07:04:42 +02:00
|
|
|
struct Define {
|
2026-04-23 01:57:25 +02:00
|
|
|
std::string name;
|
|
|
|
|
std::string value;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum class ConfigurationType {
|
|
|
|
|
Executable,
|
|
|
|
|
LibraryStatic,
|
|
|
|
|
LibraryDynamic,
|
|
|
|
|
};
|
|
|
|
|
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
struct Test;
|
|
|
|
|
|
|
|
|
|
struct TestRunner {
|
2026-05-27 18:07:33 +02:00
|
|
|
// Command template the harness executes to run the test binary.
|
|
|
|
|
// Local runners leave this empty; prefix runners (Cmd, Wine) set it to
|
|
|
|
|
// a template like "wine {bin} {args}" or "qemu-aarch64 {bin} {args}".
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
std::string exec;
|
2026-05-27 18:07:33 +02:00
|
|
|
// Display name; also the cache key for the availability probe.
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
std::string name;
|
|
|
|
|
// Runs once per RunTests invocation (cached by `name`). Exit 0 = runner
|
|
|
|
|
// is available; non-zero = skip every Test using this runner with a
|
|
|
|
|
// "runner unavailable" message. Empty = always available (e.g., Local).
|
|
|
|
|
std::string probe;
|
|
|
|
|
|
|
|
|
|
bool IsLocal() const { return exec.empty(); }
|
|
|
|
|
|
|
|
|
|
static CRAFTER_API TestRunner Local();
|
2026-05-27 18:07:33 +02:00
|
|
|
// Prefix runner: wraps the local binary in `<command> {bin} {args}`.
|
|
|
|
|
// Used for qemu-user, wasmtime, and similar single-binary wrappers.
|
V2: WASI, -r flag, CI pipeline, examples & tests cleanup
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>
2026-04-28 23:24:46 +02:00
|
|
|
static CRAFTER_API TestRunner Cmd(std::string command);
|
test: introduce test.toml + target-derived runners alongside existing machinery
Vendors toml++ v3.4.0 as lib/toml.hpp and wires it into Crafter.Build-Test
to parse a declarative test.toml manifest (target/march/mtune/sysroot/
requires/timeout/args/defines). Test discovery now treats project.cpp and
test.toml as mutually exclusive: project.cpp stays the escape hatch for
outer-driver tests, test.toml gives downstream test authors a no-boilerplate
path.
Adds:
- TestRunner::Wine() and TestRunner::ForTarget(cfg) — runner is now derived
from cfg.target (Local for host, Wine for Windows-on-Linux, wasmtime for
WASI, qemu-<arch> with QEMU_LD_PREFIX for non-host Linux). The env-var
override CRAFTER_BUILD_RUNNER_<target> still wins as a power-user escape
hatch via FromEnv.
- Declarative preconditions: tool:<name>, file:<path>, env:<VAR> are
evaluated before the build; missing preconditions Skip without paying
the compile cost.
- Hard-fail-unless-declared: when a derived runner's tool is missing AND
the test didn't declare 'tool:<that>' in requires, the missing runner
is a Fail instead of a silent Skip. Surfaces broken cross-arch CI
config that previously hid as "skipped".
- Multi-target sweep: bare `crafter-build test` (no --target=) now
iterates every distinct test.toml-declared target plus the host, so
cross-arch tests run by default without the user needing to know which
targets exist. `--target=X` bypasses the sweep.
Test struct gains a `requires_` vector so project.cpp users can declare
preconditions too (matching what test.toml writes there).
Existing tests, factories (Ssh/SshWin/Wsl/Cmd), and CRAFTER_BUILD_RUNNER_*
machinery remain intact — this commit only adds; migration and deletion
follow in subsequent commits.
Refs issue #8.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-27 17:47:39 +02:00
|
|
|
// Run a Windows .exe through Wine. Probes `wine` on PATH; on a Windows
|
|
|
|
|
// host the wine wrapper is pointless, so callers should route to Local
|
|
|
|
|
// before reaching here.
|
|
|
|
|
static CRAFTER_API TestRunner Wine();
|
2026-05-27 18:07:33 +02:00
|
|
|
// Parse a `<kind>[:<arg>]` spec used by CRAFTER_BUILD_RUNNER_<target>
|
|
|
|
|
// and --runner=. Supported: "local", "cmd:<binary>". Returns nullopt
|
|
|
|
|
// for an empty string; throws on a non-empty unrecognized spec.
|
V2: WASI, -r flag, CI pipeline, examples & tests cleanup
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>
2026-04-28 23:24:46 +02:00
|
|
|
static CRAFTER_API std::optional<TestRunner> FromSpec(std::string_view spec);
|
2026-05-27 18:07:33 +02:00
|
|
|
// Honor CRAFTER_BUILD_RUNNER_<target> (power-user override). Triple
|
|
|
|
|
// dashes/dots become underscores so they're valid in env-var names.
|
|
|
|
|
// Returns `fallback` when the env var is unset.
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
static CRAFTER_API TestRunner FromEnv(std::string_view target, TestRunner fallback = Local());
|
test: introduce test.toml + target-derived runners alongside existing machinery
Vendors toml++ v3.4.0 as lib/toml.hpp and wires it into Crafter.Build-Test
to parse a declarative test.toml manifest (target/march/mtune/sysroot/
requires/timeout/args/defines). Test discovery now treats project.cpp and
test.toml as mutually exclusive: project.cpp stays the escape hatch for
outer-driver tests, test.toml gives downstream test authors a no-boilerplate
path.
Adds:
- TestRunner::Wine() and TestRunner::ForTarget(cfg) — runner is now derived
from cfg.target (Local for host, Wine for Windows-on-Linux, wasmtime for
WASI, qemu-<arch> with QEMU_LD_PREFIX for non-host Linux). The env-var
override CRAFTER_BUILD_RUNNER_<target> still wins as a power-user escape
hatch via FromEnv.
- Declarative preconditions: tool:<name>, file:<path>, env:<VAR> are
evaluated before the build; missing preconditions Skip without paying
the compile cost.
- Hard-fail-unless-declared: when a derived runner's tool is missing AND
the test didn't declare 'tool:<that>' in requires, the missing runner
is a Fail instead of a silent Skip. Surfaces broken cross-arch CI
config that previously hid as "skipped".
- Multi-target sweep: bare `crafter-build test` (no --target=) now
iterates every distinct test.toml-declared target plus the host, so
cross-arch tests run by default without the user needing to know which
targets exist. `--target=X` bypasses the sweep.
Test struct gains a `requires_` vector so project.cpp users can declare
preconditions too (matching what test.toml writes there).
Existing tests, factories (Ssh/SshWin/Wsl/Cmd), and CRAFTER_BUILD_RUNNER_*
machinery remain intact — this commit only adds; migration and deletion
follow in subsequent commits.
Refs issue #8.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-27 17:47:39 +02:00
|
|
|
// Derive a runner from a Configuration's target triple + sysroot.
|
|
|
|
|
// Returns Local() when target equals the host, Wine() for Windows
|
|
|
|
|
// targets on a non-Windows host, `qemu-<arch>` (with QEMU_LD_PREFIX
|
|
|
|
|
// set when cfg.sysroot is non-empty) for non-host -linux- triples,
|
|
|
|
|
// `wasmtime` for wasm32-wasi/wasm64-wasi, and Local() as a last
|
|
|
|
|
// resort. CRAFTER_BUILD_RUNNER_<target> still wins as an override
|
|
|
|
|
// upstream of this — see FromEnv.
|
|
|
|
|
static CRAFTER_API TestRunner ForTarget(const struct Configuration& cfg);
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum class TestOutcome { Pass, Fail, Crash, Timeout, Skipped };
|
|
|
|
|
|
|
|
|
|
struct TestResult {
|
|
|
|
|
std::string name;
|
|
|
|
|
TestOutcome outcome = TestOutcome::Pass;
|
|
|
|
|
int exitCode = 0;
|
|
|
|
|
int signal = 0;
|
|
|
|
|
std::chrono::milliseconds duration{0};
|
|
|
|
|
std::string output;
|
|
|
|
|
};
|
|
|
|
|
|
2026-04-29 18:59:01 +02:00
|
|
|
// The host target triple, detected once per process by running
|
|
|
|
|
// `clang++ -print-target-triple` and cached. Used as the default for
|
|
|
|
|
// Configuration::target so projects don't have to hardcode it for the
|
|
|
|
|
// no-cross-compile case. Returns "" if clang isn't on PATH or doesn't
|
|
|
|
|
// print a triple — those projects still need an explicit cfg.target.
|
|
|
|
|
CRAFTER_API std::string HostTarget();
|
|
|
|
|
|
2026-04-23 01:57:25 +02:00
|
|
|
struct Configuration {
|
2026-04-27 07:04:42 +02:00
|
|
|
fs::path path;
|
|
|
|
|
std::string outputName;
|
|
|
|
|
std::string name;
|
2026-04-23 01:57:25 +02:00
|
|
|
std::string march = "native";
|
|
|
|
|
std::string mtune = "native";
|
2026-04-29 18:59:01 +02:00
|
|
|
std::string target = HostTarget();
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
std::string sysroot;
|
2026-04-23 01:57:25 +02:00
|
|
|
bool debug = false;
|
|
|
|
|
ConfigurationType type = ConfigurationType::Executable;
|
2026-04-27 07:04:42 +02:00
|
|
|
std::vector<std::unique_ptr<Module>> interfaces;
|
|
|
|
|
std::vector<Implementation> implementations;
|
|
|
|
|
std::vector<fs::path> cFiles;
|
|
|
|
|
std::vector<fs::path> cuda;
|
|
|
|
|
std::vector<Configuration*> dependencies;
|
|
|
|
|
std::vector<fs::path> files;
|
2026-05-02 21:08:51 +02:00
|
|
|
// Build-time-only source files this configuration exposes to its own
|
|
|
|
|
// and its consumers' shader compiles as glslang #include search
|
|
|
|
|
// paths. Each entry's parent directory (or the entry itself, if it's
|
|
|
|
|
// a directory) is added to the includer for every shader compiled in
|
|
|
|
|
// this configuration and in any configuration that transitively
|
|
|
|
|
// depends on it. Files are NOT copied — they're read in place from
|
|
|
|
|
// the dep's source tree, like C++ -I include dirs.
|
|
|
|
|
std::vector<fs::path> buildFiles;
|
2026-04-23 01:57:25 +02:00
|
|
|
std::vector<Define> defines;
|
|
|
|
|
std::vector<Shader> shaders;
|
2026-05-12 03:44:14 +02:00
|
|
|
// Source assets compressed via Crafter.Asset's SaveCompressed →
|
|
|
|
|
// .ctex/.cmesh in this configuration's bin dir.
|
|
|
|
|
//
|
|
|
|
|
// Each entry is either:
|
|
|
|
|
// - A single .png/.obj file. Output lands flat in the bin dir:
|
|
|
|
|
// bin/<filename>.ctex or bin/<filename>.cmesh.
|
|
|
|
|
// - A directory. The build recurses; .png/.obj are compressed
|
|
|
|
|
// with the relative tree mirrored under bin/<dirname>/, and
|
|
|
|
|
// every other file in the tree is copied through unchanged.
|
|
|
|
|
// Lets mod/map trees (mod.json + cannon/base.obj +
|
|
|
|
|
// cannon/color.png) keep their nested layout so JSON paths
|
|
|
|
|
// like "cannon/base.cmesh" resolve at runtime.
|
|
|
|
|
//
|
|
|
|
|
// Crafter.Asset must be reachable through cfg.dependencies (the
|
|
|
|
|
// build engine links its library API into crafter-build via a
|
|
|
|
|
// self-host pass). Forwarded to a consuming executable's bin dir
|
|
|
|
|
// alongside .spv shaders and cfg.files entries.
|
2026-05-12 01:16:40 +02:00
|
|
|
std::vector<fs::path> assets;
|
2026-04-27 07:04:42 +02:00
|
|
|
std::vector<ExternalDependency> externalDependencies;
|
|
|
|
|
std::vector<std::string> compileFlags;
|
|
|
|
|
std::vector<std::string> linkFlags;
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
std::vector<Test> tests;
|
|
|
|
|
CRAFTER_API void GetInterfacesAndImplementations(std::span<fs::path> interfaces, std::span<fs::path> implementations);
|
2026-05-27 19:45:05 +02:00
|
|
|
// Declare a test. Sources default to `tests/<name>/main.cpp` resolved
|
|
|
|
|
// against this Configuration's path; target/march/mtune/debug are
|
|
|
|
|
// inherited from this Configuration so cross-arch projects don't have
|
|
|
|
|
// to re-specify. Returns a builder for chaining defines, deps, etc.
|
|
|
|
|
// Defined in Crafter.Build:Test.
|
|
|
|
|
CRAFTER_API struct TestBuilder AddTest(std::string_view name);
|
|
|
|
|
// Same as AddTest, but compiles the parent's `interfaces` directly
|
|
|
|
|
// into this test's Configuration (rather than going through a dep).
|
|
|
|
|
// Use when the test must rebuild those interfaces with its own
|
|
|
|
|
// compile flags — typically per-march SIMD codegen.
|
|
|
|
|
CRAFTER_API struct TestBuilder AddTest(std::string_view name, std::span<fs::path> interfaces);
|
|
|
|
|
// Math-style fan-out: one Test per MarchTier, all sharing the same
|
|
|
|
|
// `tests/<name>/main.cpp` source and the same interface set, each
|
|
|
|
|
// compiled with the tier's `-march`/`-mtune`. Test names are
|
|
|
|
|
// `<name>-<march>`.
|
|
|
|
|
CRAFTER_API void AddMarchVariants(std::string_view name,
|
|
|
|
|
std::span<fs::path> interfaces,
|
|
|
|
|
std::span<const struct MarchTier> tiers);
|
2026-04-30 02:20:19 +02:00
|
|
|
// Suffix that uniquely identifies this Configuration's compile state.
|
|
|
|
|
// target+march+mtune are spelled out for readability; the rest
|
|
|
|
|
// (type, debug, sysroot, defines, compileFlags) collapse into a short
|
|
|
|
|
// hash so two Configurations sharing a path but with different
|
|
|
|
|
// compile state can't clobber each other's outputs.
|
|
|
|
|
std::string VariantId() const {
|
|
|
|
|
std::string compileKey;
|
|
|
|
|
compileKey += std::to_string(static_cast<int>(type));
|
|
|
|
|
compileKey += '|';
|
|
|
|
|
compileKey += debug ? '1' : '0';
|
|
|
|
|
compileKey += '|';
|
|
|
|
|
compileKey += sysroot;
|
|
|
|
|
for (const Define& d : defines) {
|
|
|
|
|
compileKey += "|D:";
|
|
|
|
|
compileKey += d.name;
|
|
|
|
|
compileKey += '=';
|
|
|
|
|
compileKey += d.value;
|
|
|
|
|
}
|
|
|
|
|
for (const std::string& f : compileFlags) {
|
|
|
|
|
compileKey += "|F:";
|
|
|
|
|
compileKey += f;
|
|
|
|
|
}
|
|
|
|
|
std::size_t configHash = std::hash<std::string>{}(compileKey);
|
|
|
|
|
return std::format("{}-{}-{}-{}-{:08x}", name, target, march, mtune, configHash);
|
|
|
|
|
}
|
|
|
|
|
fs::path BuildDir() const { return path / "build" / VariantId(); }
|
|
|
|
|
fs::path BinDir() const { return path / "bin" / VariantId(); }
|
2026-04-27 07:04:42 +02:00
|
|
|
fs::path PcmDir() const {
|
2026-04-30 02:20:19 +02:00
|
|
|
return type == ConfigurationType::Executable ? BuildDir() : BinDir();
|
2026-04-27 07:04:42 +02:00
|
|
|
}
|
|
|
|
|
};
|
2026-04-23 01:57:25 +02:00
|
|
|
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
struct Test {
|
|
|
|
|
Configuration config;
|
|
|
|
|
TestRunner runner;
|
|
|
|
|
std::chrono::seconds timeout{60};
|
|
|
|
|
std::vector<std::string> args;
|
test: introduce test.toml + target-derived runners alongside existing machinery
Vendors toml++ v3.4.0 as lib/toml.hpp and wires it into Crafter.Build-Test
to parse a declarative test.toml manifest (target/march/mtune/sysroot/
requires/timeout/args/defines). Test discovery now treats project.cpp and
test.toml as mutually exclusive: project.cpp stays the escape hatch for
outer-driver tests, test.toml gives downstream test authors a no-boilerplate
path.
Adds:
- TestRunner::Wine() and TestRunner::ForTarget(cfg) — runner is now derived
from cfg.target (Local for host, Wine for Windows-on-Linux, wasmtime for
WASI, qemu-<arch> with QEMU_LD_PREFIX for non-host Linux). The env-var
override CRAFTER_BUILD_RUNNER_<target> still wins as a power-user escape
hatch via FromEnv.
- Declarative preconditions: tool:<name>, file:<path>, env:<VAR> are
evaluated before the build; missing preconditions Skip without paying
the compile cost.
- Hard-fail-unless-declared: when a derived runner's tool is missing AND
the test didn't declare 'tool:<that>' in requires, the missing runner
is a Fail instead of a silent Skip. Surfaces broken cross-arch CI
config that previously hid as "skipped".
- Multi-target sweep: bare `crafter-build test` (no --target=) now
iterates every distinct test.toml-declared target plus the host, so
cross-arch tests run by default without the user needing to know which
targets exist. `--target=X` bypasses the sweep.
Test struct gains a `requires_` vector so project.cpp users can declare
preconditions too (matching what test.toml writes there).
Existing tests, factories (Ssh/SshWin/Wsl/Cmd), and CRAFTER_BUILD_RUNNER_*
machinery remain intact — this commit only adds; migration and deletion
follow in subsequent commits.
Refs issue #8.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-27 17:47:39 +02:00
|
|
|
// Declarative preconditions. Each entry is "tool:<name>",
|
|
|
|
|
// "file:<path>", or "env:<VAR>". Evaluated before the test runs; any
|
|
|
|
|
// unmet require turns the test into a Skip with a derived reason.
|
|
|
|
|
// Also doubles as the "I know this runner might not be here" opt-in:
|
|
|
|
|
// when the test's derived runner needs a tool (e.g. qemu-aarch64,
|
|
|
|
|
// wasmtime, wine) and the matching tool: entry isn't present, an
|
|
|
|
|
// unavailable runner becomes a Fail instead of a silent Skip — the
|
|
|
|
|
// dependency has to be declared to be allowed to be missing.
|
|
|
|
|
std::vector<std::string> requires_;
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
};
|
2026-04-27 07:04:42 +02:00
|
|
|
|
test runner, cross-target runners, lib/exe split
- subprocess-isolated test runner (replaces V1 dlopen-RunTest);
Pass/Fail/Crash/Timeout/Skipped outcomes via :Test partition
- TestRunner abstraction with command templates: Local, Ssh,
SshWin (cmd.exe-shell), QemuUser, FromEnv; probe-based skip
when runner unreachable
- transitive PCM-path propagation in Build(); resolveImport
walks deps recursively; depResults cache keyed by PcmDir()
so per-target builds don't collide
- cfg.sysroot threaded through BuildStdPcm + base compile/link
command (enables aarch64 cross via Arch Linux ARM rootfs)
- lib + exe split: project.cpp defines crafterBuildLib
(LibraryStatic) + crafterBuildExe (Executable depending on
it); build.sh produces lib/libcrafter-build.a alongside
bin/crafter-build for downstream static-link consumers
- Windows DLL+launcher: CRAFTER_API macro, /EXPORT flag for
project.dll's CrafterBuildProject; Crafter::Run as the real
entry point with main.cpp as a thin wrapper
- 18 tests: HelloWorld/WithModule/Defines/CrossProjectModule/
Diamond × (Linux + sshwin:winvm), plus Incremental,
BuildError, Libraries, RunnerClassification, QemuUser,
SshRunner, WindowsViaSsh, CrossArchAarch64
- single ./bin/crafter-build test runs everything; Windows
variants skip gracefully if winvm SSH alias unreachable
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-04-27 22:32:19 +02:00
|
|
|
CRAFTER_API BuildResult Build(Configuration& config, std::unordered_map<fs::path, std::shared_future<BuildResult>>& depResults, std::mutex& depMutex);
|
|
|
|
|
|
|
|
|
|
CRAFTER_API int Run(int argc, char** argv);
|
V2: WASI, -r flag, CI pipeline, examples & tests cleanup
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>
2026-04-28 23:24:46 +02:00
|
|
|
|
|
|
|
|
// Add a small index.html + runtime.js pair next to the .wasm output so the
|
|
|
|
|
// build can be loaded directly in a browser (just `serve` the bin dir and
|
|
|
|
|
// open it). Opt-in: WASI builds destined for wasmtime/wasmer don't need
|
|
|
|
|
// this and shouldn't carry the extra files. Call from project.cpp after
|
|
|
|
|
// outputName is set; index.html is generated against the current
|
|
|
|
|
// outputName so renaming the binary later requires another call.
|
|
|
|
|
CRAFTER_API void EnableWasiBrowserRuntime(Configuration& cfg);
|
2026-04-29 18:59:01 +02:00
|
|
|
|
2026-04-30 04:15:29 +02:00
|
|
|
// View over the project's args with simple query helpers. Has(flag) for
|
|
|
|
|
// boolean switches; Get(prefix) for valued options (e.g. Get("--prefix=")
|
|
|
|
|
// returns the substring after the equals). Definitions are out-of-line
|
|
|
|
|
// and CRAFTER_API so they cross the Windows DLL boundary cleanly — clang
|
|
|
|
|
// does not emit module-attached in-class inline bodies into consumers.
|
2026-04-30 02:20:19 +02:00
|
|
|
struct ArgQuery {
|
|
|
|
|
std::span<const std::string_view> args;
|
2026-04-30 04:15:29 +02:00
|
|
|
CRAFTER_API bool Has(std::string_view flag) const;
|
|
|
|
|
CRAFTER_API std::optional<std::string> Get(std::string_view prefix) const;
|
2026-04-30 02:20:19 +02:00
|
|
|
};
|
|
|
|
|
|
2026-04-29 18:59:01 +02:00
|
|
|
// Apply the framework's standard CLI args + env vars onto cfg:
|
|
|
|
|
// --debug cfg.debug = true
|
|
|
|
|
// --target=<triple> cfg.target = <triple>
|
|
|
|
|
// --march=<value> cfg.march = <value>
|
|
|
|
|
// --mtune=<value> cfg.mtune = <value>
|
2026-04-30 02:20:19 +02:00
|
|
|
// --lib cfg.type promoted Executable → LibraryStatic
|
|
|
|
|
// --shared cfg.type promoted LibraryStatic → LibraryDynamic
|
|
|
|
|
// Promotions chain in priority order so `--lib --shared` lands on
|
|
|
|
|
// LibraryDynamic regardless of arg order; each is a no-op when the
|
|
|
|
|
// baseline doesn't match (e.g. --shared on an Executable, or --lib on a
|
|
|
|
|
// pre-set library).
|
2026-04-29 18:59:01 +02:00
|
|
|
// $CRAFTER_BUILD_MARCH / $CRAFTER_BUILD_MTUNE seed march/mtune.
|
|
|
|
|
// Env applies first, then args, so CLI wins over env wins over caller's
|
2026-04-30 02:20:19 +02:00
|
|
|
// pre-set defaults. Returns an ArgQuery over the same span so projects
|
|
|
|
|
// can query their own flags (`--timing`, ...) without re-rolling the
|
|
|
|
|
// for-arg-in-args loop.
|
|
|
|
|
CRAFTER_API ArgQuery ApplyStandardArgs(Configuration& cfg, std::span<const std::string_view> args);
|
2026-04-23 01:57:25 +02:00
|
|
|
}
|