[Python-checkins] distutils2: Fix setup.py to use the newly renamed distutils2.pypi, distutils2.create and

[alexis.metaireau]

http://hg.python.org/distutils2/rev/c06028b3d601
changeset:   1121:c06028b3d601
user:        Alexis Metaireau <alexis at notmyidea.org>
date:        Mon Aug 22 20:53:26 2011 +0200
summary:
  Fix setup.py to use the newly renamed distutils2.pypi, distutils2.create and put the pysetup script in scripts.

files:
  scripts/pysetup |  4 ++++
  setup.py        |  6 +++---
  2 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/scripts/pysetup b/scripts/pysetup
new file mode 100644
--- /dev/null
+++ b/scripts/pysetup
@@ -0,0 +1,4 @@
+#! /usr/bin/env python
+import sys
+from distutils2.run import main
+sys.exit(main())
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -201,10 +201,10 @@
 
     return exts
 
-setup_kwargs = {'scripts': ['distutils2/pysetup']}
+setup_kwargs = {'scripts': ['scripts/pysetup']}
 
 if sys.version < '2.6':
-    setup_kwargs['scripts'].append('distutils2/mkcfg.py')
+    setup_kwargs['scripts'].append('distutils2/create.py')
 
 if sys.version < '2.5':
     setup_kwargs['ext_modules'] = prepare_hashlib_extensions()
@@ -236,7 +236,7 @@
           'distutils2.compiler', 
           'distutils2.command', 
           'distutils2._backport', 
-          'distutils2.index', 
+          'distutils2.pypi', 
           'distutils2.tests.fixer', 
           'distutils2._backport.tests',
       ],

-- 
Repository URL: http://hg.python.org/distutils2