Permalink
Browse files

put some order on the buildout mess

  • Loading branch information...
hvelarde committed Dec 15, 2012
1 parent 959834d commit b3b6be7735a77cbcf582e13e85d276f07ebe9f6b
Showing with 61 additions and 65 deletions.
  1. +3 −64 buildout.cfg
  2. +31 −0 checkouts.cfg
  3. +18 −1 sources.cfg
  4. +9 −0 versions.cfg
View
@@ -25,43 +25,14 @@ extends =
http://dist.plone.org/release/4.2.1/versions.cfg
https://raw.github.com/plone/buildout.coredev/4.2/sources.cfg
http://dist.plone.org/release/4.2-latest/versions.cfg
-
+ sources.cfg
+ checkouts.cfg
+ versions.cfg
dump-picked-versions-file = picked.cfg
sources = sources
sources-dir = ${buildout:directory}/src
-allow-picked-versions = true
-
-# These are packages that contain documentation in them
-auto-checkout =
- plone.app.portlets
- plone.app.viewletmanager
- plone.app.contentrules
- Products.ResourceRegistries
- Products.GenericSetup
- Products.DCWorkflow
- plone.app.contentrules
- plone.app.workflow
- Products.CMFEditions
- plone.app.testing
- plone.api
- Products.TinyMCE
- tutorials.todoapp
- ploneorg.admin
- sphinxcontrib.contributors
-
-# these can be removed after upcoming release
- transmogrify.webcrawler
- transmogrify.htmlcontentextractor
- transmogrify.ploneremote
- transmogrify.htmltesting
- transmogrify.siteanalyser
- transmogrify.command
- funnelweb
- mr.migrator
-
-
allow-picked-versions = true
# Don't try to do this smart optimization anymore as we are not running on rtd.org
@@ -110,35 +81,3 @@ recipe = zc.recipe.egg
eggs =
funnelweb
transmogrify.command
-
-
-[versions]
-roadrunner = 0.2.3.1
-zc.recipe.egg = 1.2.0
-
-# Some pindowns to make sure Sphinx + dependencies don't go havoc
-collective.recipe.sphinxbuilder = 0.7.0
-Sphinx = 1.1.3
-docutils = 0.9.1
-Docutils = 0.9.1
-
-# Make sure you use public Github URL here!
-[sources]
-Products.TinyMCE = git git://github.com/plone/Products.TinyMCE
-plone.api = git git://github.com/plone/plone.api.git
-tutorials.todoapp = git git://github.com/collective/tutorial.todoapp.git
-
-ploneorg.admin = git git://github.com/plone/ploneorg.admin.git egg=false
-sphinxcontrib.contributors = git git://github.com/miohtama/sphinxcontrib.contributors.git
-
-# funnelweb
-transmogrify.webcrawler = git git@github.com:djay/transmogrify.webcrawler.git
-transmogrify.htmlcontentextractor = git git@github.com:djay/transmogrify.htmlcontentextractor.git
-transmogrify.ploneremote = git git@github.com:djay/transmogrify.ploneremote.git
-transmogrify.htmltesting = git git@github.com:djay/transmogrify.htmltesting.git
-transmogrify.siteanalyser = git git@github.com:djay/transmogrify.siteanalyser.git
-transmogrify.command = git git@github.com:djay/transmogrify.command.git
-funnelweb = git git@github.com:collective/funnelweb.git
-mr.migrator = git git@github.com:collective/mr.migrator.git
-
-
View
@@ -0,0 +1,31 @@
+[buildout]
+always-accept-server-certificate = true
+always-checkout = force
+# Please keep alphabetized.
+# These are packages that contain documentation in them
+auto-checkout =
+ plone.api
+ plone.app.contentrules
+ plone.app.contentrules
+ plone.app.portlets
+ plone.app.testing
+ plone.app.viewletmanager
+ plone.app.workflow
+ ploneorg.admin
+ Products.CMFEditions
+ Products.DCWorkflow
+ Products.GenericSetup
+ Products.ResourceRegistries
+ Products.TinyMCE
+ sphinxcontrib.contributors
+ tutorials.todoapp
+
+# these can be removed after upcoming release
+ funnelweb
+ mr.migrator
+ transmogrify.command
+ transmogrify.htmlcontentextractor
+ transmogrify.htmltesting
+ transmogrify.ploneremote
+ transmogrify.siteanalyser
+ transmogrify.webcrawler
View
@@ -1,6 +1,23 @@
# auto-checkout has moved to checkouts.cfg so it's easier to extend sources.cfg
-
[sources]
+Products.TinyMCE = git git://github.com/plone/Products.TinyMCE
+plone.api = git git://github.com/plone/plone.api.git
+tutorials.todoapp = git git://github.com/collective/tutorial.todoapp.git
+ploneorg.admin = git git://github.com/plone/ploneorg.admin.git egg=false
+sphinxcontrib.contributors = git git://github.com/miohtama/sphinxcontrib.contributors.git
+
+# funnelweb
+transmogrify.webcrawler = git git@github.com:collective/transmogrify.webcrawler.git
+transmogrify.htmlcontentextractor = git git@github.com:collective/transmogrify.htmlcontentextractor.git
+transmogrify.ploneremote = git git@github.com:collective/transmogrify.ploneremote.git
+transmogrify.htmltesting = git git@github.com:collective/transmogrify.htmltesting.git
+transmogrify.siteanalyser = git git@github.com:collective/transmogrify.siteanalyser.git
+transmogrify.command = git git@github.com:collective/transmogrify.command.git
+funnelweb = git git@github.com:collective/funnelweb.git
+mr.migrator = git git@github.com:collective/mr.migrator.git
+
+# XXX: can we get rid of this?
+[sources-XXX]
Zope2 = svn http://svn.zope.org/repos/main/Zope/branches/2.13
ZODB3 = svn http://svn.zope.org/repos/main/ZODB/branches/3.10
Plone = git https://github.com/plone/Plone.git
View
@@ -0,0 +1,9 @@
+[versions]
+roadrunner = 0.2.3.1
+zc.recipe.egg = 1.2.0
+
+# Some pindowns to make sure Sphinx + dependencies don't go havoc
+collective.recipe.sphinxbuilder = 0.7.0
+Sphinx = 1.1.3
+docutils = 0.9.1
+Docutils = 0.9.1

0 comments on commit b3b6be7

Please sign in to comment.