Permalink
Browse files

fix windows post-installation routines with setuptools installed

  • Loading branch information...
1 parent fd5c092 commit 221e31c535b5b33a082e846b543411789c86c87a @ddale ddale committed Nov 2, 2010
Showing with 4 additions and 3 deletions.
  1. +3 −0 scripts/ipython_win_post_install.py
  2. +0 −2 setup.py
  3. +1 −1 setupbase.py
@@ -51,6 +51,9 @@ def install():
# Now move onto setting the Start Menu up
ipybase = pjoin(scripts, 'ipython')
+ if 'setuptools' in sys.modules:
+ # let setuptools take care of the scripts:
+ ipybase = ipybase + '-script.py'
workdir = "%HOMEDRIVE%%HOMEPATH%"
link = pjoin(ip_start_menu, 'IPython.lnk')
View
@@ -232,8 +232,6 @@ def cleanup():
test='nose>=0.10.1',
security='pyOpenSSL>=0.6'
)
- # Allow setuptools to handle the scripts
- scripts = []
else:
# If we are running without setuptools, call this function which will
# check for dependencies an inform the user what is needed. This is
View
@@ -278,7 +278,7 @@ def find_scripts():
file=sys.stderr)
sys.exit(1)
scripts.append(pjoin('scripts','ipython_win_post_install.py'))
-
+
return scripts
#---------------------------------------------------------------------------

0 comments on commit 221e31c

Please sign in to comment.