.

component/ZODB/buildout-dev.cfg

+
+
+# unpin ZODB<X> from particular revisions; only branch is left.
+[ZODB3-repository]
+revision=
+[ZODB4-repository]
+revision=
+[ZODB5-repository]
+revision=

component/ZODB/buildout-zodb3.cfg

-# SlapOS component for ZODB3.
-# https://zodb.org/
-
-[buildout]
-extends = buildout.cfg
-
-# XXX drop "4"
-[ZODB4]
-egg  = ZODB3
-
-[ZODB-repository]
-#branch  = 3.10-nxd
-branch  = 3.10-nxd--t
-#revision= ...	XXX pin
-
-[versions]
-transaction = 1.1.1
-zdaemon = 2.0.7
+## SlapOS component for ZODB3.
+## https://zodb.org/
+#
+#[buildout]
+#extends = buildout.cfg
+#
+## XXX drop "4"
+#[ZODB4]
+#egg  = ZODB3
+#
+#[ZODB-repository]
+##branch  = 3.10-nxd
+#branch  = 3.10-nxd--t
+##revision= ...	XXX pin
+#
+#[versions]
+#transaction = 1.1.1
+#zdaemon = 2.0.7

component/ZODB/buildout-zodb5.cfg

-# SlapOS component for ZODB5.
-# https://zodb.org/
-
-[buildout]
-extends = buildout.cfg
-
-
-[ZODB-repository]
-branch = master
-#revision = ...  XXX pin
-
-[versions]
-transaction = 2.4.0
+## SlapOS component for ZODB5.
+## https://zodb.org/
+#
+#[buildout]
+#extends = buildout.cfg
+#
+#
+#[ZODB-repository]
+#branch = master
+##revision = ...  XXX pin
+#
+#[versions]
+#transaction = 2.4.0

component/ZODB/buildout.cfg

@@ -8,17 +8,32 @@ extends =
 parts = ZODB/scripts
 
 
-# ZODB allows to use either ZODB3, ZODB4 or ZODB5	XXX
+# ZODB allows to use either ZODB3, ZODB4 or ZODB5
 # To select which version to use users should do:
 #
 #   [ZODB]
-#   egg = ${ZODB<version>:egg}
+#   major = <ZODB-version-major>
 #
 # By default ZODB4 is used.
 [ZODB]
-recipe  = zc.recipe.egg:eggs
-egg     = ${ZODB4:egg}
-eggs    = ${:egg}
+recipe = slapos.recipe.build
+major  = 4
+init =
+  zodb_x = 'ZODB'+options['major']
+  options['depends'] = '$${%s:egg}' % zodb_x
+  zodb_x = self.buildout[zodb_x]
+  options['egg'] = zodb_x['egg']
+  options['location'] = zodb_x['setup']
+  # XXX more ?
+  print '\n\nAAA'
+  print self.buildout['versions']
+  for _ in zodb_x['egg_versions'].splitlines():
+    egg, eq, version = _.split() # 'transaction = 1.7.0'
+    assert eq == '='
+    self.buildout['versions'][egg] = version
+  print '\n\nBBB'
+  print self.buildout['versions']
+  
 
 
 # ZODB/scripts installs scripts from ZODB
@@ -27,32 +42,69 @@ recipe  = zc.recipe.egg:scripts
 eggs    = ${ZODB:egg}
 
 
+[_ZODB-git-repository]
+recipe  = slapos.recipe.build:gitclone
+# XXX kirr -> nexedi
+repository = https://lab.nexedi.com/kirr/ZODB.git
+#location = ${buildout:parts-directory}/ZODB	# XXX
+git-executable = ${git:location}/bin/git
+
 # ZODB4: we maintain our own 4-nxd branch with patches for wendelin.core to work
 # correctly. The patches are backports of what is in ZODB master (ZODB5) ... XXX
-# XXX drop 4
 [ZODB4]
 recipe  = zc.recipe.egg:develop
-setup   = ${ZODB-repository:location}
+setup   = ${ZODB4-repository:location}
 egg     = ZODB
 
-[ZODB-repository]
-recipe  = slapos.recipe.build:gitclone
-# XXX kirr -> nexedi
-repository = https://lab.nexedi.com/kirr/ZODB.git
-location = ${buildout:parts-directory}/ZODB
-git-executable = ${git:location}/bin/git
-
+egg_versions =
+  transaction = 1.7.0
 
-[ZODB-repository]
+[ZODB4-repository]
+<= _ZODB-git-repository
+location = ${buildout:parts-directory}/ZODB4
 # XXX 4-nxd--t -> 4-nxd
 branch  = 4-nxd--t
 #revision= ...	XXX pin
 
+
+# ZODB3: similarly to ZODB4 we maintain our 3.10-nxd branch.
+[ZODB3]
+recipe  = zc.recipe.egg:develop
+setup   = ${ZODB3-repository:location}
+egg     = ZODB3
+
+egg_versions =
+  transaction = 1.1.1
+  zdaemon = 2.0.7
+
+[ZODB3-repository]
+<= _ZODB-git-repository
+location = ${buildout:parts-directory}/ZODB3
+# XXX 3.10-nxd--t -> 3.10-nxd
+branch  = 3.10-nxd--t
+#revision= ...	XXX pin
+
+
+# ZODB5: pristine upstream
+[ZODB5]
+recipe  = zc.recipe.egg:develop
+setup   = ${ZODB5-repository:location}
+egg     = ZODB
+
+egg_versions =
+  transaction = 2.4.0
+
+[ZODB5-repository]
+<= _ZODB-git-repository
+location = ${buildout:parts-directory}/ZODB5
+branch  = master
+#revision= ...	XXX pin
+
+
 [versions]
 # TODO update to 4.7.3 once it is released
 Btrees = 4.5.1
 persistent = 4.6.4
-transaction = 1.7.0
 # TODO update to 2.0.0 once NEO stops doing bytes._pack = ...
 # https://lab.nexedi.com/nexedi/slapos/commit/27f574bc
 zodbpickle = 1.0.4

component/ZODB/test-common.cfg

@@ -20,9 +20,9 @@ parts =
     instance.cfg
 
 
-# unpin ZODB from particular revision; only ${ZODB:branch} is left.
-[ZODB-repository]
-revision=
+# # unpin ZODB from particular revision; only ${ZODB:branch} is left.
+# [ZODB-repository]
+# revision=
 
 # test-dependent eggs that must come through in-tree recipes.
 [ZODB]
@@ -46,7 +46,7 @@ template = inline:
 [.nxdtest]
 <= jinja2-template
 template = inline:
-  ZODB = '${ZODB-repository:location}'
+  ZODB = '${ZODB:location}'
   TestCase('unit',       ['python', '-m', 'zope.testrunner', '-uv', '--test-path=src'], cwd=ZODB)
   TestCase('functional', ['python', '-m', 'zope.testrunner', '-fv', '--test-path=src'], cwd=ZODB)