[Erp5-report] r31075 kazuhiko - in /experimental/erp5.buildout: profiles/ recipes/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Dec 4 13:11:53 CET 2009
Author: kazuhiko
Date: Fri Dec 4 13:11:49 2009
New Revision: 31075
URL: http://svn.erp5.org?rev=31075&view=rev
Log:
now we provide erp5.recipe.zope2install and erp5.recipe.zope2instance eggs.
Removed:
experimental/erp5.buildout/recipes/zope2install.py
experimental/erp5.buildout/recipes/zope2instance.py
Modified:
experimental/erp5.buildout/profiles/base.cfg
experimental/erp5.buildout/recipes/setup.py
Modified: experimental/erp5.buildout/profiles/base.cfg
URL: http://svn.erp5.org/experimental/erp5.buildout/profiles/base.cfg?rev=31075&r1=31074&r2=31075&view=diff
==============================================================================
--- experimental/erp5.buildout/profiles/base.cfg [utf8] (original)
+++ experimental/erp5.buildout/profiles/base.cfg [utf8] Fri Dec 4 13:11:49 2009
@@ -74,14 +74,13 @@
http://svn.plone.org/svn/archetypes/MimetypesRegistry/tags/Archetypes-1.4.0-final MimetypesRegistry
[zope2]
-recipe = recipes:zope2install
+recipe = erp5.recipe.zope2install
url = http://www.zope.org/Products/Zope/2.8.11/Zope-2.8.11-final.tgz
-patch = patches/Zope-2.8.0-final-aq_dynamic.patch
skip-fake-eggs =
pytz
[erp5_instance]
-recipe = recipes:zope2instance
+recipe = erp5.recipe.zope2instance
zope2-location = ${zope2:location}
user = zope:zope
http-address = 18080
Modified: experimental/erp5.buildout/recipes/setup.py
URL: http://svn.erp5.org/experimental/erp5.buildout/recipes/setup.py?rev=31075&r1=31074&r2=31075&view=diff
==============================================================================
--- experimental/erp5.buildout/recipes/setup.py [utf8] (original)
+++ experimental/erp5.buildout/recipes/setup.py [utf8] Fri Dec 4 13:11:49 2009
@@ -2,9 +2,10 @@
setup(name="recipes",
version="0.0.1",
- entry_points={'zc.buildout': ['zope2install = zope2install:Recipe',
- 'zope2instance = zope2instance:Recipe',
- 'create_erp5_site = create_erp5_site:Recipe',
+ py_modules=['create_erp5_site',
+ 'genbt5list',
+ 'run_unit_test'],
+ entry_points={'zc.buildout': ['create_erp5_site = create_erp5_site:Recipe',
'genbt5list = genbt5list:Recipe',
'run_unit_test = run_unit_test:Recipe']},
install_requires=['plone.recipe.zope2install',
Removed: experimental/erp5.buildout/recipes/zope2install.py
URL: http://svn.erp5.org/experimental/erp5.buildout/recipes/zope2install.py?rev=31074&view=auto
==============================================================================
--- experimental/erp5.buildout/recipes/zope2install.py [utf8] (original)
+++ experimental/erp5.buildout/recipes/zope2install.py (removed)
@@ -1,85 +1,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# Contains code from plone.recipe.zope2install
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-import os, re, shutil, tempfile, urllib2, urlparse
-import setuptools.archive_util
-import plone.recipe.zope2install
-
-class Recipe(plone.recipe.zope2install.Recipe):
-
- def __init__(self, buildout, name, options):
- plone.recipe.zope2install.Recipe.__init__(self, buildout, name, options)
- self.patch = os.path.join(self.buildout['buildout']['directory'],
- options['patch'])
-
- def install(self):
- options = self.options
- location = options['location']
- download_dir = self.buildout['buildout']['download-cache']
-
- if os.path.exists(location):
- # if the zope installation exists and is shared, then we are done
- # and don't return a path, so the shared installation doesn't get
- # deleted on uninstall
- if options.get('shared-zope') == 'true':
- return []
- else:
- shutil.rmtree(location)
-
- if self.svn:
- assert os.system('svn co %s %s' % (options['svn'], location)
- ) == 0
- else:
- if not os.path.isdir(download_dir):
- os.mkdir(download_dir)
-
- _, _, urlpath, _, _, _ = urlparse.urlparse(self.url)
- tmp = tempfile.mkdtemp('buildout-'+self.name)
- try:
- fname = os.path.join(download_dir, urlpath.split('/')[-1])
- # Have we already downloaded the file
- if not os.path.exists(fname):
- f = open(fname, 'wb')
- try:
- f.write(urllib2.urlopen(self.url).read())
- except:
- os.remove(fname)
- raise
- f.close()
-
- setuptools.archive_util.unpack_archive(fname, tmp)
- # The Zope tarballs have a Zope-<version> folder at the root
- # level, so we need to move that one into the right place.
- files = os.listdir(tmp)
- shutil.move(os.path.join(tmp, files[0]), location)
- finally:
- shutil.rmtree(tmp)
-
- os.chdir(location)
-
- # erp5: apply a patch to zope before build
- assert os.system('patch -p1 < %s' % self.patch) == 0
-
- assert os.spawnl(
- os.P_WAIT, options['executable'], options['executable'],
- 'setup.py',
- 'build_ext', '-i',
- ) == 0
-
- if self.url and options.get('shared-zope') == 'true':
- # don't return path if the installation is shared
- return []
- return location
-
Removed: experimental/erp5.buildout/recipes/zope2instance.py
URL: http://svn.erp5.org/experimental/erp5.buildout/recipes/zope2instance.py?rev=31074&view=auto
==============================================================================
--- experimental/erp5.buildout/recipes/zope2instance.py [utf8] (original)
+++ experimental/erp5.buildout/recipes/zope2instance.py (removed)
@@ -1,30 +1,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2009 Nexedi SARL and Contributors. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-import os
-import plone.recipe.zope2instance
-
-class Recipe(plone.recipe.zope2instance.Recipe):
- def install(self):
- # Override plone.recipe.zope2instance so as to create several
- # directories used by ERP5.
- ret = plone.recipe.zope2instance.Recipe.install(self)
- options = self.options
- location = options['location']
-
- for directory in ('Constraint', 'Document', 'PropertySheet', 'tests'):
- path = os.path.join(location, directory)
- if not os.path.exists(path):
- os.mkdir(path)
-
- return ret
More information about the Erp5-report
mailing list