Moved support-files in a package to get rid of the package_data hack and reliably distribute them

17 files changed, 10 insertions, 12 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 678696e..38f2c08 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,2 @@
 recursive-include docs *.txt
-recursive-include support-files *.egg
+recursive-include virtualenv_support *.egg
diff --git a/bin/rebuild-script.py b/bin/rebuild-script.py
index 6ff7cc0..3ed31ef 100644
--- a/bin/rebuild-script.py
+++ b/bin/rebuild-script.py
@@ -1,5 +1,5 @@
 """
-Helper script to rebuild virtualenv.py from support-files
+Helper script to rebuild virtualenv.py from virtualenv_support
 """
 
 import re
@@ -28,7 +28,7 @@ def rebuild():
         varname = match.group(2)
         data = match.group(3)
         print 'Found reference to file %s' % filename
-        f = open(os.path.join(here, '..', 'support-files', filename), 'rb')
+        f = open(os.path.join(here, '..', 'virtualenv_support', filename), 'rb')
         c = f.read()
         f.close()
         new_data = c.encode('zlib').encode('base64')
diff --git a/bin/refresh-support-files.py b/bin/refresh-support-files.py
index aa141cd..f842ccd 100644
--- a/bin/refresh-support-files.py
+++ b/bin/refresh-support-files.py
@@ -1,5 +1,5 @@
 """
-Refresh any files in support-files/ that come from elsewhere
+Refresh any files in ../virtualenv_support/ that come from elsewhere
 """
 
 import os
@@ -7,7 +7,7 @@ import urllib
 import sys
 
 here = os.path.dirname(__file__)
-support_files = os.path.join(here, '..', 'support-files')
+support_files = os.path.join(here, '..', 'virtualenv_support')
 
 files = [
     ('http://peak.telecommunity.com/dist/ez_setup.py', 'ez_setup.py'),
diff --git a/setup.py b/setup.py
index 8f7b7de..a3bb202 100644
--- a/setup.py
+++ b/setup.py
@@ -26,10 +26,8 @@ setup(name='virtualenv',
       url='http://pypi.python.org/pypi/virtualenv',
       license='MIT',
       py_modules=['virtualenv'],
-      ## Hacks to get the package data installed:
-      packages=[''],
-      package_dir={'': '.'},
-      package_data={'': ['support-files/*-py%s.egg' % sys.version[:3]]},
+      packages=['virtualenv_support'],
+      package_data={'virtualenv_support': ['*-py%s.egg' % sys.version[:3]]},
       zip_safe=False,
       entry_points="""
       [console_scripts]
diff --git a/virtualenv.py b/virtualenv.py
index 47cdf31..686864f 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -244,8 +244,8 @@ def make_exe(fn):
         logger.info('Changed mode of %s to %s', fn, oct(newmode))
 
 def install_setuptools(py_executable, unzip=False):
-    setup_fn = 'setuptools-0.6c9-py%s.egg' % sys.version[:3]
-    search_dirs = ['.', os.path.dirname(__file__), join(os.path.dirname(__file__), 'support-files')]
+    setup_fn = 'setuptools-0.6c11-py%s.egg' % sys.version[:3]
+    search_dirs = ['.', os.path.dirname(__file__), join(os.path.dirname(__file__), 'virtualenv_support')]
     if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
         # Probably some boot script; just in case virtualenv is installed...
         try:
@@ -253,7 +253,7 @@ def install_setuptools(py_executable, unzip=False):
         except ImportError:
             pass
         else:
-            search_dirs.append(os.path.join(os.path.dirname(virtualenv.__file__), 'support-files'))
+            search_dirs.append(os.path.join(os.path.dirname(virtualenv.__file__), 'virtualenv_support'))
     for dir in search_dirs:
         if os.path.exists(join(dir, setup_fn)):
             setup_fn = join(dir, setup_fn)
diff --git a/virtualenv_support/__init__.py b/virtualenv_support/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/virtualenv_support/__init__.py
diff --git a/support-files/activate.bat b/virtualenv_support/activate.bat
index 87cda1d..87cda1d 100644
--- a/support-files/activate.bat
+++ b/virtualenv_support/activate.bat
diff --git a/support-files/activate.sh b/virtualenv_support/activate.sh
index 323be7d..323be7d 100644
--- a/support-files/activate.sh
+++ b/virtualenv_support/activate.sh
diff --git a/support-files/activate_this.py b/virtualenv_support/activate_this.py
index b7aafe3..b7aafe3 100644
--- a/support-files/activate_this.py
+++ b/virtualenv_support/activate_this.py
diff --git a/support-files/deactivate.bat b/virtualenv_support/deactivate.bat
index 671c9bf..671c9bf 100644
--- a/support-files/deactivate.bat
+++ b/virtualenv_support/deactivate.bat
diff --git a/support-files/distutils-init.py b/virtualenv_support/distutils-init.py
index ed1205a..ed1205a 100644
--- a/support-files/distutils-init.py
+++ b/virtualenv_support/distutils-init.py
diff --git a/support-files/distutils.cfg b/virtualenv_support/distutils.cfg
index 1af230e..1af230e 100644
--- a/support-files/distutils.cfg
+++ b/virtualenv_support/distutils.cfg
diff --git a/support-files/ez_setup.py b/virtualenv_support/ez_setup.py
index 1ff1d3e..1ff1d3e 100644
--- a/support-files/ez_setup.py
+++ b/virtualenv_support/ez_setup.py
diff --git a/support-files/setuptools-0.6c11-py2.4.egg b/virtualenv_support/setuptools-0.6c11-py2.4.egg
index b2c1592..b2c1592 100644
--- a/support-files/setuptools-0.6c11-py2.4.egg
+++ b/virtualenv_support/setuptools-0.6c11-py2.4.egg
diff --git a/support-files/setuptools-0.6c11-py2.5.egg b/virtualenv_support/setuptools-0.6c11-py2.5.egg
index b004539..b004539 100644
--- a/support-files/setuptools-0.6c11-py2.5.egg
+++ b/virtualenv_support/setuptools-0.6c11-py2.5.egg
diff --git a/support-files/setuptools-0.6c11-py2.6.egg b/virtualenv_support/setuptools-0.6c11-py2.6.egg
index 3c72d15..3c72d15 100644
--- a/support-files/setuptools-0.6c11-py2.6.egg
+++ b/virtualenv_support/setuptools-0.6c11-py2.6.egg
diff --git a/support-files/site.py b/virtualenv_support/site.py
index e700acc..e700acc 100644
--- a/support-files/site.py
+++ b/virtualenv_support/site.py