[mapserver-commits] r9044 - in trunk/docs: . _templates

[svn at osgeo.org]

Author: gislars
Date: 2009-05-28 09:10:17 -0400 (Thu, 28 May 2009)
New Revision: 9044

Modified:
   trunk/docs/Makefile
   trunk/docs/_templates/layout.html
   trunk/docs/make.bat
Log:
languages are now handled in Makefile/make.bat and passed to the template

Modified: trunk/docs/Makefile
===================================================================
--- trunk/docs/Makefile	2009-05-28 04:16:04 UTC (rev 9043)
+++ trunk/docs/Makefile	2009-05-28 13:10:17 UTC (rev 9044)
@@ -19,7 +19,7 @@
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees/$$lang $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) -c . -A language=$$lang -D language=$$lang -A target=$TARGET
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees/$$lang $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) -c . -A language=$$lang -D language=$$lang -A target=$TARGET -A languages='$(LANGUAGES)'
 
 .PHONY: help clean html web pickle htmlhelp latex changes linkcheck
 

Modified: trunk/docs/_templates/layout.html
===================================================================
--- trunk/docs/_templates/layout.html	2009-05-28 04:16:04 UTC (rev 9043)
+++ trunk/docs/_templates/layout.html	2009-05-28 13:10:17 UTC (rev 9044)
@@ -22,7 +22,7 @@
 
     {% block sidebartoc %}
 <div >
-    {%- for lng in ('en','de') %}
+    {%- for lng in languages.split(' ') %}
     {%- if lng == language %}
       <img src="{{ pathto("_static/flagicons/"+lng+".png", 1) }}" alt="{{ lng }}" title="{{ lng }}" border="0" width="18px" height="13px"/>
     {%- else %}

Modified: trunk/docs/make.bat
===================================================================
--- trunk/docs/make.bat	2009-05-28 04:16:04 UTC (rev 9043)
+++ trunk/docs/make.bat	2009-05-28 13:10:17 UTC (rev 9044)
@@ -1,9 +1,14 @@
 @ECHO OFF
-
 REM Command file for Sphinx documentation
 
+REM using delayed expansion of variables...
+setlocal enableextensions enabledelayedexpansion
+
+REM ...to get a list of directories to be processed
+FOR /D  %%i IN ("??") do (SET LANGUAGES=!LANGUAGES! %%i)
+
 set SPHINXBUILD=sphinx-build
-set ALLSPHINXOPTS= -d _build/doctrees/%%L -c . -A language=%%L -D language=%%L
+set ALLSPHINXOPTS= -d _build/doctrees/%%L -c . -A language=%%L -D language=%%L -A languages="%LANGUAGES%"
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 )
@@ -27,7 +32,7 @@
 )
 
 if "%1" == "html" (
-  FOR /D %%L in ("??") DO (
+  FOR  %%L in (%LANGUAGES%) DO (
   	%SPHINXBUILD% -b html  %ALLSPHINXOPTS% %%L _build/html/%%L
 	)
 	echo.
@@ -36,7 +41,7 @@
 )
 
 if "%1" == "latex" (
-  FOR /D %%L in ("??") DO (
+  FOR  %%L in (%LANGUAGES%) DO (
   	%SPHINXBUILD% -b latex  %ALLSPHINXOPTS% %%L _build/latex/%%L
 	)
 	echo.
@@ -45,7 +50,7 @@
 )
 
 if "%1" == "changes" (
-  FOR /D %%L in ("??") DO (
+  FOR  %%L in (%LANGUAGES%) DO (
   	%SPHINXBUILD% -b changes  %ALLSPHINXOPTS% %%L _build/changes/%%L
 	)
 	echo.
@@ -54,7 +59,7 @@
 )
 
 if "%1" == "linkcheck" (
-  FOR /D %%L in ("??") DO (
+  FOR  %%L in (%LANGUAGES%) DO (
   	%SPHINXBUILD% -b linkcheck  %ALLSPHINXOPTS% %%L _build/linkcheck/%%L
 	)
 	echo.