-
Notifications
You must be signed in to change notification settings - Fork 632
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
Add support for CoqMakefile.local-late #12411
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 |
---|---|---|
@@ -0,0 +1,5 @@ | ||
- **Added:** | ||
``coq_makefile``\-made ``Makefile``\s now support inclusion of a | ||
``.local-late`` file at the end, allowing the user to access | ||
more variables (`#12411 <https://github.com/coq/coq/pull/12411>`_, fixes | ||
`#10912 <https://github.com/coq/coq/issues/10912>`_, by Jason Gross). |
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
4 changes: 4 additions & 0 deletions
4
test-suite/coq-makefile/local-late-extension/Makefile.local-late
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,4 @@ | ||
MYVOFILES := $(VOFILES) | ||
|
||
printvo:: | ||
@echo '$(MYVOFILES)' |
1 change: 1 addition & 0 deletions
1
test-suite/coq-makefile/local-late-extension/make-printvo.log.expected
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 @@ | ||
foo.vo |
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,15 @@ | ||
#!/usr/bin/env bash | ||
|
||
. ../template/path-init.sh | ||
|
||
set -x | ||
coq_makefile -Q . Top foo.v -o Makefile | ||
rm -f .*.d *.d | ||
make --no-print-directory -j1 printvo 2>&1 \ | ||
| grep -v 'make[^:]*: warning: -jN forced in submake: disabling jobserver mode.' \ | ||
| grep -v 'coq_makefile -Q . Top foo.v -o Makefile' \ | ||
| grep -v 'make[^:]*: Entering directory' \ | ||
| grep -v 'make[^:]*: Leaving directory' \ | ||
| grep -v 'exit 1' \ | ||
> make-printvo.log | ||
diff -u make-printvo.log.expected make-printvo.log || exit $? |
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
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
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.
This variable is also available in the non
-late
file (I'm using it already). Please move it upward.Ditto for COQMAKEFILE_VERSION, COQC and COQFLAGS and COQLIBS.
I did not check the others.
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.
All variables are available for use in recipes of rules in the non-late file, as well as in the definitions of variables assigned using
=
. They are also available in the prerequisites of rules only if you double the$
and enable secondary expansion. However, these variables are not available when naming the outputs of rules, nor in top-levelifeq
/ifneq
statements, nor in variables assigned with:=
. (I presume your use-cases involve the former kind and not the latter kind?) Do you have suggestions for making this distinction more clear in the documentation?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.
Indeed. I think it is fine, your explanation could also go in the doc, since the external pointer is a bit boring to follow.
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've added some explanation in the doc, please take a look