Skip to content

Port other changes to build blurbified Docs #3340

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

Merged
ned-deily merged 3 commits into from
Sep 5, 2017
Merged

Port other changes to build blurbified Docs #3340

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5868552
Doc/Makefile needs to use blurb now
ned-deily Sep 4, 2017
0afbf77
install blurb in Doc venv
ned-deily Sep 4, 2017
525cafe
The rest of the blub changes from 3.5
ned-deily Sep 4, 2017
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
Next Next commit
Doc/Makefile needs to use blurb now
  • Loading branch information
@ned-deily
ned-deily committed Sep 5, 2017
commit 5868552ad5c0acdd1f12b270e7322efe86d74871
14 changes: 14 additions & 0 deletions Doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ help:
@echo " serve to serve the documentation on the localhost (8000)"

build:
-mkdir -p build
# Look first for a Misc/NEWS file (building from a source release tarball
# or old repo) and use that, otherwise look for a Misc/NEWS.d directory
# (building from a newer repo) and use blurb to generate the NEWS file.
@if [ -f ../Misc/NEWS ] ; then \
echo "Using existing Misc/NEWS file"; \
cp ../Misc/NEWS build/NEWS; \
elif [ -d ../Misc/NEWS.d ]; then \
echo "Building NEWS from Misc/NEWS.d with blurb"; \
$(BLURB) merge -f build/NEWS; \
else \
echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \
exit 1; \
fi
$(SPHINXBUILD) $(ALLSPHINXOPTS)
@echo

Expand Down