fix: rebuild and relink on what changed, submodules at their revisions, and mingw found where it is
Some checks failed
Flatpak / flatpak (push) Failing after 1m12s
Some checks failed
Flatpak / flatpak (push) Failing after 1m12s
- Shaders record the files glslang opened (a depfile) and their settings
(source path, stage, entry point, defines, include directories) in the
build directory, and rebuild when an included file or a setting changes,
not only the shader's own source.
- An executable relinks when its link command changed, not only when an
object is newer: a link flag in project.cpp, or a dependency's library
that moved (an ExternalDependency built into a new cache directory). The
command is recorded beside the objects; its flags come from ordered sets,
so the order the dependency threads finish in can't change it.
- An external's newest artifact counts its libDirs and versioned .so names.
- Submodules are checked out at the revisions the fetched commit records,
from the URLs its .gitmodules gives, after every clone, switch, checkout
and pull, so a pinned commit builds against its own submodules, and one
moved by hand is put back; with no .gitmodules, git isn't asked.
- Each external clone's fetch and build hold a file lock: parallel builds
pulled into one clone at once ("cannot lock ref").
- mingw:
- -stdlib=libstdc++ always;
- the std module's source is found through libstdc++.modules.json in the
mingw toolchain's own library directories (the generic lib/ holds the
host's Linux one), asking the compiler once a run;
- a toolchain that isn't there is a build error saying where it looked,
not std::terminate;
- CRAFTER_MINGW_DIR names the prefix, the directory holding
x86_64-w64-mingw32/ and lib/gcc/;
- inside the Flatpak the host's /usr mingw is used.
- RunScript's exit-status check reads as the one range it is.
- Tests: ConcurrentExternalFetch, ExternalArtifactTime, GitSubmodules,
LinkFlagsChange, MingwMissing, ShaderIncludeChange; ShaderCompile and
ToolchainResolve extended.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
959c65dbb2
commit
653dd0bb9b
26 changed files with 1075 additions and 109 deletions
|
|
@ -14,12 +14,15 @@ export namespace Crafter {
|
|||
struct BuildResult {
|
||||
std::string result;
|
||||
bool repack;
|
||||
std::unordered_set<std::string> libs;
|
||||
// Sets in order: the commands they go into are compared with the ones
|
||||
// recorded last time, so they come out the same however the
|
||||
// dependency threads that fill them happen to finish.
|
||||
std::set<std::string> libs;
|
||||
// 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;
|
||||
std::set<std::string> publicCompileFlags;
|
||||
};
|
||||
|
||||
struct Define {
|
||||
|
|
|
|||
Loading…
Reference in a new issue