##// END OF EJS Templates
Windows install fixes...
Christoph Gohlke -
Show More
@@ -1,131 +1,134 b''
1 1 #!python
2 2 """Windows-specific part of the installation"""
3 3
4 4 import os, sys, shutil
5 5 pjoin = os.path.join
6 6
7 7 # import setuptools if we can
8 8 try:
9 9 import setuptools
10 10 except ImportError:
11 11 pass
12 12
13 13 def mkshortcut(target,description,link_file,*args,**kw):
14 14 """make a shortcut if it doesn't exist, and register its creation"""
15 15
16 16 create_shortcut(target, description, link_file,*args,**kw)
17 17 file_created(link_file)
18 18
19 19 def install():
20 20 """Routine to be run by the win32 installer with the -install switch."""
21 21
22 22 from IPython.core.release import version
23 23
24 24 # Get some system constants
25 25 prefix = sys.prefix
26 26 python = pjoin(prefix, 'python.exe')
27 27 pythonw = pjoin(prefix, 'pythonw.exe')
28 28 have_setuptools = 'setuptools' in sys.modules
29 29
30 30 if not have_setuptools:
31 31 # This currently doesn't work without setuptools,
32 32 # so don't bother making broken links
33 33 return
34 34
35 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 40 # Create IPython entry ...
38 41 if not os.path.isdir(ip_start_menu):
39 42 os.mkdir(ip_start_menu)
40 43 directory_created(ip_start_menu)
41 44
42 45 # Create .py and .bat files to make things available from
43 46 # the Windows command line. Thanks to the Twisted project
44 47 # for this logic!
45 48 programs = [
46 49 'ipython',
47 50 'iptest',
48 51 'ipcontroller',
49 52 'ipengine',
50 53 'ipcluster',
51 54 'irunner'
52 55 ]
53 56 scripts = pjoin(prefix,'scripts')
54 57 if not have_setuptools:
55 58 # only create .bat files if we don't have setuptools
56 59 for program in programs:
57 60 raw = pjoin(scripts, program)
58 61 bat = raw + '.bat'
59 62 py = raw + '.py'
60 63 # Create .py versions of the scripts
61 64 shutil.copy(raw, py)
62 65 # Create .bat files for each of the scripts
63 66 bat_file = file(bat,'w')
64 67 bat_file.write("@%s %s %%*" % (python, py))
65 68 bat_file.close()
66 69
67 70 # Now move onto setting the Start Menu up
68 71 ipybase = pjoin(scripts, 'ipython')
69 72 if have_setuptools:
70 73 # let setuptools take care of the scripts:
71 74 ipybase = ipybase + '-script.py'
72 75 workdir = "%HOMEDRIVE%%HOMEPATH%"
73 76
74 77 link = pjoin(ip_start_menu, 'IPython.lnk')
75 78 cmd = '"%s"' % ipybase
76 79 mkshortcut(python, 'IPython', link, cmd, workdir)
77 80
78 81 # Disable pysh Start item until the profile restores functionality
79 82 # Most of this code is in IPython/deathrow, and needs to be updated
80 83 # to 0.11 APIs
81 84
82 85 # link = pjoin(ip_start_menu, 'pysh.lnk')
83 86 # cmd = '"%s" profile=pysh --init' % ipybase
84 87 # mkshortcut(python, 'IPython (command prompt mode)', link, cmd, workdir)
85 88
86 89 link = pjoin(ip_start_menu, 'pylab.lnk')
87 90 cmd = '"%s" profile=pylab --init' % ipybase
88 91 mkshortcut(python, 'IPython (pylab profile)', link, cmd, workdir)
89 92
90 93 link = pjoin(ip_start_menu, 'ipcontroller.lnk')
91 94 cmdbase = pjoin(scripts, 'ipcontroller')
92 95 if have_setuptools:
93 96 cmdbase += '-script.py'
94 97 cmd = '"%s"' % cmdbase
95 98 mkshortcut(python, 'IPython controller', link, cmd, workdir)
96 99
97 100 link = pjoin(ip_start_menu, 'ipengine.lnk')
98 101 cmdbase = pjoin(scripts, 'ipengine')
99 102 if have_setuptools:
100 103 cmdbase += '-script.py'
101 104 cmd = '"%s"' % cmdbase
102 105 mkshortcut(python, 'IPython engine', link, cmd, workdir)
103 106
104 107 link = pjoin(ip_start_menu, 'ipythonqt.lnk')
105 108 cmdbase = pjoin(scripts, 'ipython-qtconsole')
106 109 if have_setuptools:
107 110 cmdbase += '-script.pyw'
108 111 cmd = '"%s"' % cmdbase
109 112 mkshortcut(pythonw, 'IPython Qt Console', link, cmd, workdir)
110 113 # Create documentation shortcuts ...
111 114 t = prefix + r'\share\doc\ipython\manual\ipython.pdf'
112 115 f = ip_start_menu + r'\Manual in PDF.lnk'
113 116 mkshortcut(t,r'IPython Manual - PDF-Format',f)
114 117
115 118 t = prefix + r'\share\doc\ipython\manual\html\index.html'
116 119 f = ip_start_menu + r'\Manual in HTML.lnk'
117 120 mkshortcut(t,'IPython Manual - HTML-Format',f)
118 121
119 122
120 123 def remove():
121 124 """Routine to be run by the win32 installer with the -remove switch."""
122 125 pass
123 126
124 127 # main()
125 128 if len(sys.argv) > 1:
126 129 if sys.argv[1] == '-install':
127 130 install()
128 131 elif sys.argv[1] == '-remove':
129 132 remove()
130 133 else:
131 134 print "Script was called with option %s" % sys.argv[1]
@@ -1,269 +1,272 b''
1 1 #!/usr/bin/env python
2 2 # -*- coding: utf-8 -*-
3 3 """Setup script for IPython.
4 4
5 5 Under Posix environments it works like a typical setup.py script.
6 6 Under Windows, the command sdist is not supported, since IPython
7 7 requires utilities which are not available under Windows."""
8 8
9 9 #-----------------------------------------------------------------------------
10 10 # Copyright (c) 2008-2010, IPython Development Team.
11 11 # Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu>
12 12 # Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
13 13 # Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
14 14 #
15 15 # Distributed under the terms of the Modified BSD License.
16 16 #
17 17 # The full license is in the file COPYING.txt, distributed with this software.
18 18 #-----------------------------------------------------------------------------
19 19
20 20 #-----------------------------------------------------------------------------
21 21 # Minimal Python version sanity check
22 22 #-----------------------------------------------------------------------------
23 23
24 24 import sys
25 25
26 26 # This check is also made in IPython/__init__, don't forget to update both when
27 27 # changing Python version requirements.
28 28 if sys.version[0:3] < '2.6':
29 29 error = """\
30 30 ERROR: 'IPython requires Python Version 2.6 or above.'
31 31 Exiting."""
32 32 print >> sys.stderr, error
33 33 sys.exit(1)
34 34
35 35 # At least we're on the python version we need, move on.
36 36
37 37 #-------------------------------------------------------------------------------
38 38 # Imports
39 39 #-------------------------------------------------------------------------------
40 40
41 41 # Stdlib imports
42 42 import os
43 43 import shutil
44 44
45 45 from glob import glob
46 46
47 47 # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
48 48 # update it when the contents of directories change.
49 49 if os.path.exists('MANIFEST'): os.remove('MANIFEST')
50 50
51 51 from distutils.core import setup
52 52
53 53 # Our own imports
54 54 from IPython.utils.path import target_update
55 55
56 56 from setupbase import (
57 57 setup_args,
58 58 find_packages,
59 59 find_package_data,
60 60 find_scripts,
61 61 find_data_files,
62 62 check_for_dependencies,
63 63 record_commit_info,
64 64 )
65 65 from setupext import setupext
66 66
67 67 isfile = os.path.isfile
68 68 pjoin = os.path.join
69 69
70 70 #-----------------------------------------------------------------------------
71 71 # Function definitions
72 72 #-----------------------------------------------------------------------------
73 73
74 74 def cleanup():
75 75 """Clean up the junk left around by the build process"""
76 76 if "develop" not in sys.argv:
77 77 try:
78 78 shutil.rmtree('ipython.egg-info')
79 79 except:
80 80 try:
81 81 os.unlink('ipython.egg-info')
82 82 except:
83 83 pass
84 84
85 85 #-------------------------------------------------------------------------------
86 86 # Handle OS specific things
87 87 #-------------------------------------------------------------------------------
88 88
89 89 if os.name == 'posix':
90 90 os_name = 'posix'
91 91 elif os.name in ['nt','dos']:
92 92 os_name = 'windows'
93 93 else:
94 94 print 'Unsupported operating system:',os.name
95 95 sys.exit(1)
96 96
97 97 # Under Windows, 'sdist' has not been supported. Now that the docs build with
98 98 # Sphinx it might work, but let's not turn it on until someone confirms that it
99 99 # actually works.
100 100 if os_name == 'windows' and 'sdist' in sys.argv:
101 101 print 'The sdist command is not available under Windows. Exiting.'
102 102 sys.exit(1)
103 103
104 104 #-------------------------------------------------------------------------------
105 105 # Things related to the IPython documentation
106 106 #-------------------------------------------------------------------------------
107 107
108 108 # update the manuals when building a source dist
109 109 if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
110 110 import textwrap
111 111
112 112 # List of things to be updated. Each entry is a triplet of args for
113 113 # target_update()
114 114 to_update = [
115 115 # FIXME - Disabled for now: we need to redo an automatic way
116 116 # of generating the magic info inside the rst.
117 117 #('docs/magic.tex',
118 118 #['IPython/Magic.py'],
119 119 #"cd doc && ./update_magic.sh" ),
120 120
121 121 ('docs/man/ipcluster.1.gz',
122 122 ['docs/man/ipcluster.1'],
123 123 'cd docs/man && gzip -9c ipcluster.1 > ipcluster.1.gz'),
124 124
125 125 ('docs/man/ipcontroller.1.gz',
126 126 ['docs/man/ipcontroller.1'],
127 127 'cd docs/man && gzip -9c ipcontroller.1 > ipcontroller.1.gz'),
128 128
129 129 ('docs/man/ipengine.1.gz',
130 130 ['docs/man/ipengine.1'],
131 131 'cd docs/man && gzip -9c ipengine.1 > ipengine.1.gz'),
132 132
133 133 ('docs/man/ipython.1.gz',
134 134 ['docs/man/ipython.1'],
135 135 'cd docs/man && gzip -9c ipython.1 > ipython.1.gz'),
136 136
137 137 ('docs/man/ipython-wx.1.gz',
138 138 ['docs/man/ipython-wx.1'],
139 139 'cd docs/man && gzip -9c ipython-wx.1 > ipython-wx.1.gz'),
140 140
141 141 ('docs/man/ipythonx.1.gz',
142 142 ['docs/man/ipythonx.1'],
143 143 'cd docs/man && gzip -9c ipythonx.1 > ipythonx.1.gz'),
144 144
145 145 ('docs/man/irunner.1.gz',
146 146 ['docs/man/irunner.1'],
147 147 'cd docs/man && gzip -9c irunner.1 > irunner.1.gz'),
148 148
149 149 ('docs/man/pycolor.1.gz',
150 150 ['docs/man/pycolor.1'],
151 151 'cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz'),
152 152 ]
153 153
154 154 # Only build the docs if sphinx is present
155 155 try:
156 156 import sphinx
157 157 except ImportError:
158 158 pass
159 159 else:
160 160 # The Makefile calls the do_sphinx scripts to build html and pdf, so
161 161 # just one target is enough to cover all manual generation
162 162
163 163 # First, compute all the dependencies that can force us to rebuild the
164 164 # docs. Start with the main release file that contains metadata
165 165 docdeps = ['IPython/core/release.py']
166 166 # Inculde all the reST sources
167 167 pjoin = os.path.join
168 168 for dirpath,dirnames,filenames in os.walk('docs/source'):
169 169 if dirpath in ['_static','_templates']:
170 170 continue
171 171 docdeps += [ pjoin(dirpath,f) for f in filenames
172 172 if f.endswith('.txt') ]
173 173 # and the examples
174 174 for dirpath,dirnames,filenames in os.walk('docs/example'):
175 175 docdeps += [ pjoin(dirpath,f) for f in filenames
176 176 if not f.endswith('~') ]
177 177 # then, make them all dependencies for the main PDF (the html will get
178 178 # auto-generated as well).
179 179 to_update.append(
180 180 ('docs/dist/ipython.pdf',
181 181 docdeps,
182 182 "cd docs && make dist")
183 183 )
184 184
185 185 [ target_update(*t) for t in to_update ]
186 186
187 187 #---------------------------------------------------------------------------
188 188 # Find all the packages, package data, and data_files
189 189 #---------------------------------------------------------------------------
190 190
191 191 packages = find_packages()
192 192 package_data = find_package_data()
193 193 data_files = find_data_files()
194 194
195 195 #---------------------------------------------------------------------------
196 196 # Handle scripts, dependencies, and setuptools specific things
197 197 #---------------------------------------------------------------------------
198 198
199 199 # For some commands, use setuptools. Note that we do NOT list install here!
200 200 # If you want a setuptools-enhanced install, just run 'setupegg.py install'
201 201 needs_setuptools = set(('develop', 'sdist', 'release', 'bdist_egg', 'bdist_rpm',
202 202 'bdist', 'bdist_dumb', 'bdist_wininst', 'install_egg_info',
203 203 'build_sphinx', 'egg_info', 'easy_install', 'upload',
204 204 ))
205 205 if sys.platform == 'win32':
206 206 # Depend on setuptools for install on *Windows only*
207 207 # If we get script-installation working without setuptools,
208 208 # then we can back off, but until then use it.
209 209 # See Issue #369 on GitHub for more
210 210 needs_setuptools.add('install')
211 211
212 212 if len(needs_setuptools.intersection(sys.argv)) > 0:
213 213 import setuptools
214 214
215 215 # This dict is used for passing extra arguments that are setuptools
216 216 # specific to setup
217 217 setuptools_extra_args = {}
218 218
219 219 if 'setuptools' in sys.modules:
220 220 setuptools_extra_args['zip_safe'] = False
221 221 setuptools_extra_args['entry_points'] = find_scripts(True)
222 222 setup_args['extras_require'] = dict(
223 223 parallel = 'pyzmq>=2.1.4',
224 224 zmq = 'pyzmq>=2.1.4',
225 225 doc='Sphinx>=0.3',
226 226 test='nose>=0.10.1',
227 227 )
228 228 requires = setup_args.setdefault('install_requires', [])
229 229 setupext.display_status = False
230 230 if not setupext.check_for_readline():
231 231 if sys.platform == 'darwin':
232 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 236 requires.append('pyreadline')
235 237 else:
236 238 pass
237 239 # do we want to install readline here?
238 240
239 241 # Script to be run by the windows binary installer after the default setup
240 242 # routine, to add shortcuts and similar windows-only things. Windows
241 243 # post-install scripts MUST reside in the scripts/ dir, otherwise distutils
242 244 # doesn't find them.
243 245 if 'bdist_wininst' in sys.argv:
244 246 if len(sys.argv) > 2 and \
245 247 ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
246 248 print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
247 249 sys.exit(1)
248 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 252 else:
250 253 # If we are running without setuptools, call this function which will
251 254 # check for dependencies an inform the user what is needed. This is
252 255 # just to make life easy for users.
253 256 check_for_dependencies()
254 257 setup_args['scripts'] = find_scripts(False)
255 258
256 259 #---------------------------------------------------------------------------
257 260 # Do the actual setup now
258 261 #---------------------------------------------------------------------------
259 262
260 263 setup_args['cmdclass'] = {'build_py': record_commit_info('IPython')}
261 264 setup_args['packages'] = packages
262 265 setup_args['package_data'] = package_data
263 266 setup_args['data_files'] = data_files
264 267 setup_args.update(setuptools_extra_args)
265 268
266 269
267 270 if __name__ == '__main__':
268 271 setup(**setup_args)
269 272 cleanup()
General Comments 0
You need to be logged in to leave comments. Login now