From f1cf00a6f9ff6f0846a3226aebbb5949dcfbd189 2008-08-28 23:59:55
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-08-28 23:59:55
Subject: [PATCH] More updates for release of 0.9.rc1.

- Fix links for pyreadline.
- Fix setup.py to include new -wx script.
- Add pylab profile to win32 native installer.
- Fix manual win32 post install script (though this script may not work, and
I'm considering removing it...)

---

diff --git a/MANIFEST.in b/MANIFEST.in
index 0653c66..5ed5052 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -30,3 +30,4 @@ global-exclude *.pyc
 global-exclude .dircopy.log
 global-exclude .svn
 global-exclude .bzr
+global-exclude .hgignore
diff --git a/scripts/ipython-wx b/scripts/ipython-wx
old mode 100644
new mode 100755
diff --git a/scripts/ipython_win_post_install.py b/scripts/ipython_win_post_install.py
index ace3306..ad7dab2 100755
--- a/scripts/ipython_win_post_install.py
+++ b/scripts/ipython_win_post_install.py
@@ -38,7 +38,7 @@ def install():
         import readline
     except ImportError:
         print ('To take full advantage of IPython, you need readline from:\n'
-               'http://sourceforge.net/projects/uncpythontools')
+               'https://launchpad.net/pyreadline')
 
     ipybase = '"' + prefix + r'\scripts\ipython"'
     # Create IPython entry ...
@@ -53,11 +53,15 @@ def install():
 
     f = ip_dir + r'\pysh.lnk'
     a = ipybase+' -p sh'
-    mkshortcut(python,'IPython command prompt mode',f,a)
+    mkshortcut(python,'IPython (command prompt mode)',f,a)
+
+    f = ip_dir + r'\pylab.lnk'
+    a = ipybase+' -pylab'
+    mkshortcut(python,'IPython (PyLab mode)',f,a)
 
     f = ip_dir + r'\scipy.lnk'
     a = ipybase+' -pylab -p scipy'
-    mkshortcut(python,'IPython scipy profile',f,a)
+    mkshortcut(python,'IPython (scipy profile)',f,a)
 
     # Create documentation shortcuts ...
     t = prefix + r'\share\doc\ipython\manual\ipython.pdf'
diff --git a/setupbase.py b/setupbase.py
index 228aceb..28d8017 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -224,6 +224,7 @@ def find_scripts():
                'IPython/kernel/scripts/ipcluster',
                'scripts/ipython',
                'scripts/ipythonx',
+               'scripts/ipython-wx',
                'scripts/pycolor',
                'scripts/irunner',
                'scripts/iptest',
diff --git a/win32_manual_post_install.py b/win32_manual_post_install.py
index ce93027..ea7ad13 100755
--- a/win32_manual_post_install.py
+++ b/win32_manual_post_install.py
@@ -72,7 +72,7 @@ def run(wait=0):
     # File and directory names
     ip_dir = program_files_dir + r'\IPython'
     ip_prog_dir = programs_dir + r'\IPython'
-    doc_dir = ip_dir+r'\doc'
+    doc_dir = ip_dir+r'\docs'
     ip_filename = ip_dir+r'\IPython_shell.py'
     pycon_icon = doc_dir+r'\pycon.ico'
 
@@ -83,7 +83,7 @@ def run(wait=0):
     shutil.copy(sys.prefix+r'\Scripts\ipython',ip_filename)
     if os.path.isdir(doc_dir):
         shutil.rmtree(doc_dir)
-    shutil.copytree('doc',doc_dir)
+    shutil.copytree('docs',doc_dir)
 
     # make shortcuts for IPython, html and pdf docs.
     print 'Making entries for IPython in Start Menu...',
@@ -104,8 +104,8 @@ def run(wait=0):
         os.mkdir(ip_prog_dir)
     os.chdir(ip_prog_dir)
 
-    man_pdf = doc_dir + r'\manual\ipython.pdf'
-    man_htm = doc_dir + r'\manual\ipython.html'
+    man_pdf = doc_dir + r'\dist\ipython.pdf'
+    man_htm = doc_dir + r'\dist\index.html'
 
     make_shortcut('IPython.lnk',sys.executable, '"%s"' % ip_filename,
                   my_documents_dir,