##// END OF EJS Templates
Fixing a few bugs to get the win32 installer working again.
Brian Granger -
Show More
@@ -4,6 +4,7 b' include setupegg.py'
4
4
5 graft setupext
5 graft setupext
6
6
7 graft scripts
7 graft IPython/kernel
8 graft IPython/kernel
8 graft IPython/config
9 graft IPython/config
9 graft IPython/core
10 graft IPython/core
@@ -13,7 +13,7 b' def mkshortcut(target,description,link_file,*args,**kw):'
13 def install():
13 def install():
14 """Routine to be run by the win32 installer with the -install switch."""
14 """Routine to be run by the win32 installer with the -install switch."""
15
15
16 from IPython.Release import version
16 from IPython.core.release import version
17
17
18 # Get some system constants
18 # Get some system constants
19 prefix = sys.prefix
19 prefix = sys.prefix
@@ -256,7 +256,7 b' def find_scripts():'
256 if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
256 if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
257 print >> sys.stderr,"ERROR: bdist_wininst must be run alone. Exiting."
257 print >> sys.stderr,"ERROR: bdist_wininst must be run alone. Exiting."
258 sys.exit(1)
258 sys.exit(1)
259 scripts.append(pjoin(main_scripts,'ipython_win_post_install.py'))
259 scripts.append(pjoin('scripts','ipython_win_post_install.py'))
260
260
261 return scripts
261 return scripts
262
262
@@ -15,9 +15,9 b' ver = verinfo()'
15
15
16 pprint.pprint(ver)
16 pprint.pprint(ver)
17
17
18 rfile = open('../IPython/Release.py','rb').read()
18 rfile = open('../IPython/core/release.py','rb').read()
19 newcont = re.sub(r'revision\s*=.*', "revision = '%s'" % ver['revno'], rfile)
19 newcont = re.sub(r'revision\s*=.*', "revision = '%s'" % ver['revno'], rfile)
20
20
21 newcont = re.sub(r'^branch\s*=[^=].*', "branch = '%s'" % ver['branch-nick'], newcont )
21 newcont = re.sub(r'^branch\s*=[^=].*', "branch = '%s'" % ver['branch-nick'], newcont )
22
22
23 open('../IPython/Release.py','wb').write(newcont)
23 open('../IPython/core/release.py','wb').write(newcont)
General Comments 0
You need to be logged in to leave comments. Login now