max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat: lake: relative paths for Lean build messages (#8539)

Browse source 
This PR changes Lake to use relative path for the Lean messages produced
by a module build. This makes the message portable across different
machines, which is useful for Mathlib's cache.
This commit is contained in:
Mac Malone 2025-05-29 22:02:35 -04:00 • committed by GitHub
parent b7ec369863
commit e68c6a38fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lake/Lake/Build/Actions.lean
View file

@ -7,6 +7,7 @@ prelude
import Lake.Config.Dynlib
import Lake.Util.Proc
import Lake.Util.NativeLib
import Lake.Util.FilePath
import Lake.Util.IO
/-! # Common Build Actions
@ -19,7 +20,7 @@ open Lean hiding SearchPath
namespace Lake
def compileLeanModule
(leanFile : FilePath)
(leanFile relLeanFile : FilePath)
(oleanFile? ileanFile? cFile? bcFile?: Option FilePath)
(leanPath : SearchPath := []) (rootDir : FilePath := ".")
(dynlibs plugins : Array Dynlib := #[])
@ -57,6 +58,7 @@ def compileLeanModule
if let .ok (msg : SerialMessage) := Json.parse ln >>= fromJson? then
unless txt.isEmpty do
logInfo s!"stdout:\n{txt}"
let msg := {msg with fileName := mkRelPathString relLeanFile}
logSerialMessage msg
return txt
else if txt.isEmpty && ln.isEmpty then

2
src/lake/Lake/Build/Module.lean
View file

@ -280,7 +280,7 @@ def Module.recBuildLean (mod : Module) : FetchM (Job Unit) := do
addTrace srcTrace
setTraceCaption s!"{mod.name.toString}:leanArts"
let upToDate ← buildUnlessUpToDate? (oldTrace := srcTrace.mtime) mod (← getTrace) mod.traceFile do
compileLeanModule mod.leanFile mod.oleanFile mod.ileanFile mod.cFile mod.bcFile?
compileLeanModule mod.leanFile mod.relLeanFile mod.oleanFile mod.ileanFile mod.cFile mod.bcFile?
(← getLeanPath) mod.rootDir dynlibs plugins
(mod.weakLeanArgs ++ mod.leanArgs) (← getLean)
mod.clearOutputHashes

6
src/lake/Lake/Config/Module.lean
View file

@ -82,6 +82,12 @@ abbrev pkg (self : Module) : Package :=
@[inline] def leanFile (self : Module) : FilePath :=
self.srcPath "lean"
@[inline] def relLeanFile (self : Module) : FilePath :=
if let some relPath := self.leanFile.toString.dropPrefix? self.pkg.dir.toString then
FilePath.mk (relPath.drop 1).toString -- remove leading `/`
else
self.leanFile
@[inline] def leanLibPath (ext : String) (self : Module) : FilePath :=
self.filePath self.pkg.leanLibDir ext