V2: WASI, -r flag, CI pipeline, examples & tests cleanup
Some checks failed
CI / build-test-release (pull_request) Failing after 44s
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:
parent
cdfdb976c8
commit
eaee502e8c
102 changed files with 2211 additions and 686 deletions
68
tests/WindowsViaSsh/WindowsViaSsh.cpp
Normal file
68
tests/WindowsViaSsh/WindowsViaSsh.cpp
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
/*
|
||||
Crafter® Build
|
||||
Copyright (C) 2026 Catcrafts®
|
||||
Catcrafts.net
|
||||
|
||||
LGPL-3.0-only.
|
||||
|
||||
End-to-end Linux→Windows via SSH:
|
||||
the inner fixture cross-compiles main.cpp for x86_64-w64-mingw32, the runner
|
||||
specified via CRAFTER_BUILD_RUNNER_x86_64_w64_mingw32 scp's it to a Windows
|
||||
host (winvm by default) and runs the .exe under cmd.exe via ssh. Gated on:
|
||||
- mingw cross-toolchain installed (x86_64-w64-mingw32-g++)
|
||||
- CRAFTER_TEST_WIN_SSH_HOST env var set
|
||||
- the host reachable via ssh
|
||||
*/
|
||||
|
||||
import std;
|
||||
import Crafter.Build;
|
||||
#include "../_shared/TestUtil.h"
|
||||
namespace fs = std::filesystem;
|
||||
using namespace TestUtil;
|
||||
using namespace Crafter;
|
||||
|
||||
namespace {
|
||||
bool ToolPresent(std::string_view name) {
|
||||
return std::system(std::format("which {} > /dev/null 2>&1", name).c_str()) == 0;
|
||||
}
|
||||
}
|
||||
|
||||
int main() {
|
||||
try {
|
||||
const char* hostEnv = std::getenv("CRAFTER_TEST_WIN_SSH_HOST");
|
||||
if (!hostEnv || !*hostEnv) Skip("set CRAFTER_TEST_WIN_SSH_HOST to enable, e.g. winvm");
|
||||
std::string host = hostEnv;
|
||||
|
||||
if (!ToolPresent("x86_64-w64-mingw32-g++")) Skip("mingw cross-toolchain not on PATH");
|
||||
|
||||
std::string probe = std::format("ssh -o BatchMode=yes -o ConnectTimeout=5 {} \"ver\" > /dev/null 2>&1", host);
|
||||
if (std::system(probe.c_str()) != 0) Skip(std::format("ssh {} not reachable", host));
|
||||
|
||||
std::string remoteDir = "C:/temp/crafter-test-winhello";
|
||||
std::string spec = std::format("sshwin:{}:{}", host, remoteDir);
|
||||
::setenv("CRAFTER_BUILD_RUNNER_x86_64_w64_mingw32", spec.c_str(), 1);
|
||||
|
||||
auto runner = TestRunner::FromEnv("x86_64-w64-mingw32", TestRunner::Local());
|
||||
if (runner.name != std::format("sshwin:{}", host)) {
|
||||
std::println(std::cerr, "FromEnv produced '{}', expected 'sshwin:{}'", runner.name, host);
|
||||
return 1;
|
||||
}
|
||||
|
||||
fs::path src = fs::current_path() / "tests" / "WindowsViaSsh" / "inner";
|
||||
Configuration cfg = LoadFixture("WindowsViaSsh", src);
|
||||
RunTestsOptions opts;
|
||||
TestSummary summary = RunTests(cfg, opts);
|
||||
|
||||
if (summary.passed != 1 || summary.failed != 0 || summary.crashed != 0 ||
|
||||
summary.timedOut != 0 || summary.skipped != 0) {
|
||||
std::println(std::cerr,
|
||||
"outcome counts mismatch: passed={} failed={} crashed={} timedOut={} skipped={}",
|
||||
summary.passed, summary.failed, summary.crashed, summary.timedOut, summary.skipped);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
} catch (const std::exception& e) {
|
||||
std::println(std::cerr, "test exception: {}", e.what());
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
6
tests/WindowsViaSsh/inner/main.cpp
Normal file
6
tests/WindowsViaSsh/inner/main.cpp
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
import std;
|
||||
|
||||
int main() {
|
||||
std::println("hi from windows");
|
||||
return 0;
|
||||
}
|
||||
28
tests/WindowsViaSsh/inner/project.cpp
Normal file
28
tests/WindowsViaSsh/inner/project.cpp
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
import std;
|
||||
import Crafter.Build;
|
||||
namespace fs = std::filesystem;
|
||||
using namespace Crafter;
|
||||
|
||||
extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>) {
|
||||
Configuration cfg;
|
||||
cfg.path = "./";
|
||||
cfg.name = "winhello-meta";
|
||||
cfg.outputName = "winhello-meta";
|
||||
cfg.target = "x86_64-pc-linux-gnu";
|
||||
cfg.type = ConfigurationType::Executable;
|
||||
|
||||
Test t;
|
||||
t.config.path = "./";
|
||||
t.config.name = "winhello";
|
||||
t.config.outputName = "winhello";
|
||||
t.config.target = "x86_64-w64-mingw32";
|
||||
t.config.type = ConfigurationType::Executable;
|
||||
std::array<fs::path, 0> ifaces = {};
|
||||
std::array<fs::path, 1> impls = { "main" };
|
||||
t.config.GetInterfacesAndImplementations(ifaces, impls);
|
||||
|
||||
t.runner = TestRunner::FromEnv(t.config.target);
|
||||
|
||||
cfg.tests.push_back(std::move(t));
|
||||
return cfg;
|
||||
}
|
||||
20
tests/WindowsViaSsh/project.cpp
Normal file
20
tests/WindowsViaSsh/project.cpp
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
import std;
|
||||
import Crafter.Build;
|
||||
namespace fs = std::filesystem;
|
||||
using namespace Crafter;
|
||||
|
||||
extern "C" Configuration CrafterBuildProject(std::span<const std::string_view>) {
|
||||
Configuration cfg;
|
||||
cfg.path = "tests/WindowsViaSsh/";
|
||||
cfg.name = "WindowsViaSsh";
|
||||
cfg.outputName = "WindowsViaSsh";
|
||||
cfg.target = "x86_64-pc-linux-gnu";
|
||||
cfg.type = ConfigurationType::Executable;
|
||||
cfg.dependencies = { ParentLib("crafter.build-lib") };
|
||||
cfg.linkFlags.push_back("-Wl,--export-dynamic");
|
||||
cfg.linkFlags.push_back("-ldl");
|
||||
std::array<fs::path, 0> ifaces = {};
|
||||
std::array<fs::path, 1> impls = { "WindowsViaSsh" };
|
||||
cfg.GetInterfacesAndImplementations(ifaces, impls);
|
||||
return cfg;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue