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.

Sign up for GitHub

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

Jump to bottom

Support Dune 1.7.0 and later #3888

Merged
merged 1 commit into from Jul 2, 2019
Merged

Support Dune 1.7.0 and later #3888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/Makefile
View file
Open in desktop
Expand Up @@ -43,7 +43,8 @@ man:
done
$(OPAM_INSTALLER) $(HELPFMT) > man/opam-installer.1 2>> man/err
# Dune doesn't (yet) support --no-print-directory
Copy link
Member

Choose a reason for hiding this comment

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

Is there an upstream dune pr for this --no-print-directory feature? Worth noting in the comment if so.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's in Dune 1.7.0 - on the master branch PR (coming shortly) for Dune 1.10, the comment is gone...

@if grep -v "^Entering directory '" man/err > man/err2 ; then cat man/err2 ; false ; fi
@sed -f man.sed man/err > man/err2
@if test -s man/err2 ; then cat man/err2 ; false ; fi

man-html: man
rm -rf man-html
Expand Down
7 changes: 7 additions & 0 deletions doc/man.sed
View file
Open in desktop
@@ -0,0 +1,7 @@
/^Entering directory '/d
/^File .*jbuild", line 1, characters 0-0:/{
:a
N
/Note: You can use.*to dune/!ba
}
/Warning: jbuild files are deprecated/d