Apply Ryan Krauss patch for fixing start menu shortcuts if there are spaces in ipython installation dir name

scripts/ipython_win_post_install.py

@@ -1,84 +1,85 b''
 #!python
 """Windows-specific part of the installation"""
 
 import os, sys, shutil
 
 def mkshortcut(target,description,link_file,*args,**kw):
     """make a shortcut if it doesn't exist, and register its creation"""
     
     create_shortcut(target, description, link_file,*args,**kw)
     file_created(link_file)
 
 def install():
     """Routine to be run by the win32 installer with the -install switch."""
 
     from IPython.Release import version
 
     # Get some system constants
     prefix = sys.prefix
     python = prefix + r'\python.exe'
     # Lookup path to common startmenu ...
     ip_dir = get_special_folder_path('CSIDL_COMMON_PROGRAMS') + r'\IPython'
     
     # Some usability warnings at installation time.  I don't want them at the
     # top-level, so they don't appear if the user is uninstalling.
     try:
         import ctypes
     except ImportError:
         print ('To take full advantage of IPython, you need ctypes from:\n'
                'http://sourceforge.net/projects/ctypes')
 
     try:
         import win32con
     except ImportError:
         print ('To take full advantage of IPython, you need pywin32 from:\n'
                'http://starship.python.net/crew/mhammond/win32/Downloads.html')
 
     try:
         import readline
     except ImportError:
         print ('To take full advantage of IPython, you need readline from:\n'
                'http://sourceforge.net/projects/uncpythontools')
 
+    ipybase = '"'+prefix+r'\scripts\ipython"'
     # Create IPython entry ...
     if not os.path.isdir(ip_dir):
         os.mkdir(ip_dir)
         directory_created(ip_dir)
 
     # Create program shortcuts ...
     f = ip_dir + r'\IPython.lnk'
-    a = prefix + r'\scripts\ipython'
+    a = ipybase
     mkshortcut(python,'IPython',f,a)
 
     f = ip_dir + r'\pysh.lnk'
-    a = prefix + r'\scripts\ipython -p sh'
+    a = ipybase+' -p sh'
     mkshortcut(python,'IPython command prompt mode',f,a)
 
     f = ip_dir + r'\scipy.lnk'
-    a = prefix + r'\scripts\ipython -pylab -p scipy'
+    a = ipybase+' -pylab -p scipy'
     mkshortcut(python,'IPython scipy profile',f,a)
 
     # Create documentation shortcuts ...    
     t = prefix + r'\share\doc\ipython-%s\manual.pdf' % version
     f = ip_dir + r'\Manual in PDF.lnk'
     mkshortcut(t,r'IPython Manual - PDF-Format',f)
 
     t = prefix + r'\share\doc\ipython-%s\manual\manual.html' % version
     f = ip_dir + r'\Manual in HTML.lnk'
     mkshortcut(t,'IPython Manual - HTML-Format',f)
 
     # make ipython.py
     shutil.copy(prefix + r'\scripts\ipython', prefix + r'\scripts\ipython.py')
     
 def remove():
     """Routine to be run by the win32 installer with the -remove switch."""
     pass
 
 # main()
 if len(sys.argv) > 1:
     if sys.argv[1] == '-install':
         install()
     elif sys.argv[1] == '-remove':
         remove()
     else:
         print "Script was called with option %s" % sys.argv[1]

tools/mkrel.py

@@ -1,29 +1,31 b''
 """ Create ipykit and exe installer
 
 requires py2exe
 
 """
 #!/bin/sh
 # IPython release script
 
 
 import os
 import distutils.dir_util
 def c(cmd):
     print ">",cmd
     os.system(cmd)
 
 os.chdir('..')
+if os.path.isdir('dist'):
 distutils.dir_util.remove_tree('dist')
+if os.path.isdir('ipykit'):
 distutils.dir_util.remove_tree('ipykit')
 
 c("python exesetup.py py2exe")
 os.rename('dist','ipykit')
 
 c("zip -r ipykit.zip ipykit")
 
 c("python setup.py bdist_wininst --install-script=ipython_win_post_install.py")
 
 os.chdir("dist")
 c("svn export http://ipython.scipy.org/svn/ipython/ipython/trunk ipython")
 c("zip -r ipython_svn.zip ipython")