##// END OF EJS Templates
Fixes to build system.
Fernando Perez -
Show More
@@ -1,6 +1,7 b''
1 include README_Windows.txt
1 include README_Windows.txt
2 include win32_manual_post_install.py
2 include win32_manual_post_install.py
3 include ipython.py
3 include ipython.py
4 include setupbase.py
4
5
5 graft scripts
6 graft scripts
6
7
@@ -75,17 +75,17 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
75 to_update = [
75 to_update = [
76 # FIXME - Disabled for now: we need to redo an automatic way
76 # FIXME - Disabled for now: we need to redo an automatic way
77 # of generating the magic info inside the rst.
77 # of generating the magic info inside the rst.
78 #('doc/magic.tex',
78 #('docs/magic.tex',
79 #['IPython/Magic.py'],
79 #['IPython/Magic.py'],
80 #"cd doc && ./update_magic.sh" ),
80 #"cd doc && ./update_magic.sh" ),
81
81
82 ('doc/ipython.1.gz',
82 ('docs/man/ipython.1.gz',
83 ['doc/ipython.1'],
83 ['docs/man/ipython.1'],
84 "cd doc && gzip -9c ipython.1 > ipython.1.gz"),
84 "cd docs/man && gzip -9c ipython.1 > ipython.1.gz"),
85
85
86 ('doc/pycolor.1.gz',
86 ('docs/man/pycolor.1.gz',
87 ['doc/pycolor.1'],
87 ['docs/man/pycolor.1'],
88 "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
88 "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"),
89 ]
89 ]
90
90
91 # Only build the docs is sphinx is present
91 # Only build the docs is sphinx is present
@@ -101,8 +101,8 b" if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):"
101 # The do_sphinx scripts builds html and pdf, so just one
101 # The do_sphinx scripts builds html and pdf, so just one
102 # target is enough to cover all manual generation
102 # target is enough to cover all manual generation
103 # to_update.append(
103 # to_update.append(
104 # ('doc/manual/ipython.pdf',
104 # ('docs/manual/ipython.pdf',
105 # ['IPython/Release.py','doc/source/ipython.rst'],
105 # ['IPython/Release.py','docs/source/ipython.rst'],
106 # "cd docs && python do_sphinx.py")
106 # "cd docs && python do_sphinx.py")
107 # )
107 # )
108 [ target_update(*t) for t in to_update ]
108 [ target_update(*t) for t in to_update ]
@@ -158,8 +158,10 b' def find_data_files():'
158 exclude = ('.sh','.1.gz')
158 exclude = ('.sh','.1.gz')
159 # We need to figure out how we want to package all of our rst docs?
159 # We need to figure out how we want to package all of our rst docs?
160 # docfiles = filter(lambda f:file_doesnt_endwith(f,exclude),glob('docs/*'))
160 # docfiles = filter(lambda f:file_doesnt_endwith(f,exclude),glob('docs/*'))
161 # XXX - For now all the example files
161 examfiles = filter(isfile, glob('docs/examples/core/*.py'))
162 examfiles = filter(isfile, glob('docs/examples/core/*.py'))
162 examfiles.append(filter(isfile, glob('docs/examples/kernel/*.py')))
163 examfiles += filter(isfile, glob('docs/examples/kernel/*.py'))
164
163 manpages = filter(isfile, glob('docs/man/*.1.gz'))
165 manpages = filter(isfile, glob('docs/man/*.1.gz'))
164 igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
166 igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
165
167
@@ -168,9 +170,14 b' def find_data_files():'
168 ('data', manpagebase, manpages),
170 ('data', manpagebase, manpages),
169 ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
171 ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
170 ]
172 ]
171 # import pprint
173
172 # pprint.pprint(data_files)
174 ## import pprint # dbg
173 return []
175 ## print '*'*80
176 ## print 'data files'
177 ## pprint.pprint(data_files)
178 ## print '*'*80
179
180 return data_files
174
181
175 #---------------------------------------------------------------------------
182 #---------------------------------------------------------------------------
176 # Find scripts
183 # Find scripts
General Comments 0
You need to be logged in to leave comments. Login now