[mapserver-commits] r9030 - trunk/docs
svn at osgeo.org
svn at osgeo.org
Wed May 20 16:20:41 EDT 2009
Author: gislars
Date: 2009-05-20 16:20:41 -0400 (Wed, 20 May 2009)
New Revision: 9030
Modified:
trunk/docs/Makefile
trunk/docs/conf.py
Log:
changed Makefile and conf.py to reflect docs change
Modified: trunk/docs/Makefile
===================================================================
--- trunk/docs/Makefile 2009-05-20 20:19:35 UTC (rev 9029)
+++ trunk/docs/Makefile 2009-05-20 20:20:41 UTC (rev 9030)
@@ -1,15 +1,19 @@
# Makefile for Sphinx documentation
#
+# $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/$$lang;
+#
# You can set these variables from the command line.
+BUILDDIR = build
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
+LANGUAGES = en de
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$$lang $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) -c . -A language=$$lang -D language=$$lang
.PHONY: help clean html web pickle htmlhelp latex changes linkcheck
@@ -27,57 +31,100 @@
-rm -rf build/*
html:
- mkdir -p build/html build/doctrees
- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/html/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/html/$$lang;\
+ cp -R _static $(BUILDDIR)/html/; \
+ done
@echo
- @echo "Build finished. The HTML pages are in build/html."
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/<language>.";\
+
pickle:
- mkdir -p build/pickle build/doctrees
- $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/pickle/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/pickle/$$lang;\
+ done
@echo
@echo "Build finished; now you can process the pickle files."
web: pickle
json:
- mkdir -p build/json build/doctrees
- $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/json/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/json/$$lang;\
+ done
@echo
@echo "Build finished; now you can process the JSON files."
htmlhelp:
- mkdir -p build/htmlhelp build/doctrees
- $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/htmlhelp/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/htmlhelp/$$lang;\
+ done
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in build/htmlhelp."
+ ".hhp project file in $(BUILDDIR)/htmlhelp/<language>."
latex:
- mkdir -p build/latex build/doctrees
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/latex/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/latex/$$lang;\
+ done
@echo
- @echo "Build finished; the LaTeX files are in build/latex."
- @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
- "run these through (pdf)latex."
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/<language>."\
+ @echo "Run \`make all-pdf' or \`make all-ps'"
+all-pdf:
+ @for lang in $(LANGUAGES);\
+ do \
+ /usr/bin/make -C $(BUILDDIR)/latex/$$lang all-pdf ; \
+ if [ -d $(BUILDDIR)/html/$$lang ]; then \
+ mv -f $(BUILDDIR)/latex/$$lang/MapServer.pdf $(BUILDDIR)/html/$$lang ; \
+ fi \
+ done
+
+all-ps:
+ @for lang in $(LANGUAGES);\
+ do \
+ /usr/bin/make -C $(BUILDDIR)/latex/$$lang all-ps ; \
+ if [ -d $(BUILDDIR)/html/$$lang ]; then \
+ mv -f $(BUILDDIR)/latex/$$lang/MapServer.pdf $(BUILDDIR)/html/$$lang ; \
+ fi \
+ done
+
changes:
- mkdir -p build/changes build/doctrees
- $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/changes/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/changes/$$lang;\
+ done
@echo
- @echo "The overview file is in build/changes."
+ @echo "The overview file is in $(BUILDDIR)/changes/<language>."
linkcheck:
- mkdir -p build/linkcheck build/doctrees
- $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/linkcheck/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/linkcheck/$$lang;\
+ done
@echo
@echo "Link check complete; look for any errors in the above output " \
- "or in build/linkcheck/output.txt."
+ "or in $(BUILDDIR)/linkcheck/<language>/output.txt."
labels:
- mkdir -p build/labels build/doctrees
- $(SPHINXBUILD) -b labels $(ALLSPHINXOPTS) build/labels
+ @for lang in $(LANGUAGES);\
+ do \
+ mkdir -p $(BUILDDIR)/labels/$$lang $(BUILDDIR)/doctrees/$$lang; \
+ $(SPHINXBUILD) -b labels $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/labels/$$lang;\
+ cp $(BUILDDIR)/labels/$$lang/labels.txt $$lang/include/labels.inc;\
+ done
@echo
- @echo "Link check complete; look for any errors in the above output " \
- "or in build/labels/output.txt."
- cp build/labels/labels.txt include/labels.inc
+ @echo "Label generation complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/labels/<language>/labels.txt."
Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py 2009-05-20 20:19:35 UTC (rev 9029)
+++ trunk/docs/conf.py 2009-05-20 20:20:41 UTC (rev 9030)
@@ -39,7 +39,7 @@
# General information about the project.
project = u'MapServer'
-copyright = u'2008, Regents of the University of Minnesota'
+copyright = u'2009, Regents of the University of Minnesota'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -48,7 +48,7 @@
# The short X.Y version.
version = '5'
# The full version, including alpha/beta/rc tags.
-release = '5.2.2'
+release = '5.4.0'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -84,6 +84,8 @@
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
+# Exclude subversion directories
+exclude_dirnames = ['.svn']
# Options for HTML output
# -----------------------
@@ -171,7 +173,7 @@
# The name of an image file (relative to this directory) to place at the top of
# the title page.
-latex_logo = './images/mapserver.jpg'
+latex_logo = './_static/mapserver.jpg'
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
@@ -185,7 +187,7 @@
# If false, no module index is generated.
#latex_use_modindex = True
-#
+#
from pygments.lexer import RegexLexer, bygroups,combined, include
from pygments.token import *
@@ -205,7 +207,7 @@
(r'(PROJCS)\b', Generic.Heading),
(r'(PARAMETER|PROJECTION|SPHEROID|DATUM|GEOGCS|AXIS)\b', Keyword),
(r'(PRIMEM|UNIT|TOWGS84)\b', Keyword.Constant),
- (r'(AUTHORITY)\b', Name.Builtin),
+ (r'(AUTHORITY)\b', Name.Builtin),
(r'[$a-zA-Z_][a-zA-Z0-9_]*', Name.Other),
(r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float),
(r'0x[0-9a-fA-F]+', Number.Hex),
@@ -227,7 +229,7 @@
r'PLUGIN|QUERY|RASTER|RIGHT|ROUNDE|SDE|SELECTED|SIMPLE|SINGLE|'
r'SMALL|SQUARE|TINY|TRIANGLE|TRUE|TRUETYPE|UC|UL|UR|VECTOR|'
r'WFS|WMS|ALPHA|'
- r'GIF|JPEG|JPG|PNG|WBMP|SWF|PDF|GTIFF|PC256|RGB|RGBA|INT16|FLOAT32|GD|AGG'
+ r'GIF|JPEG|JPG|PNG|WBMP|SWF|PDF|GTIFF|PC256|RGB|RGBA|INT16|FLOAT32|GD|AGG'
r')\b')
keywords = (r'(ALIGN|'
@@ -256,12 +258,12 @@
r'TILEINDEX|TILEITEM|TITLE|TO|TOLERANCE|TOLERANCEUNITS|TRANSPARENCY|'
r'TRANSPARENT|TRANSFORM|TYPE|UNITS|WEB|WIDTH|WKT|WRAP|IMAGEMODE'
r')\b')
-
+
class MapFileLexer(RegexLexer):
name = 'mapfile'
aliases = ['mapfile']
filenames = ['*.map']
-
+
flags = re.IGNORECASE
tokens = {
'root': [
@@ -326,6 +328,5 @@
def setup(app):
from sphinx.highlighting import lexers
- lexers['wkt'] = WKTLexer()
- lexers['mapfile'] = MapFileLexer()
-
+ lexers['wkt'] = WKTLexer()
+ lexers['mapfile'] = MapFileLexer()
More information about the mapserver-commits
mailing list