From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Thu, 10 Jan 2008 02:02:53 +0000 (-0700)
Subject: tweaks to build process to support py2exe
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=25859082967f46502d48b76e46e9099f1b6af90a;p=tahoe-lafs%2Ftahoe-lafs.git

tweaks to build process to support py2exe

py2exe is unable to handle .eggs which are packaged as zip files
in preference it will pull in other versions of libraries if they
can be found in the environment.

this changes causes .eggs to be built as .egg directories, which
py2exe can handle.
---

diff --git a/Makefile b/Makefile
index 5bf40467..438d006c 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,7 @@ build-auto-deps: check-deps
 	echo PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" $(PYTHON) misc/dependencies/build-deps-setup.py install --prefix="$(SUPPORT)"
 	@-PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
          $(PYTHON) misc/dependencies/build-deps-setup.py install \
-	 --prefix="$(SUPPORT)" || \
-	echo "Build of Tahoe's bundled, automatically built dependent libraries failed -- please see docs/install.html for instructions."
+	 --prefix="$(SUPPORT)"
 
 # The following target is here because I don't know how to tell the buildmaster
 # to start instructing his slaves to "build-auto-deps" instead of instructing
diff --git a/misc/dependencies/build-deps-setup.py b/misc/dependencies/build-deps-setup.py
deleted file mode 100644
index cd09b025..00000000
--- a/misc/dependencies/build-deps-setup.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /usr/bin/env python
-
-# N.B.: this expects to run from the top of the source tree
-
-import sys, os
-
-miscdeps=os.path.join('misc', 'dependencies')
-
-try:
-    from ez_setup import use_setuptools
-except ImportError:
-    pass
-else:
-    if 'cygwin' in sys.platform.lower():
-        min_version='0.6c6'
-    else:
-        # foolscap uses a module-level os.urandom() during import, which
-        # breaks inside older setuptools' sandboxing. 0.6c4 is the first
-        # version which fixed this problem.
-        min_version='0.6c4'
-    download_base = "file:"+os.path.join('misc', 'dependencies')+os.path.sep
-    use_setuptools(min_version=min_version,
-                   download_base=download_base,
-                   download_delay=0, to_dir=miscdeps)
-
-from setuptools import setup
-
-from calcdeps import install_requires, dependency_links
-
-setup(name='tahoe-deps',
-      version="1",
-      install_requires=install_requires,
-      dependency_links=dependency_links,
-      zip_safe=False
-      )
diff --git a/misc/dependencies/setup.py b/misc/dependencies/setup.py
new file mode 100644
index 00000000..cd09b025
--- /dev/null
+++ b/misc/dependencies/setup.py
@@ -0,0 +1,35 @@
+#! /usr/bin/env python
+
+# N.B.: this expects to run from the top of the source tree
+
+import sys, os
+
+miscdeps=os.path.join('misc', 'dependencies')
+
+try:
+    from ez_setup import use_setuptools
+except ImportError:
+    pass
+else:
+    if 'cygwin' in sys.platform.lower():
+        min_version='0.6c6'
+    else:
+        # foolscap uses a module-level os.urandom() during import, which
+        # breaks inside older setuptools' sandboxing. 0.6c4 is the first
+        # version which fixed this problem.
+        min_version='0.6c4'
+    download_base = "file:"+os.path.join('misc', 'dependencies')+os.path.sep
+    use_setuptools(min_version=min_version,
+                   download_base=download_base,
+                   download_delay=0, to_dir=miscdeps)
+
+from setuptools import setup
+
+from calcdeps import install_requires, dependency_links
+
+setup(name='tahoe-deps',
+      version="1",
+      install_requires=install_requires,
+      dependency_links=dependency_links,
+      zip_safe=False
+      )