Changeset 388 for python/vendor/current/Doc/Makefile

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Doc/Makefile (modified) (10 diffs)

python/vendor/current/Doc/Makefile

@@ -35 +35 @@
         @echo "  suspicious to check for suspicious markup in output text"
         @echo "  check      to run a check for frequent markup errors"
+        @echo "  serve      to serve the documentation on the localhost (8000)"
 
 # Note: if you update versions here, do the same in make.bat and README.txt
@@ -40 +41 @@
         @if [ ! -d tools/sphinx ]; then \
           echo "Checking out Sphinx..."; \
-          svn checkout $(SVNROOT)/external/Sphinx-0.6.5/sphinx tools/sphinx; \
+          svn checkout $(SVNROOT)/external/Sphinx-1.0.7/sphinx tools/sphinx; \
         fi
         @if [ ! -d tools/docutils ]; then \
@@ -87 +88 @@
 linkcheck: BUILDER = linkcheck
 linkcheck: build
-        @echo "Link check complete; look for any errors in the above output " \
+        @echo "Link check complete; look for any errors in the above output" \
               "or in build/$(BUILDER)/output.txt"
 
 suspicious: BUILDER = suspicious
 suspicious: build
-        @echo "Suspicious check complete; look for any errors in the above output " \
-              "or in build/$(BUILDER)/suspicious.txt"
+        @echo "Suspicious check complete; look for any errors in the above output" \
+              "or in build/$(BUILDER)/suspicious.csv.  If all issues are false" \
+              "positives, append that file to tools/sphinxext/susp-ignored.csv."
 
 coverage: BUILDER = coverage
@@ -101 +103 @@
 doctest: BUILDER = doctest
 doctest: build
-        @echo "Testing of doctests in the sources finished, look at the " \
+        @echo "Testing of doctests in the sources finished, look at the" \
               "results in build/doctest/output.txt"
 
 pydoc-topics: BUILDER = pydoc-topics
 pydoc-topics: build
-        @echo "Building finished; now copy build/pydoc-topics/pydoc_topics.py " \
-              "into the Lib/ directory"
+        @echo "Building finished; now copy build/pydoc-topics/topics.py" \
+              "to Lib/pydoc_data/topics.py"
 
 htmlview: html
@@ -120 +122 @@
 
 dist:
-        -rm -rf dist
+        rm -rf dist
         mkdir -p dist
 
@@ -140 +142 @@
         rm -r dist/python-$(DISTVERSION)-docs-text
         rm dist/python-$(DISTVERSION)-docs-text.tar
-        
+
         # archive the A4 latex
-        -rm -r build/latex
+        rm -rf build/latex
         make latex PAPER=a4
+        -sed -i 's/makeindex/makeindex -q/' build/latex/Makefile
         (cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2)
         cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-a4.zip
@@ -149 +152 @@
 
         # archive the letter latex
-        rm -r build/latex
+        rm -rf build/latex
         make latex PAPER=letter
+        -sed -i 's/makeindex/makeindex -q/' build/latex/Makefile
         (cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2)
         cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-letter.zip
@@ -158 +162 @@
         $(PYTHON) tools/rstlint.py -i tools
 
+serve:
+        ../Tools/scripts/serve.py build/html
+
 # Targets for daily automated doc build
 
@@ -163 +170 @@
 autobuild-dev:
         make update
-        make dist SPHINXOPTS='-A daily=1'
+        make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1'
+
+# for quick rebuilds (HTML only)
+autobuild-html:
+        make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta, rc)
@@ -172 +183 @@
         esac
         @make autobuild-dev
+