Added:
/MANIFEST.in
/merlot/templates/merlot_buildout/buildout.cfg_tmpl
Deleted:
/merlot/templates/merlot_buildout/buildout.cfg
/merlot/templates/merlot_buildout/versions.cfg_tmpl
=======================================
--- /dev/null
+++ /MANIFEST.in Fri Mar 25 16:31:58 2011
@@ -0,0 +1,1 @@
+recursive-include merlot/templates/merlot_buildout *
=======================================
--- /dev/null
+++ /merlot/templates/merlot_buildout/buildout.cfg_tmpl Fri Mar 25 16:31:58
2011
@@ -0,0 +1,9 @@
+[buildout]
+extends =
+ http://merlot.googlecode.com/hg/buildout.cfg?r=${merlot_version}
+ http://merlot.googlecode.com/hg/versions.cfg?r=${merlot_version}
+versions = versions
+develop =
+
+[versions]
+Merlot = ${merlot_version}
=======================================
--- /merlot/templates/merlot_buildout/buildout.cfg Thu Mar 24 09:25:55 2011
+++ /dev/null
@@ -1,133 +0,0 @@
-[buildout]
-extends =
- http://grok.zope.org/releaseinfo/1.2/versions.cfg
- versions.cfg
-find-links = http://grok.zope.org/releaseinfo/1.2/eggs
-parts =
- app
- merlot_server
- debug_ini
- deploy_ini
- i18n
- mkdirs
- site_zcml
- test
- zope_conf
- zpasswd
- interactive_debugger
- omelette
- sphinx
-newest = false
-versions = versions
-extensions =
- buildout.dumppickedversions
-
-[app]
-recipe = zc.recipe.egg
-eggs = Merlot
- z3c.evalexception>=2.0
- Paste
- PasteScript
- PasteDeploy
- zope.i18n [compile]
- ipdb
-interpreter = python-console
-
-# This section generates a script named 'merlot' in the bin directory that
you
-# can use to start the server. It's using the debug configuration for
-# PasteDeploy, make sure you change it to the deployment configuration in a
-# production environment.
-[merlot_server]
-recipe = collective.recipe.template
-inline =
- #!/bin/bash
- export zope_i18n_compile_mo_files=True
- paster serve ${debug_ini:output}
-output = ${buildout:bin-directory}/merlot
-mode = 755
-
-[deploy_ini]
-recipe = collective.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
-host = 127.0.0.1
-port = 8080
-
-[debug_ini]
-recipe = collective.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
-host = 0.0.0.0
-port = 8080
-
-# This section named so that the i18n scripts are called bin/i18n...
-[i18n]
-recipe = z3c.recipe.i18n:i18n
-packages = merlot
-eggs = merlot
-domain = merlot
-output = merlot/locales
-zcml =
-
-[mkdirs]
-recipe = z3c.recipe.mkdir
-paths =
- ${zope_conf:filestorage}
- ${zope_conf:logfiles}
- ${zope_conf:blobstorage}
-
-[site_zcml]
-recipe = collective.recipe.template
-input = etc/site.zcml.in
-output = ${buildout:parts-directory}/etc/site.zcml
-
-[test]
-recipe = zc.recipe.testrunner
-eggs = Merlot
-defaults = ['--exit-with-status', '--auto-color', '--auto-progress', '-v']
-#defaults = ['--tests-pattern', '^f?tests$', '-v']
-
-[zope_conf]
-recipe = collective.recipe.template
-input = etc/zope.conf.in
-output = ${buildout:parts-directory}/etc/zope.conf
-filestorage = ${buildout:directory}/var/filestorage
-blobstorage = ${buildout:directory}/var/blobstorage
-logfiles = ${buildout:directory}/var/log
-extra =
-# 'extra' is copied verbatim. Use it for product config sections and so.
-
-# This section is named so that the zpasswd utility is
-# called 'zpasswd'
-[zpasswd]
-recipe = z3c.recipe.dev:script
-eggs =
- Merlot
- zope.password
-module = zope.password.zpasswd
-method = main
-
-[interactive_debugger]
-recipe = z3c.recipe.dev:script
-eggs = Merlot
-module = grokcore.startup.startup
-method = interactive_debug_prompt
-arguments = zope_conf="${zope_conf:output}"
-
-# Creates a unified directory structure (parts/omelette) of installed
packages,
-# symlinking to the actual contents, in order to ease navigation.
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${app:eggs}
-
-# Sphinx is a tool to create documentation. To build the Merlot
documentation
-# just run "bin/sphinx-build docs-source/ docs" from the buildout root and
the
-# documentation will be created in the docs directory in HTML format.
-[sphinx]
-recipe = collective.recipe.sphinxbuilder
-source = ${buildout:directory}/docs-source
-build = ${buildout:directory}/docs
-extra-paths = ${buildout:directory}
-eggs =
- ${app:eggs}
- repoze.sphinx.autointerface
=======================================
--- /merlot/templates/merlot_buildout/versions.cfg_tmpl Thu Mar 24 09:25:55
2011
+++ /dev/null
@@ -1,21 +0,0 @@
-[versions]
-hurry.zoperesource = 0.5
-z3c.relationfield = 0.6.1
-z3c.schema2xml = 1.0
-zc.relation = 1.0
-zope.pluggableauth = 1.1
-collective.recipe.template = 1.8
-Markdown = 2.0.3
-collective.recipe.omelette = 0.9
-ipdb = 0.1
-ipython = 0.10
-Unidecode = 0.04.1
-WebOb = 0.9.6.1
-hurry.resource = 0.9
-plone.i18n = 2.0
-z3c.objpath = 1.0
-z3c.relationfieldui = 0.5
-collective.recipe.sphinxbuilder = 0.7.0
-repoze.sphinx.autointerface = 0.4
-Cheetah = 2.4.4
-Merlot = ${merlot_version}