[Checkins] SVN: grok/trunk/ split out parts from the main buildout.cfg, like for building the documentation
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Mon Jan 10 09:35:43 EST 2011
Log message for revision 119468:
split out parts from the main buildout.cfg, like for building the documentation
Changed:
U grok/trunk/buildout.cfg
A grok/trunk/documentation.cfg
A grok/trunk/documentation_deployment.cfg
A grok/trunk/grokwiki.cfg
U grok/trunk/setup.py
-=-
Modified: grok/trunk/buildout.cfg
===================================================================
--- grok/trunk/buildout.cfg 2011-01-10 10:11:08 UTC (rev 119467)
+++ grok/trunk/buildout.cfg 2011-01-10 14:35:43 UTC (rev 119468)
@@ -1,15 +1,11 @@
[buildout]
extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
parts =
- docs
- htmldocs
- pdfdocs
interpreter
- grokwiki
mkdirs
test
- zpasswd
zope_conf site_zcml deploy_ini debug_ini
+ zpasswd
develop =
.
grokwiki
@@ -19,41 +15,12 @@
[versions]
grok =
-[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 = 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
zest.releaser
interpreter = grokpy
-[grokwiki]
-recipe = z3c.recipe.scripts
-eggs = grokwiki
- z3c.evalexception>=2.0
- Paste
- PasteScript
- PasteDeploy
-
[mkdirs]
recipe = z3c.recipe.mkdir
paths =
@@ -67,14 +34,6 @@
grok[test]
defaults = ['--tests-pattern', '^f?tests$', '-v']
-# This section is named so that the zpasswd utility is
-# called `zpasswd`
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs = grokwiki
-module = zope.app.server.zpasswd
-method = main
-
[zope_conf]
recipe = z3c.recipe.template
input = etc/zope.conf.in
@@ -97,3 +56,10 @@
input = etc/debug.ini.in
output = ${buildout:parts-directory}/etc/debug.ini
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.dev:script
+eggs = grokwiki
+module = zope.app.server.zpasswd
+method = main
Added: grok/trunk/documentation.cfg
===================================================================
--- grok/trunk/documentation.cfg (rev 0)
+++ grok/trunk/documentation.cfg 2011-01-10 14:35:43 UTC (rev 119468)
@@ -0,0 +1,65 @@
+[buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
+develop = .
+parts =
+ docs
+ build_html
+# build_pdf
+ cronjob-template
+versions = versions
+
+[versions]
+grok =
+# Override the Grok Toolkit for now.
+collective.recipe.template = 1.8
+
+[docs]
+recipe = zc.recipe.egg
+eggs =
+ grok
+ docutils
+ roman
+ sphinx
+dependent-scripts = true
+scripts =
+ sphinx-build
+ sphinx-quickstart
+
+[build_html]
+recipe = zc.recipe.egg
+eggs = ${docs:eggs}
+dependent-scripts = true
+scripts = sphinx-build=build_html
+arguments = argv=[sys.argv[0], "-b", "html"] + sys.argv[1:] + ["${buildout:directory}/doc", "${buildout:directory}/build/html"]
+
+[build_pdf]
+recipe = zc.recipe.egg
+eggs = ${docs:eggs}
+dependent-scripts = true
+scripts = sphinx-build=build_pdf
+arguments = argv=[sys.argv[0], "-b", "latex"] + sys.argv[1:] + ["${buildout:directory}/doc", "${buildout:directory}/build/latex"]
+
+[cronjob-template]
+recipe = collective.recipe.template
+document_root = ${buildout:directory}/build/docroot
+inline =
+ #!/bin/bash
+ cd ${buildout:directory}
+ hg pull
+ hg update
+
+ # `make clean` substitute
+ rm -rf build/*
+
+ # `make html` substitute
+ ./bin/build_html
+
+ if [ $? == 0 ]; then
+ rm -rf ${:document_root}
+ cp -rf build/html ${:document_root}
+ else
+ echo "grokdocs html generation failed"
+ fi
+output = ${buildout:bin-directory}/build.sh
+mode = 755
+
Added: grok/trunk/documentation_deployment.cfg
===================================================================
--- grok/trunk/documentation_deployment.cfg (rev 0)
+++ grok/trunk/documentation_deployment.cfg 2011-01-10 14:35:43 UTC (rev 119468)
@@ -0,0 +1,12 @@
+[buildout]
+extends = documentation.cfg
+parts += cronjob
+
+[cronjob-template]
+recipe = collective.recipe.template
+document_root = /var/www/html/grok/doc/official
+
+[cronjob]
+recipe = z3c.recipe.usercrontab
+times = 0 * * * *
+command = ${cronjob-template:output}
Added: grok/trunk/grokwiki.cfg
===================================================================
--- grok/trunk/grokwiki.cfg (rev 0)
+++ grok/trunk/grokwiki.cfg 2011-01-10 14:35:43 UTC (rev 119468)
@@ -0,0 +1,20 @@
+[buildout]
+extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
+parts = grokwiki
+develop =
+ .
+ grokwiki
+versions = versions
+extensions = buildout.dumppickedversions
+
+[versions]
+grok =
+
+[grokwiki]
+recipe = z3c.recipe.scripts
+eggs =
+ grokwiki
+ Paste
+ PasteDeploy
+ PasteScript
+ z3c.evalexception>=2.0
Modified: grok/trunk/setup.py
===================================================================
--- grok/trunk/setup.py 2011-01-10 10:11:08 UTC (rev 119467)
+++ grok/trunk/setup.py 2011-01-10 14:35:43 UTC (rev 119468)
@@ -19,12 +19,6 @@
'zope.testing',
]
-docs_require = [
- 'Sphinx',
- 'docutils',
- 'roman',
- ]
-
setup(
name='grok',
version='1.4dev',
@@ -97,6 +91,5 @@
'zope.traversing',
],
tests_require=tests_require,
- extras_require={'test': tests_require,
- 'docs': docs_require},
+ extras_require={'test': tests_require},
)
More information about the checkins
mailing list