From 1c2f1865a18cd0c96eed51e90d20ed1363552ac2 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Thu, 26 May 2011 19:17:57 +0000 Subject: [PATCH] No need for a separate buildout anymore. svn path=/plone.app.discussion/trunk/; revision=50057 --- bootstrap.py | 121 ------------------------------------------- buildout.cfg | 2 - dexterity.cfg | 8 --- hudson.cfg | 13 ----- test-plone-4.1.x.cfg | 25 --------- 5 files changed, 169 deletions(-) delete mode 100644 bootstrap.py delete mode 100644 buildout.cfg delete mode 100644 dexterity.cfg delete mode 100644 hudson.cfg delete mode 100644 test-plone-4.1.x.cfg diff --git a/bootstrap.py b/bootstrap.py deleted file mode 100644 index b964024..0000000 --- a/bootstrap.py +++ /dev/null @@ -1,121 +0,0 @@ -############################################################################## -# -# Copyright (c) 2006 Zope Corporation 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. -# -############################################################################## -"""Bootstrap a buildout-based project - -Simply run this script in a directory containing a buildout.cfg. -The script accepts buildout command-line options, so you can -use the -c option to specify an alternate configuration file. - -$Id$ -""" - -import os, shutil, sys, tempfile, urllib2 -from optparse import OptionParser - -tmpeggs = tempfile.mkdtemp() - -is_jython = sys.platform.startswith('java') - -# parsing arguments -parser = OptionParser() -parser.add_option("-v", "--version", dest="version", - help="use a specific zc.buildout version") -parser.add_option("-d", "--distribute", - action="store_true", dest="distribute", default=False, - help="Use Disribute rather than Setuptools.") - -parser.add_option("-c", None, action="store", dest="config_file", - help=("Specify the path to the buildout configuration " - "file to be used.")) - -options, args = parser.parse_args() - -# if -c was provided, we push it back into args for buildout' main function -if options.config_file is not None: - args += ['-c', options.config_file] - -if options.version is not None: - VERSION = '==%s' % options.version -else: - VERSION = '' - -USE_DISTRIBUTE = options.distribute -args = args + ['bootstrap'] - -to_reload = False -try: - import pkg_resources - if not hasattr(pkg_resources, '_distribute'): - to_reload = True - raise ImportError -except ImportError: - ez = {} - if USE_DISTRIBUTE: - exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py' - ).read() in ez - ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True) - else: - exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py' - ).read() in ez - ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) - - if to_reload: - reload(pkg_resources) - else: - import pkg_resources - -if sys.platform == 'win32': - def quote(c): - if ' ' in c: - return '"%s"' % c # work around spawn lamosity on windows - else: - return c -else: - def quote (c): - return c - -cmd = 'from setuptools.command.easy_install import main; main()' -ws = pkg_resources.working_set - -if USE_DISTRIBUTE: - requirement = 'distribute' -else: - requirement = 'setuptools' - -if is_jython: - import subprocess - - assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', - quote(tmpeggs), 'zc.buildout' + VERSION], - env=dict(os.environ, - PYTHONPATH= - ws.find(pkg_resources.Requirement.parse(requirement)).location - ), - ).wait() == 0 - -else: - assert os.spawnle( - os.P_WAIT, sys.executable, quote (sys.executable), - '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION, - dict(os.environ, - PYTHONPATH= - ws.find(pkg_resources.Requirement.parse(requirement)).location - ), - ) == 0 - -ws.add_entry(tmpeggs) -ws.require('zc.buildout' + VERSION) -import zc.buildout.buildout -zc.buildout.buildout.main(args) -shutil.rmtree(tmpeggs) diff --git a/buildout.cfg b/buildout.cfg deleted file mode 100644 index 1e43da3..0000000 --- a/buildout.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[buildout] -extends = test-plone-4.0.x.cfg diff --git a/dexterity.cfg b/dexterity.cfg deleted file mode 100644 index 4a04a09..0000000 --- a/dexterity.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[buildout] -extends = - buildout.cfg - http://good-py.appspot.com/release/dexterity/1.0-next - -[instance] -eggs += plone.app.dexterity - diff --git a/hudson.cfg b/hudson.cfg deleted file mode 100644 index cbe1565..0000000 --- a/hudson.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[buildout] -extends = - buildout.cfg - http://svn.plone.org/svn/collective/buildout/hudson/hudson.cfg - -package-name = plone.app.discussion -package-directories = . - -jstestdriver-directories = - plone/app/discussion - -browsers = - /usr/bin/firefox \ No newline at end of file diff --git a/test-plone-4.1.x.cfg b/test-plone-4.1.x.cfg deleted file mode 100644 index 8b9fb78..0000000 --- a/test-plone-4.1.x.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[buildout] -extends = - http://svn.plone.org/svn/collective/buildout/plonetest/plone-4.1.x.cfg - -package-name = plone.app.discussion -package-directory = plone/app/discussion - -parts += - omelette - test - -[instance] -eggs += - Products.PdbDebugMode - Products.PrintingMailHost - -[omelette] -recipe = collective.recipe.omelette -eggs = ${instance:eggs} -packages = ${instance:location}/lib/python ./ - -[test] -recipe = collective.xmltestreport -eggs = ${buildout:package-name} [test] -defaults = ['--auto-color', '--auto-progress']