##// END OF EJS Templates
fix windows post-installation routines with setuptools installed
Darren Dale -
Show More
@@ -51,6 +51,9 b' def install():'
51
51
52 # Now move onto setting the Start Menu up
52 # Now move onto setting the Start Menu up
53 ipybase = pjoin(scripts, 'ipython')
53 ipybase = pjoin(scripts, 'ipython')
54 if 'setuptools' in sys.modules:
55 # let setuptools take care of the scripts:
56 ipybase = ipybase + '-script.py'
54 workdir = "%HOMEDRIVE%%HOMEPATH%"
57 workdir = "%HOMEDRIVE%%HOMEPATH%"
55
58
56 link = pjoin(ip_start_menu, 'IPython.lnk')
59 link = pjoin(ip_start_menu, 'IPython.lnk')
@@ -232,8 +232,6 b" if 'setuptools' in sys.modules:"
232 test='nose>=0.10.1',
232 test='nose>=0.10.1',
233 security='pyOpenSSL>=0.6'
233 security='pyOpenSSL>=0.6'
234 )
234 )
235 # Allow setuptools to handle the scripts
236 scripts = []
237 else:
235 else:
238 # If we are running without setuptools, call this function which will
236 # If we are running without setuptools, call this function which will
239 # check for dependencies an inform the user what is needed. This is
237 # check for dependencies an inform the user what is needed. This is
@@ -278,7 +278,7 b' def find_scripts():'
278 file=sys.stderr)
278 file=sys.stderr)
279 sys.exit(1)
279 sys.exit(1)
280 scripts.append(pjoin('scripts','ipython_win_post_install.py'))
280 scripts.append(pjoin('scripts','ipython_win_post_install.py'))
281
281
282 return scripts
282 return scripts
283
283
284 #---------------------------------------------------------------------------
284 #---------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now