forked from cil-project/cil
-
Notifications
You must be signed in to change notification settings - Fork 21
Add dune install of cilly #102
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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 hidden or 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,9 @@ | ||
| (install | ||
| (section bin) | ||
| (files | ||
| cilly | ||
| cilly.native)) | ||
|
|
||
| (rule | ||
| (alias cilly) | ||
| (action (copy ../src/main.exe cilly.native))) |
This file contains hidden or 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,31 @@ | ||
| (rule | ||
| (alias configure) | ||
| (deps | ||
| configure.ac | ||
| configure | ||
| Makefile.in | ||
| config.sub | ||
| config.guess | ||
| config.h.in | ||
| config.mk.in | ||
| stamp-h.in | ||
| install-sh | ||
| lib/perl5/App/Cilly/CilConfig.pm.in | ||
| (source_tree src)) ; src/cil.mli doesn't work | ||
| (targets | ||
| Makefile | ||
| config.status | ||
| config.h | ||
| config.mk | ||
| stamp-h | ||
| ; HACK: workaround for https://github.com/ocaml/dune/issues/3374 | ||
| src__machdep-ml.c | ||
| src__cilversion.ml | ||
| lib__perl5__App__Cilly__CilConfig.pm) | ||
| (action (progn | ||
| (run ./configure) | ||
| ; HACK: workaround for https://github.com/ocaml/dune/issues/3374 | ||
| ; HACK: use "run cp" instead of "copy" to avoid implicit unsupported subdir deps | ||
| (run cp src/machdep-ml.c src__machdep-ml.c) | ||
| (run cp src/cilversion.ml src__cilversion.ml) | ||
| (run cp lib/perl5/App/Cilly/CilConfig.pm lib__perl5__App__Cilly__CilConfig.pm)))) |
This file contains hidden or 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,2 @@ | ||
| ; HACK: workaround for https://github.com/ocaml/dune/issues/3374 | ||
| (rule (action (copy ../../../../lib__perl5__App__Cilly__CilConfig.pm CilConfig.pm))) |
This file contains hidden or 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,18 @@ | ||
| (rule | ||
| (alias cilly) | ||
| (deps (alias ../../../configure) Cilly.pm.in) | ||
| (targets Cilly.pm) | ||
| (locks ../../../make) | ||
| (action (chdir ../../.. (progn | ||
| (run mkdir -p _build) | ||
| (run make lib/perl5/App/Cilly.pm))))) | ||
|
|
||
| (install | ||
| (section lib_root) | ||
| (files | ||
| (Cilly.pm as perl5/App/Cilly.pm) | ||
| (Cilly/CilCompiler.pm as perl5/App/Cilly/CilCompiler.pm) | ||
| (Cilly/CilConfig.pm as perl5/App/Cilly/CilConfig.pm) | ||
| (Cilly/KeptFile.pm as perl5/App/Cilly/KeptFile.pm) | ||
| (Cilly/OutputFile.pm as perl5/App/Cilly/OutputFile.pm) | ||
| (Cilly/TempFile.pm as perl5/App/Cilly/TempFile.pm))) |
This file contains hidden or 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
This file contains hidden or 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 @@ | ||
| (rule | ||
| (alias runtest) | ||
| (deps (alias_rec ../cilly) (source_tree .)) | ||
| (locks ../make) | ||
| (action (chdir .. (run make test)))) |
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 have no idea what this is for. If it's redundant, then this entire rule can be removed since all other parts were extracted elsewhere.
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 think this was required for the regression tests to work, not sure if this still is the case...
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.
CilCompiler.pmfrom cilly seems to optionally read it. So maybe it'll only fail during actual cilly usage?The tests run fine without that though, but they need the
(package goblint-cil)dependency, for cilly to be installed into_build/install/for testing.