[Checkins] SVN: grok/trunk/ Kick collective.recipe.sphinxbuilder. Seems not to work on windows.

Uli Fouquet uli at gnufix.de
Fri Dec 31 12:29:20 EST 2010


Log message for revision 119241:
  Kick collective.recipe.sphinxbuilder. Seems not to work on windows.

Changed:
  U   grok/trunk/buildout.cfg
  U   grok/trunk/setup.py

-=-
Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg	2010-12-31 17:25:24 UTC (rev 119240)
+++ grok/trunk/buildout.cfg	2010-12-31 17:29:20 UTC (rev 119241)
@@ -2,6 +2,7 @@
 extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
 parts =
     docs
+    htmldocs
     pdfdocs
     interpreter
     grokwiki
@@ -29,25 +30,27 @@
 [versions]
 grok =
 
-[docs]
-recipe = collective.recipe.sphinxbuilder
-eggs = grok [docs]
-build = ${buildout:directory}/build
-source = ${buildout:directory}/doc
-outputs = html
-script-name = grokdocs2html
-extra-paths = ${buildout:directory}/src
+[htmldocs]
+recipe = zc.recipe.egg
+eggs = grok[docs]
+dependent-scripts = true
+scripts = sphinx-build=grokdocs2html
+arguments = argv=[sys.argv[0], "-b", "html"] + sys.argv[1:] + ["${buildout:directory}/doc", "${buildout:directory}/build/html"]
 
 [pdfdocs]
-recipe = collective.recipe.sphinxbuilder
-eggs = grok [docs]
-build = ${buildout:directory}/build
-source = ${buildout:directory}/doc
-outputs = pdf
-script-name = grokdocs2pdf
-extra-paths = ${buildout:directory}/src
+recipe = zc.recipe.egg
+eggs = grok[docs]
+dependent-scripts = true
+scripts = sphinx-build=grokdocs2latex
+arguments = argv=[sys.argv[0], "-b", "latex"] + sys.argv[1:] + ["${buildout:directory}/doc", "${buildout:directory}/build/latex"]
 
+[docs]
+recipe = zc.recipe.egg
+eggs = grok[docs]
+dependent-scripts = true
+scripts = sphinx-build sphinx-quickstart
 
+
 [interpreter]
 recipe = z3c.recipe.scripts
 eggs = grokwiki
@@ -104,3 +107,4 @@
 recipe = z3c.recipe.template
 input = etc/debug.ini.in
 output = ${buildout:parts-directory}/etc/debug.ini
+

Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py	2010-12-31 17:25:24 UTC (rev 119240)
+++ grok/trunk/setup.py	2010-12-31 17:29:20 UTC (rev 119241)
@@ -21,7 +21,6 @@
 
 docs_require = [
     'Sphinx',
-    'collective.recipe.sphinxbuilder',
     'docutils',
     'roman',
     ]



More information about the checkins mailing list