Show More
@@ -39,12 +39,15 b' pdf: latex' | |||||
39 |
|
39 | |||
40 | all: html pdf |
|
40 | all: html pdf | |
41 |
|
41 | |||
42 | dist: all |
|
42 | # For final distribution, only build HTML (our pdf is now so large as to be | |
43 | mkdir -p dist |
|
43 | # unusable, takes forever to build and just bloats the downloads). We leave | |
44 | rm -rf dist/* |
|
44 | # them hardlinked at the top-level so users find them easily, though the | |
45 | ln build/latex/ipython.pdf dist/ |
|
45 | # original build/html dir is left in-place (useful to reload builds while | |
46 | cp -al build/html dist/ |
|
46 | # testing). | |
47 | @echo "Build finished. Final docs are in dist/" |
|
47 | dist: html | |
|
48 | rm -rf html | |||
|
49 | cp -al build/html . | |||
|
50 | @echo "Build finished. Final docs are in html/" | |||
48 |
|
51 | |||
49 | html: api |
|
52 | html: api | |
50 | mkdir -p build/html build/doctrees |
|
53 | mkdir -p build/html build/doctrees |
@@ -10,12 +10,14 b' try:' | |||||
10 | except ImportError: |
|
10 | except ImportError: | |
11 | pass |
|
11 | pass | |
12 |
|
12 | |||
|
13 | ||||
13 | def mkshortcut(target,description,link_file,*args,**kw): |
|
14 | def mkshortcut(target,description,link_file,*args,**kw): | |
14 | """make a shortcut if it doesn't exist, and register its creation""" |
|
15 | """make a shortcut if it doesn't exist, and register its creation""" | |
15 |
|
16 | |||
16 | create_shortcut(target, description, link_file,*args,**kw) |
|
17 | create_shortcut(target, description, link_file,*args,**kw) | |
17 | file_created(link_file) |
|
18 | file_created(link_file) | |
18 |
|
19 | |||
|
20 | ||||
19 | def install(): |
|
21 | def install(): | |
20 | """Routine to be run by the win32 installer with the -install switch.""" |
|
22 | """Routine to be run by the win32 installer with the -install switch.""" | |
21 |
|
23 | |||
@@ -111,11 +113,7 b' def install():' | |||||
111 | cmd = '"%s"' % cmdbase |
|
113 | cmd = '"%s"' % cmdbase | |
112 | mkshortcut(pythonw, 'IPython Qt Console', link, cmd, workdir) |
|
114 | mkshortcut(pythonw, 'IPython Qt Console', link, cmd, workdir) | |
113 | # Create documentation shortcuts ... |
|
115 | # Create documentation shortcuts ... | |
114 |
t = prefix + r'\share\doc\ipython\manual\i |
|
116 | t = prefix + r'\share\doc\ipython\manual\index.html' | |
115 | f = ip_start_menu + r'\Manual in PDF.lnk' |
|
|||
116 | mkshortcut(t,r'IPython Manual - PDF-Format',f) |
|
|||
117 |
|
||||
118 | t = prefix + r'\share\doc\ipython\manual\html\index.html' |
|
|||
119 | f = ip_start_menu + r'\Manual in HTML.lnk' |
|
117 | f = ip_start_menu + r'\Manual in HTML.lnk' | |
120 | mkshortcut(t,'IPython Manual - HTML-Format',f) |
|
118 | mkshortcut(t,'IPython Manual - HTML-Format',f) | |
121 |
|
119 | |||
@@ -124,6 +122,7 b' def remove():' | |||||
124 | """Routine to be run by the win32 installer with the -remove switch.""" |
|
122 | """Routine to be run by the win32 installer with the -remove switch.""" | |
125 | pass |
|
123 | pass | |
126 |
|
124 | |||
|
125 | ||||
127 | # main() |
|
126 | # main() | |
128 | if len(sys.argv) > 1: |
|
127 | if len(sys.argv) > 1: | |
129 | if sys.argv[1] == '-install': |
|
128 | if sys.argv[1] == '-install': |
@@ -170,10 +170,9 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):" | |||||
170 | for dirpath,dirnames,filenames in os.walk('docs/example'): |
|
170 | for dirpath,dirnames,filenames in os.walk('docs/example'): | |
171 | docdeps += [ pjoin(dirpath,f) for f in filenames |
|
171 | docdeps += [ pjoin(dirpath,f) for f in filenames | |
172 | if not f.endswith('~') ] |
|
172 | if not f.endswith('~') ] | |
173 |
# then, make them all dependencies for the main |
|
173 | # then, make them all dependencies for the main html docs | |
174 | # auto-generated as well). |
|
|||
175 | to_update.append( |
|
174 | to_update.append( | |
176 |
('docs/dist/i |
|
175 | ('docs/dist/index.html', | |
177 | docdeps, |
|
176 | docdeps, | |
178 | "cd docs && make dist") |
|
177 | "cd docs && make dist") | |
179 | ) |
|
178 | ) | |
@@ -244,7 +243,9 b" if 'setuptools' in sys.modules:" | |||||
244 | print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting." |
|
243 | print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting." | |
245 | sys.exit(1) |
|
244 | sys.exit(1) | |
246 | setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')] |
|
245 | setup_args['scripts'] = [pjoin('scripts','ipython_win_post_install.py')] | |
247 |
setup_args['options'] = {"bdist_wininst": |
|
246 | setup_args['options'] = {"bdist_wininst": | |
|
247 | {"install_script": | |||
|
248 | "ipython_win_post_install.py"}} | |||
248 | else: |
|
249 | else: | |
249 | # If we are running without setuptools, call this function which will |
|
250 | # If we are running without setuptools, call this function which will | |
250 | # check for dependencies an inform the user what is needed. This is |
|
251 | # 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