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>
This commit is contained in:
parent
f13671b2be
commit
cdfdb976c8
60 changed files with 2029 additions and 104 deletions
26
build.cmd
26
build.cmd
|
|
@ -1,6 +1,7 @@
|
|||
@echo OFF
|
||||
mkdir build 2>nul
|
||||
mkdir bin 2>nul
|
||||
mkdir lib 2>nul
|
||||
mkdir share\crafter-build 2>nul
|
||||
|
||||
copy /Y interfaces\Crafter.Build.cppm share\crafter-build\
|
||||
|
|
@ -10,6 +11,8 @@ copy /Y interfaces\Crafter.Build-Interface.cppm share\crafter-build\
|
|||
copy /Y interfaces\Crafter.Build-Implementation.cppm share\crafter-build\
|
||||
copy /Y interfaces\Crafter.Build-External.cppm share\crafter-build\
|
||||
copy /Y interfaces\Crafter.Build-Clang.cppm share\crafter-build\
|
||||
copy /Y interfaces\Crafter.Build-Test.cppm share\crafter-build\
|
||||
copy /Y interfaces\Crafter.Build-Api.h share\crafter-build\
|
||||
|
||||
if not exist .\build\glslang\NUL git clone https://github.com/KhronosGroup/glslang.git .\build\glslang
|
||||
|
||||
|
|
@ -45,6 +48,7 @@ clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Interface.cppm
|
|||
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Implementation.cppm -o .\build\Crafter.Build-Implementation.o
|
||||
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-External.cppm -o .\build\Crafter.Build-External.o
|
||||
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Clang.cppm -o .\build\Crafter.Build-Clang.o
|
||||
clang++ %common_options% -fmodule-output interfaces\Crafter.Build-Test.cppm -o .\build\Crafter.Build-Test.o
|
||||
clang++ %common_options% -fmodule-output interfaces\Crafter.Build.cppm -o .\build\Crafter.Build.o
|
||||
|
||||
clang++ %common_options% .\implementations\Crafter.Build-Shader.cpp -o .\build\Crafter.Build-Shader_impl.o
|
||||
|
|
@ -53,11 +57,11 @@ clang++ %common_options% .\implementations\Crafter.Build-Interface.cpp -o .\buil
|
|||
clang++ %common_options% .\implementations\Crafter.Build-Implementation.cpp -o .\build\Crafter.Build-Implementation_impl.o
|
||||
clang++ %common_options% .\implementations\Crafter.Build-External.cpp -o .\build\Crafter.Build-External_impl.o
|
||||
clang++ %common_options% .\implementations\Crafter.Build-Clang.cpp -o .\build\Crafter.Build-Clang_impl.o
|
||||
clang++ %common_options% .\implementations\Crafter.Build-Test.cpp -o .\build\Crafter.Build-Test_impl.o
|
||||
clang++ %common_options% .\implementations\main.cpp -o .\build\main.o
|
||||
|
||||
REM Step 1: link all impl .o files into crafter-build.dll, generating crafter-build.lib import lib
|
||||
clang++ %useLibcLinker% -shared -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtune=%CRAFTER_BUILD_MTUNE% -L.\build -fuse-ld=lld ^
|
||||
-Wl,-export-all-symbols ^
|
||||
-Wl,/IMPLIB:.\bin\crafter-build.lib ^
|
||||
-lSPIRV -lGenericCodeGen -lglslang -lOSDependent -lMachineIndependent -lglslang-default-resource-limits ^
|
||||
.\build\Crafter.Build-Shader.o ^
|
||||
|
|
@ -66,6 +70,7 @@ clang++ %useLibcLinker% -shared -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtu
|
|||
.\build\Crafter.Build-Implementation.o ^
|
||||
.\build\Crafter.Build-External.o ^
|
||||
.\build\Crafter.Build-Clang.o ^
|
||||
.\build\Crafter.Build-Test.o ^
|
||||
.\build\Crafter.Build.o ^
|
||||
.\build\Crafter.Build-Shader_impl.o ^
|
||||
.\build\Crafter.Build-Platform_impl.o ^
|
||||
|
|
@ -73,6 +78,7 @@ clang++ %useLibcLinker% -shared -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtu
|
|||
.\build\Crafter.Build-Implementation_impl.o ^
|
||||
.\build\Crafter.Build-External_impl.o ^
|
||||
.\build\Crafter.Build-Clang_impl.o ^
|
||||
.\build\Crafter.Build-Test_impl.o ^
|
||||
-o .\bin\crafter-build.dll
|
||||
|
||||
REM Step 2: link the launcher exe against crafter-build.lib
|
||||
|
|
@ -81,4 +87,22 @@ clang++ %useLibcLinker% -std=c++26 -O3 -march=%CRAFTER_BUILD_MARCH% -mtune=%CRAF
|
|||
.\bin\crafter-build.lib ^
|
||||
-o .\bin\crafter-build.exe
|
||||
|
||||
REM Step 3: bundle the same .o set as a static archive for downstream consumers
|
||||
llvm-lib.exe /OUT:.\lib\crafter-build-static.lib ^
|
||||
.\build\Crafter.Build-Shader.o ^
|
||||
.\build\Crafter.Build-Platform.o ^
|
||||
.\build\Crafter.Build-Interface.o ^
|
||||
.\build\Crafter.Build-Implementation.o ^
|
||||
.\build\Crafter.Build-External.o ^
|
||||
.\build\Crafter.Build-Clang.o ^
|
||||
.\build\Crafter.Build-Test.o ^
|
||||
.\build\Crafter.Build.o ^
|
||||
.\build\Crafter.Build-Shader_impl.o ^
|
||||
.\build\Crafter.Build-Platform_impl.o ^
|
||||
.\build\Crafter.Build-Interface_impl.o ^
|
||||
.\build\Crafter.Build-Implementation_impl.o ^
|
||||
.\build\Crafter.Build-External_impl.o ^
|
||||
.\build\Crafter.Build-Clang_impl.o ^
|
||||
.\build\Crafter.Build-Test_impl.o
|
||||
|
||||
copy /Y "%LIBCXX_DIR%\lib\c++.dll" ".\bin\c++.dll"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue