From: zooko <zooko@zooko.com>
Date: Tue, 23 Jun 2009 04:55:10 +0000 (+0530)
Subject: setup: upgrade the bundled copy of zetuptoolz from 0.6c10dev to 0.6c12dev and increas... 
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/bcase/nxhtml.html?a=commitdiff_plain;h=4ed66afa85329b702a6b17cf2a723bbb709ff501;p=tahoe-lafs%2Fzfec.git

setup: upgrade the bundled copy of zetuptoolz from 0.6c10dev to 0.6c12dev and increase the minimum required version of setuptools from 0.6c9 to 0.6c12dev to see if it fixes the problem with overlapping dependencies on pyutil on Black Dew's windows buildbot.

Ignore-this: cfc87deaed56e340e9c93bc357e2b1e1

darcs-hash:7ce2e86292da564a8de9f506be98a8393293058f
---

diff --git a/zfec/ez_setup.py b/zfec/ez_setup.py
index 612df1e..f09fd0f 100755
--- a/zfec/ez_setup.py
+++ b/zfec/ez_setup.py
@@ -14,12 +14,12 @@ the appropriate options to ``use_setuptools()``.
 This file can also be run as a script to install or upgrade setuptools.
 """
 import os, sys
-DEFAULT_VERSION = "0.6c10dev"
+DEFAULT_VERSION = "0.6c12dev"
 DEFAULT_DIR     = "misc/dependencies/"
 DEFAULT_URL     = "file:"+DEFAULT_DIR
 
 md5_data = {
-    'setuptools-0.6c10dev.egg': 'caa2735c28de4361dbfbdbf1a1bbc87a',
+    'setuptools-0.6c12dev.egg': '770da1c9e5446cf04273f0f1cdb8c09a',
 }
 
 import sys, os
@@ -39,7 +39,7 @@ def _validate_md5(egg_name, data):
 
 def use_setuptools(
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
-    min_version="0.6c10dev", download_delay=15
+    min_version="0.6c12dev", download_delay=15
 ):
     """Automatically find/download setuptools and make it available on sys.path
 
diff --git a/zfec/misc/dependencies/setuptools-0.6c10dev.egg b/zfec/misc/dependencies/setuptools-0.6c10dev.egg
deleted file mode 100644
index 748e5eb..0000000
Binary files a/zfec/misc/dependencies/setuptools-0.6c10dev.egg and /dev/null differ
diff --git a/zfec/misc/dependencies/setuptools-0.6c12dev.egg b/zfec/misc/dependencies/setuptools-0.6c12dev.egg
new file mode 100644
index 0000000..a46cabd
Binary files /dev/null and b/zfec/misc/dependencies/setuptools-0.6c12dev.egg differ
diff --git a/zfec/setup.py b/zfec/setup.py
index 2fb9a4b..cda9ed0 100755
--- a/zfec/setup.py
+++ b/zfec/setup.py
@@ -23,7 +23,13 @@ else:
     # key set in sys.modules but the actual code (and the temporary directory
     # in the filesystem in which the code used to reside) gone, when it needed
     # pyutil again later.
-    use_setuptools(min_version='0.6c9', download_delay=0, to_dir=miscdeps)
+    # On cygwin there was a conflict with swig with setuptools 0.6c7:
+    #   File "/home/Buildslave/windows-cygwin-pycryptopp/windows-cygwin/build/misc/dependencies/setuptools-0.6c7.egg/setuptools/command/build_ext.py", line 77, in swig_sources
+    # TypeError: swig_sources() takes exactly 3 arguments (2 given)
+    # This invokes our own customized version of ez_setup.py to make sure
+    # that setuptools v0.6c12dev (which is our own toothpick of setuptools)
+    # is used to build.
+    use_setuptools(download_delay=0, min_version="0.6c12dev")
 
 from setuptools import Extension, find_packages, setup