Merging -r 1193 from lp:ipython.

setupegg.py

@@ -1,14 +1,12 b''
 #!/usr/bin/env python
 """Wrapper to run setup.py using setuptools."""
 
 import sys
 
 # now, import setuptools and call the actual setup
 import setuptools
-# print sys.argv
-#sys.argv=['','bdist_egg']
 execfile('setup.py')
 
 # clean up the junk left around by setuptools
 if "develop" not in sys.argv:
     os.system('rm -rf ipython.egg-info build')

tools/mkrel.py

@@ -1,42 +1,42 b''
 #!/usr/bin/env python
 """IPython release build script.
 """
 from toollib import *
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
 ipdir = get_ipdir()
 cd(ipdir)
 
 # Load release info
 execfile(pjoin('IPython','core','release.py'))
 
 # Check that everything compiles
 compile_tree()
 
 # Cleanup
 for d in ['build','dist',pjoin('docs','build'),pjoin('docs','dist')]:
     if os.path.isdir(d):
         remove_tree(d)
 
 # Build source and binary distros
 c('./setup.py sdist --formats=gztar')
 
 # Build version-specific RPMs, where we must use the --python option to ensure
 # that the resulting RPM is really built with the requested python version (so
 # things go to lib/python2.X/...)
 c("python2.5 ./setup.py bdist_rpm --binary-only --release=py25 "
   "--python=/usr/bin/python2.5")
 c("python2.6 ./setup.py bdist_rpm --binary-only --release=py26 "
   "--python=/usr/bin/python2.6")
 
 # Build eggs
-c('python2.5 ./eggsetup.py bdist_egg')
-c('python2.6 ./eggsetup.py bdist_egg')
+c('python2.5 ./setupegg.py bdist_egg')
+c('python2.6 ./setupegg.py bdist_egg')
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
 c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
 
 # Change name so retarded Vista runs the installer correctly
 c("rename 's/win32/win32-setup/' dist/*.exe")

tools/toollib.py

@@ -1,55 +1,55 b''
 """Various utilities common to IPython release and maintenance tools.
 """
 # Library imports
 import os
 import sys
 
 from distutils.dir_util import remove_tree
 
 # Useful shorthands
 pjoin = os.path.join
 cd = os.chdir
 
 # Utility functions
 def c(cmd):
     """Run system command, raise SystemExit if it returns an error."""
     print "$",cmd
-    #stat = os.system(cmd)
-    stat = 0  # Uncomment this and comment previous to run in debug mode
+    stat = os.system(cmd)
+    #stat = 0  # Uncomment this and comment previous to run in debug mode
     if stat:
         raise SystemExit("Command %s failed with code: %s" % (cmd, stat))
 
 
 def get_ipdir():
     """Get IPython directory from command line, or assume it's the one above."""
 
     # Initialize arguments and check location
     try:
         ipdir = sys.argv[1]
     except IndexError:
         ipdir = '..'
 
     ipdir = os.path.abspath(ipdir)
 
     cd(ipdir)
     if not os.path.isdir('IPython') and os.path.isfile('setup.py'):
         raise SystemExit('Invalid ipython directory: %s' % ipdir)
     return ipdir
 
 
 def compile_tree():
     """Compile all Python files below current directory."""
     vstr = '.'.join(map(str,sys.version_info[:2]))
     stat = os.system('python %s/lib/python%s/compileall.py .' %
                      (sys.prefix,vstr))
     if stat:
         msg = '*** ERROR: Some Python files in tree do NOT compile! ***\n'
         msg += 'See messages above for the actual file that produced it.\n'
         raise SystemExit(msg)
 
 
 def version_info():
     """Return bzr version info as a dict."""
     out = os.popen('bzr version-info')
     pairs = (l.split(':',1) for l in out)
     return dict(((k,v.strip()) for (k,v) in pairs))