Remove unneeded files

diff --git a/.gitignore b/.gitignore
index d5b1946..f4a2208 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 /.installed.cfg
 /localeggs.cfg
 /server.cfg
+/bootstrap.py
 
 *~
 #*#

diff --git a/Makefile.master b/Makefile.master
index 1a49b3d..2088dab 100644 (file)
--- a/Makefile.master
+++ b/Makefile.master
@@ -83,7 +83,9 @@ versions:
 
 bootstrap: 
        sed -i -e '1s/^#!.*\/python/#!$(subst /,\/,$(PYTHON))/' $(PYTHON_DIR)/bin/*
-       $(PYTHON) bootstrap.py
+#       $(PYTHON) bootstrap.py
+       $(PYTHON) -c 'from zc.buildout.buildout import main; main(["bootstrap"])'
+
 
 .gitignore:
        @echo "python/" >.gitignore
@@ -95,7 +97,9 @@ bootstrap:
        @echo "fake-eggs/" >>.gitignore
        @echo "parts/" >>.gitignore
        @echo "/.installed.cfg" >>.gitignore
+       @echo "/bootstrap.py" >>.gitignore
        @echo "*.pyc" >>.gitignore
+       @echo "*.egg-info/" >>.gitignore
 
 shell:
        @PATH=$(BASEDIR)/$(PYTHON_DIR)/bin:$(BASEDIR)/bin:$$PATH $$SHELL

diff --git a/bootstrap.py b/bootstrap.py
deleted file mode 100644 (file)
index ad6fdc6..0000000
--- a/bootstrap.py
+++ /dev/null
@@ -1,62 +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: bootstrap.py 85041 2008-03-31 15:57:30Z andreasjung $
-"""
-
-import os, shutil, sys, tempfile, urllib2
-
-tmpeggs = tempfile.mkdtemp()
-
-try:
-    import pkg_resources
-except ImportError:
-    ez = {}
-    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                         ).read() in ez
-    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
-    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
-assert os.spawnle(
-    os.P_WAIT, sys.executable, quote (sys.executable),
-    '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
-    dict(os.environ,
-         PYTHONPATH=
-         ws.find(pkg_resources.Requirement.parse('setuptools')).location
-         ),
-    ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
-import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)

diff --git a/versions.cfg b/versions.cfg
deleted file mode 100644 (file)
index e69de29..0000000