Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to stable #4

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/build
/lean_packages/*
!/lean_packages/manifest.json
.lake/
5 changes: 5 additions & 0 deletions lake-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{"version": 7,
"packagesDir": ".lake/packages",
"packages": [],
"name": "RustFFI",
"lakeDir": ".lake"}
14 changes: 7 additions & 7 deletions lakefile.lean
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ lean_exe ffi where
def ffiC := "ffi.c"
def ffiO := "ffi.o"

target importTarget (pkg : Package) : FilePath := do
let oFile := pkg.oleanDir / ffiO
target importTarget (pkg : NPackage _package.name) : FilePath := do
let oFile := pkg.buildDir / ffiO
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% confident that buildDir is the best directory to be using here

let srcJob ← inputFile ffiC
buildFileAfterDep oFile srcJob fun srcFile => do
let flags := #["-I", (← getLeanIncludeDir).toString]
compileO ffiC oFile srcFile flags

extern_lib libffi (pkg : Package) := do
extern_lib libffi (pkg : NPackage _package.name) := do
let name := nameToStaticLib "ffi"
let job ← fetch <| pkg.target ``importTarget
buildStaticLib (pkg.libDir / name) #[job]
buildStaticLib (pkg.buildDir / name) #[job]
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also not 100% confident that buildDir is the best directory to be using here


extern_lib some_rust_lib (pkg : Package) := do
extern_lib some_rust_lib (pkg : NPackage _package.name) := do
proc { cmd := "cargo", args := #["build", "--release"], cwd := pkg.dir }
let name := nameToStaticLib "some_rust_lib"
let srcPath := pkg.dir / "target" / "release" / name
IO.FS.createDirAll pkg.libDir
let tgtPath := pkg.libDir / name
IO.FS.createDirAll pkg.buildDir
let tgtPath := pkg.buildDir / name
IO.FS.writeBinFile tgtPath (← IO.FS.readBinFile srcPath)
return (pure tgtPath)
2 changes: 1 addition & 1 deletion lean-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:nightly-2022-12-08
leanprover/lean4:stable