[Checkins] SVN: CMF.buildout/branches/zope210-cmf21/ - make it all work with Zope 2.10, CMF 2.1 and Python 2.4

[Jens Vagelpohl]

Log message for revision 105474:
  - make it all work with Zope 2.10, CMF 2.1 and Python 2.4
  

Changed:
  _U  CMF.buildout/branches/zope210-cmf21/
  U   CMF.buildout/branches/zope210-cmf21/README.txt
  U   CMF.buildout/branches/zope210-cmf21/buildout.cfg
  _U  CMF.buildout/branches/zope210-cmf21/src/

-=-

Property changes on: CMF.buildout/branches/zope210-cmf21
___________________________________________________________________
Modified: svn:ignore
   - bin
develop-eggs
eggs
parts
var
.installed.cfg

   + bin
develop-eggs
downloads
eggs
fake-eggs
parts
var
.installed.cfg


Modified: CMF.buildout/branches/zope210-cmf21/README.txt
===================================================================
--- CMF.buildout/branches/zope210-cmf21/README.txt	2009-11-04 11:12:23 UTC (rev 105473)
+++ CMF.buildout/branches/zope210-cmf21/README.txt	2009-11-04 11:43:33 UTC (rev 105474)
@@ -2,24 +2,24 @@
 CMF.buildout
 ============
 -------------------------
-Build CMF 2.2 + Zope 2.13
+Build CMF 2.1 + Zope 2.10
 -------------------------
 
 Introduction
 ============
 
-Builds CMF 2.2 with Zope 2.13 from develop eggs located in ``src``.
+Builds CMF 2.1 with Zope 2.10 from develop eggs located in ``src``.
 
 Dependencies
 ============
 
-Requires Python 2.6
+Requires Python 2.4
 
 Usage
 =====
 ::
 
-  $ python2.6 bootstrap/bootstrap.py
+  $ python2.4 bootstrap/bootstrap.py
   $ ./bin/buildout
   $ ./bin/test
   $ ./bin/instance

Modified: CMF.buildout/branches/zope210-cmf21/buildout.cfg
===================================================================
--- CMF.buildout/branches/zope210-cmf21/buildout.cfg	2009-11-04 11:12:23 UTC (rev 105473)
+++ CMF.buildout/branches/zope210-cmf21/buildout.cfg	2009-11-04 11:43:33 UTC (rev 105474)
@@ -1,41 +1,38 @@
-# CMF trunk + Zope trunk
+# CMF 2.1 + Zope 2.10
 
 [buildout]
-extends = src/Zope2/versions.cfg
 parts =
     zope2
     instance
     zopepy
     test
 eggs =
-    Zope2
+    Products.CMFActionIcons
     Products.CMFCalendar
     Products.CMFCore
     Products.CMFDefault
     Products.CMFTopic
     Products.CMFUid
     Products.DCWorkflow
-    Products.GenericSetup
-    five.localsitemanager
-    plone.recipe.zope2instance
+    Products.GenericSetup <= 1.4.999
+    five.localsitemanager <= 1.0
 develop =
-    src/Zope2
+    src/Products.CMFActionIcons
     src/Products.CMFCalendar
     src/Products.CMFCore
     src/Products.CMFDefault
     src/Products.CMFTopic
     src/Products.CMFUid
     src/Products.DCWorkflow
-    src/Products.GenericSetup
-    src/five.localsitemanager
-    src/plone.recipe.zope2instance
 
 [zope2]
-recipe = zc.recipe.egg
-eggs = ${buildout:eggs}
+recipe = plone.recipe.zope2install
+url = http://www.zope.org/Products/Zope/2.10.8/Zope-2.10.8-final.tgz
+smart-recompile = True
 
 [instance]
 recipe = plone.recipe.zope2instance
+zope2-location = ${zope2:location}
 eggs = ${buildout:eggs}
 user = admin:admin
 debug-mode = on
@@ -46,10 +43,12 @@
 recipe = zc.recipe.egg
 eggs = ${buildout:eggs}
 interpreter = zopepy
+extra-paths = ${zope2:location}/lib/python
 scripts = zopepy
 
 [test]
 recipe = zc.recipe.testrunner
+extra-paths = ${zope2:location}/lib/python
 eggs = ${buildout:eggs}
-defaults = ['--module', '^Products[.](CMF|DC|GenericSetup)|^five[.]']
+defaults = ['--module', '^Products[.](CMF|DC)']
 


Property changes on: CMF.buildout/branches/zope210-cmf21/src
___________________________________________________________________
Modified: svn:externals
   - Zope2 svn://svn.zope.org/repos/main/Zope/trunk
Products.CMFCalendar svn://svn.zope.org/repos/main/Products.CMFCalendar/trunk
Products.CMFCore svn://svn.zope.org/repos/main/Products.CMFCore/trunk
Products.CMFDefault svn://svn.zope.org/repos/main/Products.CMFDefault/trunk
Products.CMFTopic svn://svn.zope.org/repos/main/Products.CMFTopic/trunk
Products.CMFUid svn://svn.zope.org/repos/main/Products.CMFUid/trunk
Products.DCWorkflow svn://svn.zope.org/repos/main/Products.DCWorkflow/trunk
Products.GenericSetup svn://svn.zope.org/repos/main/Products.GenericSetup/trunk
five.localsitemanager svn://svn.zope.org/repos/main/five.localsitemanager/trunk
plone.recipe.zope2instance https://svn.plone.org/svn/collective/buildout/plone.recipe.zope2instance/trunk

   + Products.CMFActionIcons svn://svn.zope.org/repos/main/Products.CMFActionIcons/branches/2.1
Products.CMFCalendar svn://svn.zope.org/repos/main/Products.CMFCalendar/branches/2.1
Products.CMFCore svn://svn.zope.org/repos/main/Products.CMFCore/branches/2.1
Products.CMFDefault svn://svn.zope.org/repos/main/Products.CMFDefault/branches/2.1
Products.CMFTopic svn://svn.zope.org/repos/main/Products.CMFTopic/branches/2.1
Products.CMFUid svn://svn.zope.org/repos/main/Products.CMFUid/branches/2.1
Products.DCWorkflow svn://svn.zope.org/repos/main/Products.DCWorkflow/branches/2.1