##// END OF EJS Templates
Windows install fixes...
Christoph Gohlke -
Show More
@@ -33,7 +33,10 b' def install():'
33 return
33 return
34
34
35 # Lookup path to common startmenu ...
35 # Lookup path to common startmenu ...
36 ip_start_menu = pjoin(get_special_folder_path('CSIDL_COMMON_PROGRAMS'), 'IPython')
36 ip_start_menu = pjoin(get_special_folder_path('CSIDL_COMMON_PROGRAMS'),
37 'IPython (Py%i.%i %i bit)' % (sys.version_info[0],
38 sys.version_info[1],
39 8*tuple.__itemsize__))
37 # Create IPython entry ...
40 # Create IPython entry ...
38 if not os.path.isdir(ip_start_menu):
41 if not os.path.isdir(ip_start_menu):
39 os.mkdir(ip_start_menu)
42 os.mkdir(ip_start_menu)
@@ -230,7 +230,9 b" if 'setuptools' in sys.modules:"
230 if not setupext.check_for_readline():
230 if not setupext.check_for_readline():
231 if sys.platform == 'darwin':
231 if sys.platform == 'darwin':
232 requires.append('readline')
232 requires.append('readline')
233 elif sys.platform.startswith('win'):
233 elif sys.platform.startswith('win') and sys.maxsize < 2**32:
234 # only require pyreadline on 32b Windows, due to 64b bug in pyreadline:
235 # https://bugs.launchpad.net/pyreadline/+bug/787574
234 requires.append('pyreadline')
236 requires.append('pyreadline')
235 else:
237 else:
236 pass
238 pass
@@ -246,6 +248,7 b" if 'setuptools' in sys.modules:"
246 print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
248 print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
247 sys.exit(1)
249 sys.exit(1)
248 setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]
250 setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')]
251 setup_args['options'] = {"bdist_wininst": {"install_script": "ipython_win_post_install.py"}}
249 else:
252 else:
250 # If we are running without setuptools, call this function which will
253 # If we are running without setuptools, call this function which will
251 # check for dependencies an inform the user what is needed. This is
254 # check for dependencies an inform the user what is needed. This is
General Comments 0
You need to be logged in to leave comments. Login now