Put windows build cmds in a reusable location so we can upload .exes to PyPI.

tools/build_release

@@ -1,49 +1,39 b''
 #!/usr/bin/env python
 """IPython release build script.
 """
 
 import os
 
 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'),
           pjoin('docs', 'source', 'api', 'generated')]:
     if os.path.isdir(d):
         remove_tree(d)
 
 # Build source and binary distros
 sh('./setup.py sdist --formats=gztar,zip')
 
 # Build eggs
 sh('python ./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).  Note that the install scripts args are added to the main
-# distutils call in setup.py, so they don't need to be passed here.
-sh("python setup.py bdist_wininst")
-
-# The Windows 64-bit installer can't be built by a Linux/Mac Python because ofa
-# bug in distutils:  http://bugs.python.org/issue6792.
-# So we have to build it with a wine-installed native Windows Python...
-sh("%s/.wine/dosdevices/c\:/Python27/python.exe setup.py build "
-   "--plat-name=win-amd64 bdist_wininst "
-   "--install-script=ipython_win_post_install.py" % os.environ['HOME'])
+# Run windows builds
+map(sh, win_builds)
 
 # Change name so retarded Vista runs the installer correctly
 sh("rename 's/linux-i686/win32/' dist/*.exe")
 sh("rename 's/linux-x86_64/win32/' dist/*.exe")
 sh("rename 's/amd64/amd64-setup/' dist/*.exe")
 # exe files aren't really executable under *nix.
 sh("chmod -x dist/*.exe")

tools/release

@@ -1,64 +1,66 b''
 #!/usr/bin/env python
 """IPython release script.
 
 This should ONLY be run at real release time.
 """
 from __future__ import print_function
 
 from toollib import *
 
 # Get main ipython dir, this will raise if it doesn't pass some checks
 ipdir = get_ipdir()
 tooldir = pjoin(ipdir, 'tools')
 distdir = pjoin(ipdir, 'dist')
 
 # Where I keep static backups of each release
 ipbackupdir = os.path.expanduser('~/ipython/backup')
 
 # Start in main IPython dir
 cd(ipdir)
 
 # Load release info
 execfile(pjoin('IPython','core','release.py'))
 
 # Build site addresses for file uploads
 release_site = '%s/release/%s' % (archive, version)
 backup_site =  '%s/backup/' % archive
 
 # Start actual release process
 print()
 print('Releasing IPython')
 print('=================')
 print()
 print('Version:', version)
 print()
 print('Source IPython directory:', ipdir)
 print()
 
 # Perform local backup, go to tools dir to run it.
 cd(tooldir)
 sh('./make_tarball.py')
 sh('mv ipython-*.tgz %s' % ipbackupdir)
 
 # Build release files
 sh('./build_release %s' % ipdir)
 
 # Register with the Python Package Index (PyPI)
 print( 'Registering with PyPI...')
 cd(ipdir)
 sh('./setup.py register')
 
 # Upload all files
 sh('./setup.py sdist --formats=gztar,zip upload')
+for wb in win_builds:
+    sh(wb + ' upload')
 cd(distdir)
 print( 'Uploading distribution files...')
 
 # Make target dir if it doesn't exist
 sh('ssh %s "mkdir -p %s/release/%s" ' % (archive_user, archive_dir, version))
 sh('scp * %s' % release_site)
 
 print( 'Uploading backup files...')
 cd(ipbackupdir)
 sh('scp `ls -1tr *tgz | tail -1` %s' % backup_site)
 
 print('Done!')

tools/toollib.py

@@ -1,57 +1,72 b''
 """Various utilities common to IPython release and maintenance tools.
 """
 from __future__ import print_function
 
 # Library imports
 import os
 import sys
 
 from distutils.dir_util import remove_tree
 
 # Useful shorthands
 pjoin = os.path.join
 cd = os.chdir
 
 # Constants
 
 # SSH root address of the archive site
 archive_user = '[e-mail]'
 archive_dir = 'archive.ipython.org'
 archive = '%s:%s' % (archive_user, archive_dir)
 
+# Commands for Windows builds.
+# We do them separately, so that the extra Windows scripts don't get pulled
+# into Unix builds (setup.py has code which checks for bdist_wininst).  Note
+# that the install scripts args are added to the main distutils call in
+# setup.py, so they don't need to be passed here.
+#
+# The Windows 64-bit installer can't be built by a Linux/Mac Python because ofa
+# bug in distutils:  http://bugs.python.org/issue6792.
+# So we have to build it with a wine-installed native Windows Python...
+win_builds = ["python setup.py bdist_wininst",
+              r"%s/.wine/dosdevices/c\:/Python27/python.exe setup.py build "
+              "--plat-name=win-amd64 bdist_wininst "
+              "--install-script=ipython_win_post_install.py" %
+              os.environ['HOME'] ]
+
 # Utility functions
 def sh(cmd):
     """Run system command in shell, 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
     if stat:
         raise SystemExit("Command %s failed with code: %s" % (cmd, stat))
 
 # Backwards compatibility
 c = sh
 
 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."""
     stat = os.system('python -m compileall .')
     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)