Permalink
Browse files

reorganizing deco buildout and updating to latest plone version

  • Loading branch information...
garbas committed Oct 22, 2012
1 parent b8c6d7d commit b250daf44bd401d5e578db3102ebf88a90273558
Showing with 66 additions and 136 deletions.
  1. +18 −19 README.rst
  2. +8 −5 buildout.cfg.in
  3. +0 −8 deco-1.0.cfg
  4. +0 −45 deco-2.0.cfg
  5. +13 −0 deco.cfg
  6. +7 −15 sources.cfg
  7. +15 −27 toolbar-2.0.cfg → tiles.cfg
  8. +0 −7 toolbar-1.0.cfg
  9. +5 −10 versions.cfg
View
@@ -36,38 +36,37 @@ Running Tests
TODO: need to write this section once we have tests running again.
+Generating Documentation
+========================
+
+TODO: write it
+
+
Configurations
==============
In ``buildout.cfg`` you can select one of the configurations described below:
-- ``toolbar-1.0.cfg``
-
- This is setup for `plone.app.toolbar`_ version 1.0, which replaces old green
- editing toolbar with Twitter Bootstrap like toolbar. Although toolbar is
- rendered inside iframe all links - when clicked - will open in top frame.
-
-- ``toolbar-2.0.cfg``
+- ``tiles.cfg``
- This is setup for `plone.app.toolbar`_ version 2.0, which builds upon
- version 1.0 and opens toolbar links inside overlay which is placed inside
- iframe. This should give us separation of backend and frontend theming.
+ This is setup for `plone.app.toolbar`_ version 1.0 without deco, but with
+ `plone.app.standardtiles`_ also enabled. This should make it possible to ca
-- ``deco-1.0.cfg``
+- ``deco.cfg``
- This is setup for `plone.app.deco`_ version 1.0 also known as Deco Lite.
- Intention of Deco Lite is to bring Deco idea closer to current Plone 4 user
- experience and not so radically change the way Plone is being used.
+ This setup extends ``toolbar.cfg`` and adds `plone.app.deco`_ to it. Installs
+ also `plone.app.layoutpage`_ which is a dexterity content type with layout
+ behaviour enabled. This should be a starting point to start development of
+ Deco.
-- ``deco-2.0.cfg``
+- ``cmsui.cfg``
- This is setup for `plone.app.deco`_ version 2.0. Difference from 1.0 version
- is that it includes `plone.app.toolbar`_ version 2.0 which includes CMSUI
- functionality. This is also setup which you can use to develop both on
- toolbar and deco.
+ This setup extends ``toolbar.cfg`` and uses `plone.app.toolbar`_ version 2.0
+ which should open overlays for every action/button in toolbar.
.. _`plone.app.toolbar`: https://github.com/plone/plone.app.toolbar
+.. _`plone.app.layoutpage`: https://github.com/plone/plone.app.layoutpage
.. _`plone.app.toolbar github issues`: https://github.com/plone/plone.app.toolbar/issues
.. _`plone.app.deco`: https://github.com/plone/plone.app.deco
.. _`plone.app.deco github issues`: https://github.com/plone/plone.app.deco/issues
View
@@ -1,12 +1,15 @@
[buildout]
-# only uncomment one
extends =
-# deco-1.0.cfg
-# deco-2.0.cfg
-# toolbar-1.0.cfg
-# toolbar-2.0.cfg
+
+# only uncomment one to bootstrap environment for one of the subprojects
+# tiles.cfg
+# deco.cfg
+# cmsui.cfg
+
+# if you want Plone site to be automaticaly created for you
# initial-site.cfg
+# add development tools that you might need to develop with
#[instance]
#eggs +=
# iw.debug
View
@@ -1,8 +0,0 @@
-[buildout]
-extends = deco-2.0.cfg
-
-[sources]
-plone.app.toolbar = git ${remotes:plone}/plone.app.toolbar.git pushurl=${remotes:plone_push}/plone.app.toolbar.git branch=1.x
-
-[versions]
-plone.app.toolbar = 1.1
View
@@ -1,45 +0,0 @@
-[buildout]
-extends = toolbar-2.0.cfg
-auto-checkout +=
- plone.app.deco
- plone.app.blocks
- plone.app.layoutpage
- plone.app.tiles
- plone.app.texttile
- plone.app.imagetile
- plone.app.contenttile
- plone.app.contentlistingtile
- plone.formwidget.querystring
- plone.directives.tiles
-# plone.app.contentlistingtile
-# plone.app.mediarepository
-# collective.quickupload
- plone.act
- robotframework-selenium2library
-
-[instance]
-eggs += plone.app.deco
-
-[test]
-eggs +=
- plone.app.blocks [test]
- plone.app.layoutpage [test]
- plone.app.tiles [test]
- plone.app.texttile [test]
- plone.app.imagetile [test]
- plone.app.contenttile [test]
- plone.app.contentlistingtile [test]
- plone.app.deco [test]
-# plone.app.contentlistingtile [test]
-# plone.app.mediarepository [test]
-
-[versions]
-plone.app.drafts = 1.0a2
-plone.app.blocks = 1.0
-plone.app.layoutpage = 1.0
-plone.app.tiles = 1.0.1
-plone.app.texttile = 1.0
-plone.app.imagetile = 1.0
-plone.app.contenttile = 1.0
-plone.app.contentlistingtile = 1.0
-plone.app.deco = 1.0
View
@@ -0,0 +1,13 @@
+[buildout]
+extends = tiles.cfg
+auto-checkout +=
+ plone.app.deco
+ plone.app.layoutpage
+
+[instance]
+eggs += plone.app.deco
+
+[test]
+eggs +=
+ plone.app.deco[test]
+ plone.app.layoutpage[test]
View
@@ -13,27 +13,19 @@ robotframework-selenium2library = git git://github.com/rtomac/robotframework-sel
buster-selenium = git ${remotes:plone}/buster-selenium.git pushurl=${remotes:plone_push}/buster-selenium.git
plone.tiles = git ${remotes:plone}/plone.tiles.git pushurl=${remotes:plone_push}/plone.tiles.git
-plone.app.layout = git ${remotes:plone}/plone.app.layout.git pushurl=${remotes:plone_push}/plone.app.layout.git branch=plone-app-toolbar-roles-in-bodyclass
plone.directives.tiles = git ${remotes:plone}/plone.directives.tiles.git pushurl=${remotes:plone_push}/plone.directives.tiles.git
-plone.app.toolbar = git ${remotes:plone}/plone.app.toolbar.git pushurl=${remotes:plone_push}/plone.app.toolbar.git
-
plone.app.blocks = git ${remotes:plone}/plone.app.blocks.git pushurl=${remotes:plone_push}/plone.app.blocks.git
-plone.app.layoutpage = git ${remotes:plone}/plone.app.layoutpage.git pushurl=${remotes:plone_push}/plone.app.layoutpage.git
+plone.app.drafts = git ${remotes:plone}/plone.app.drafts.git pushurl=${remotes:plone_push}/plone.app.drafts.git
+plone.app.intid = git ${remotes:plone}/plone.app.intid.git pushurl=${remotes:plone_push}/plone.app.intid.git
plone.app.tiles = git ${remotes:plone}/plone.app.tiles.git pushurl=${remotes:plone_push}/plone.app.tiles.git
+plone.app.standardtiles = git ${remotes:plone}/plone.app.standardtiles.git pushurl=${remotes:plone_push}/plone.app.standardtiles.git
+plone.app.toolbar = git ${remotes:plone}/plone.app.toolbar.git pushurl=${remotes:plone_push}/plone.app.toolbar.git branch=1.x
+
plone.app.texttile = git ${remotes:plone}/plone.app.texttile.git pushurl=${remotes:plone_push}/plone.app.texttile.git
plone.app.imagetile = git ${remotes:plone}/plone.app.imagetile.git pushurl=${remotes:plone_push}/plone.app.imagetile.git
plone.app.contenttile = git ${remotes:plone}/plone.app.contenttile.git pushurl=${remotes:plone_push}/plone.app.contenttile.git
plone.app.contentlistingtile = git ${remotes:plone}/plone.app.contentlistingtile.git pushurl=${remotes:plone_push}/plone.app.contentlistingtile.git
plone.formwidget.querystring = git ${remotes:plone}/plone.formwidget.querystring.git pushurl=${remotes:plone_push}/plone.formwidget.querystring.git branch=contentlistingtileintegration
-plone.app.deco = git ${remotes:plone}/plone.app.deco.git pushurl=${remotes:plone_push}/plone.app.deco.git
-#plone.app.contentlistingtile = git ${remotes:plone}/plone.app.contentlistingtile.git pushurl=${remotes:plone_push}/plone.app.contentlistingtile.git
-#plone.app.mediarepository = git ${remotes:plone}/plone.app.mediarepository.git pushurl=${remotes:plone_push}/plone.app.mediarepository.git
-
-# things that can be removed once right version is released
-# ---------------------------------------------------------
-
-# can be removed with 0.6.2 release being out
-plone.app.z3cform = git ${remotes:plone}/plone.app.z3cform.git pushurl=${remotes:plone_push}/plone.app.z3cform.git
-# can be removed with 4.2.2 release being out
-Products.CMFPlone = git ${remotes:plone}/Products.CMFPlone.git pushurl=${remotes:plone_push}/Products.CMFPlone.git branch=4.2
+plone.app.deco = git ${remotes:plone}/plone.app.deco.git pushurl=${remotes:plone_push}/plone.app.deco.git
+plone.app.layoutpage = git ${remotes:plone}/plone.app.layoutpage.git pushurl=${remotes:plone_push}/plone.app.layoutpage.git
@@ -6,14 +6,20 @@ unzip = true
parts =
instance
test
- scripts
- sphinxbuilder
+ docs
auto-checkout =
- Products.CMFPlone
+ plone.act
+ buster-selenium
+ robotframework-selenium2library
+
plone.tiles
- plone.app.layout
+ plone.directives.tiles
+ plone.app.blocks
+ plone.app.drafts
+ plone.app.intid
+ plone.app.tiles
plone.app.toolbar
- plone.app.z3cform
+ plone.app.standardtiles
[instance]
recipe = plone.recipe.zope2instance
@@ -22,10 +28,11 @@ user = admin:admin
http-address = 8080
debug-mode = on
verbose-security = on
+interpreter = instance-python
eggs =
Pillow
Plone
- plone.app.toolbar
+ plone.app.standardtiles
[test]
recipe = zc.recipe.testrunner
@@ -34,27 +41,8 @@ eggs =
plone.tiles [test]
plone.app.toolbar [test]
-[versions]
-decorator = 3.3.3
-robotframework = 2.7.4
-robotsuite = 0.9.0
-plone.tiles = 1.1
-plone.app.jquery = 1.7.2
-plone.app.jquerytools = 1.4
-plone.app.toolbar = 2.0
-Sphinx = 1.1.3
-collective.recipe.sphinxbuilder = 0.7.1
-z3c.recipe.scripts = 1.0.1
-
-[scripts]
-recipe = z3c.recipe.scripts
-dependent-scripts = true
-interpreter = zopepy
-eggs =
- ${instance:eggs}
-
-[sphinxbuilder]
+[docs]
recipe = collective.recipe.sphinxbuilder
source = ${buildout:directory}/docs
build = ${buildout:directory}/docs/_build
-interpreter = ${buildout:directory}/bin/zopepy
+interpreter = ${buildout:directory}/bin/instance-python
View
@@ -1,7 +0,0 @@
-[buildout]
-extends = toolbar-2.0.cfg
-
-[sources]
-plone.app.toolbar = git ${remotes:plone}/plone.app.toolbar.git pushurl=${remotes:plone_push}/plone.app.toolbar.git branch=1.x
-
-[versions]
View
@@ -1,14 +1,9 @@
[buildout]
extends =
- http://dist.plone.org/release/4.2-latest/versions.cfg
+ http://dist.plone.org/release/4.3a2/versions.cfg
[versions]
-mr.developer = 1.21
-Pillow = 1.7.7
-ipython = 0.12.1
-iw.debug = 0.3
-ipdb = 0.6.1
-interlude = 1.1.1
-selenium = 2.24.0
-zc.buildout = 1.6.3
-zc.recipe.egg = 1.3.2
+#zc.buildout = 1.6.3
+#Pillow = 1.7.7
+#plone.app.layout = 2.3.2
+#plone.app.z3cform = 0.7.0

0 comments on commit b250daf

Please sign in to comment.