From 9544ab83fa358711f5af3fc4c39d83147c84fb80 2009-07-02 22:59:26
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 22:59:26
Subject: [PATCH] Fixing a few bugs to get the win32 installer working again.

---

diff --git a/MANIFEST.in b/MANIFEST.in
index 4c6c3bd..90e8d95 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include setupegg.py
 
 graft setupext
 
+graft scripts
 graft IPython/kernel
 graft IPython/config
 graft IPython/core
diff --git a/IPython/scripts/ipython_win_post_install.py b/scripts/ipython_win_post_install.py
similarity index 98%
rename from IPython/scripts/ipython_win_post_install.py
rename to scripts/ipython_win_post_install.py
index fb1c2bc..fd11784 100755
--- a/IPython/scripts/ipython_win_post_install.py
+++ b/scripts/ipython_win_post_install.py
@@ -13,7 +13,7 @@ def mkshortcut(target,description,link_file,*args,**kw):
 def install():
     """Routine to be run by the win32 installer with the -install switch."""
     
-    from IPython.Release import version
+    from IPython.core.release import version
     
     # Get some system constants
     prefix = sys.prefix
diff --git a/setupbase.py b/setupbase.py
index 73c3dc3..0d3d394 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -256,7 +256,7 @@ def find_scripts():
         if len(sys.argv) > 2 and ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
             print >> sys.stderr,"ERROR: bdist_wininst must be run alone. Exiting."
             sys.exit(1)
-        scripts.append(pjoin(main_scripts,'ipython_win_post_install.py'))
+        scripts.append(pjoin('scripts','ipython_win_post_install.py'))
     
     return scripts
 
diff --git a/tools/update_revnum.py b/tools/update_revnum.py
index f97b933..1b6454c 100755
--- a/tools/update_revnum.py
+++ b/tools/update_revnum.py
@@ -15,9 +15,9 @@ ver = verinfo()
 
 pprint.pprint(ver)
 
-rfile = open('../IPython/Release.py','rb').read()
+rfile = open('../IPython/core/release.py','rb').read()
 newcont = re.sub(r'revision\s*=.*', "revision = '%s'" % ver['revno'], rfile)
 
 newcont = re.sub(r'^branch\s*=[^=].*', "branch = '%s'"  % ver['branch-nick'], newcont )
 
-open('../IPython/Release.py','wb').write(newcont)
+open('../IPython/core/release.py','wb').write(newcont)