Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge lest release

  • Loading branch information...
commit 4b458ca665032b283fe4d42ec03f8aca36a4beb6 2 parents ce81853 + d9388b4
Encolpe DEGOUTE encolpe authored
18 docs/HISTORY.txt
View
@@ -1,6 +1,24 @@
Changelog
=========
+1.14 2012-12-17
+----------------
+
+- Unpin old versions
+ [encolpe]
+
+- Add a switch for plone IDE
+ [encolpe]
+
+1.13 2012-12-17
+----------------
+
+- Fix how customer name is added in the project path
+ [encolpe]
+
+- Remove ploneIDE automatic installation
+ [encolpe]
+
1.12 2012-05-04
----------------
2  setup.py
View
@@ -21,7 +21,7 @@
import os
from setuptools import setup, find_packages
-version = '1.12'
+version = '1.14'
documentation = ''
if os.path.exists(os.path.join("docs", "unis-zopeskel-usage.txt")):
23 zopeskel/unis/templates.py
View
@@ -351,13 +351,24 @@
'app_deco',
title='Install plone.app.deco products',
description='Do you want to use Deco features?',
- default='true',
+ default='false',
modes=(EXPERT),
help="""
This option install all needed have Deco in your plone site.
"""
)
+VAR_APP_IDE = BooleanVar(
+ 'app_ide',
+ title='Install plone IDE environmant',
+ description='Do you want to use Plone IDE features?',
+ default='false',
+ modes=(EXPERT),
+ help="""
+This option install all needed to have plone IDE in the development mode.
+"""
+)
+
class UnisPlone4Buildout(AbstractBuildout):
_template_dir = 'templates/unis_plone4_buildout'
summary = "A buildout for Plone 4.x"
@@ -430,10 +441,18 @@ class UnisPlone4Buildout(AbstractBuildout):
VAR_APP_GETPAID,
VAR_APP_THEMING,
VAR_APP_DECO,
+ VAR_APP_IDE,
])
def run(self, command, output_dir, vars):
- output_dir = vars["customer"] and "%s.%s"%(str(vars["customer"]).lower(), str(vars["project"]).lower()) or str(vars["project"]).lower()
+ ## /!\ output_dir = './'+vars['project']
+ ## vars['project'] can be a path
+
+ if vars["customer"]:
+ project_path = str(vars["project"]).lower().split(os.path.sep)
+ project_path[-1] = '.'.join([str(vars["customer"]).lower(),
+ project_path[-1]])
+ output_dir = (os.path.sep).join(project_path)
self.pre(command, output_dir, vars)
8 zopeskel/unis/templates/unis_plone4_buildout/profiles/development.cfg_tmpl
View
@@ -16,7 +16,13 @@
# client (80) => appache => zope server (${dev_instance})
[buildout]
-extends = standalone.cfg etc/http.cfg modules/plonide.cfg
+extends =
+ standalone.cfg
+ etc/http.cfg
+#if $app_ide == 'true'
+ modules/plonide.cfg
+#end if
+
newest = false
develop = \${project-settings:develop}
parts +=
21 zopeskel/unis/templates/unis_plone4_buildout/profiles/etc/versions.cfg_tmpl
View
@@ -8,24 +8,11 @@ pil = http://dist.plone.org/thirdparty/PIL-1.1.7.tar.gz
pound = http://www.apsis.ch/pound/Pound-2.5.tgz
varnish = http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
squid = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.12.tar.gz
+## HAProxy official release is here: http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.22.tar.gz
haproxy = http://dist.plone.org/thirdparty/haproxy-1.4.8.zip
# Versions - Define eggs version
[versions]
-zc.buildout = 1.5.2
-distribute = 0.6.16
-docutils = 0.7
-zc.recipe.cmmi = 1.3.2
-
-plone.recipe.varnish = 1.1
-plone.recipe.apache = 0.3.2
-supervisor = 3.0a10
-
-zope.interface = 3.6.4
-zope.schema = 3.6.0
-zope.exceptions = 3.6.1
-zope.testing = 3.10.2
-
-# Development
-zc.recipe.testrunner = 1.4.0
-zc.recipe.egg = 1.3.2
+#plone.recipe.varnish = 1.2.2
+#plone.recipe.apache = 0.3.2
+#supervisor = 3.0a10
Please sign in to comment.
Something went wrong with that request. Please try again.