From d29bf8222c2633030bdaf3290d97dfe99b5c262d Mon Sep 17 00:00:00 2001 From: "Paul P.H. Wilson" Date: Wed, 19 Aug 2015 15:53:36 -0500 Subject: [PATCH] rename docker targets to avoid tab completion errors --- Makefile | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index bd3294732..12b992543 100644 --- a/Makefile +++ b/Makefile @@ -24,34 +24,35 @@ I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(GH_SOURCE_DIR) help: @echo "Please use \`make ' where is one of" - @echo " gh-preview to build HTML in directory $BUILDDIR for testing" - @echo " gh-revert to cleanup HTML build in directory $BUILDDIR after testing" - @echo " gh-publish final build and push from source branch to master branch" - @echo " html to make standalone HTML files" - @echo " html-docker to make standalone HTML files inside a docker container" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -html-docker gh-preview-docker: + @echo " gh-preview to build HTML in directory $BUILDDIR for testing" + @echo " gh-revert to cleanup HTML build in directory $BUILDDIR after testing" + @echo " gh-publish final build and push from source branch to master branch" + @echo " html to make standalone HTML files" + @echo " docker-html use docker to build HTML in directory $BUILDDIR for testing" + @echo " docker-gh-publish use docker for final build and push from source branch to master branch" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + +docker-html docker-gh-preview: docker run -w /cyclus.github.com -v $(PWD):/cyclus.github.com cyclus/fuelcycle.org-deps bash -c "make gh-preview && chmod -R 777 $(BUILDDIR)" -gh-publish-docker: +docker-gh-publish: docker run -w /cyclus.github.com -v $(PWD):/cyclus.github.com cyclus/fuelcycle.org-deps bash -c "make gh-publish" gh-clean gh-revert clean: