-
Notifications
You must be signed in to change notification settings - Fork 1
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
jeswr
wants to merge
1
commit into
argumentcomputer:main
Choose a base branch
from
jeswr:chore/stable-static
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,4 @@ | |
/build | ||
/lean_packages/* | ||
!/lean_packages/manifest.json | ||
.lake/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{"version": 7, | ||
"packagesDir": ".lake/packages", | ||
"packages": [], | ||
"name": "RustFFI", | ||
"lakeDir": ".lake"} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
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] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm also not 100% confident that |
||
|
||
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
leanprover/lean4:nightly-2022-12-08 | ||
leanprover/lean4:stable |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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