From 7321b392714f009499cf2422a8e1ad7875abf61b 2010-09-28 23:11:20
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2010-09-28 23:11:20
Subject: [PATCH] Rename entry point for Qt console to ipython-qtconsole.

This was the name we came up with on-list; also put all entry points
in IPython/scripts/ as discussed.

---

diff --git a/IPython/frontend/terminal/scripts/__init__.py b/IPython/frontend/terminal/scripts/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/IPython/frontend/terminal/scripts/__init__.py
+++ /dev/null
diff --git a/IPython/frontend/terminal/scripts/ipython b/IPython/frontend/terminal/scripts/ipython
deleted file mode 100755
index 5a3546b..0000000
--- a/IPython/frontend/terminal/scripts/ipython
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from IPython.frontend.terminal.ipapp import launch_new_instance
-
-launch_new_instance()
diff --git a/IPython/frontend/qt/console/scripts/ipythonqt b/IPython/scripts/ipython-qtconsole
similarity index 100%
rename from IPython/frontend/qt/console/scripts/ipythonqt
rename to IPython/scripts/ipython-qtconsole
diff --git a/setupbase.py b/setupbase.py
index 1b98795..666ecea 100644
--- a/setupbase.py
+++ b/setupbase.py
@@ -110,8 +110,8 @@ def find_packages():
     add_package(packages, 'external')
     add_package(packages, 'frontend')
     add_package(packages, 'frontend.qt')
-    add_package(packages, 'frontend.qt.console', tests=True, scripts=True)
-    add_package(packages, 'frontend.terminal', tests=True, scripts=True)    
+    add_package(packages, 'frontend.qt.console', tests=True)
+    add_package(packages, 'frontend.terminal', tests=True)    
     add_package(packages, 'kernel', config=False, tests=True, scripts=True)
     add_package(packages, 'kernel.core', config=False, tests=True)
     add_package(packages, 'lib', tests=True)
@@ -256,13 +256,11 @@ def find_scripts():
     """
     kernel_scripts = pjoin('IPython','kernel','scripts')
     main_scripts = pjoin('IPython','scripts')
-    frontend_terminal_scripts = pjoin('IPython','frontend','terminal','scripts')
-    frontend_qt_scripts = pjoin('IPython','frontend','qt','console','scripts')
     scripts = [pjoin(kernel_scripts, 'ipengine'),
                pjoin(kernel_scripts, 'ipcontroller'),
                pjoin(kernel_scripts, 'ipcluster'),
-               pjoin(frontend_terminal_scripts, 'ipython'),
-               pjoin(frontend_qt_scripts, 'ipythonqt'),
+               pjoin(main_scripts, 'ipython'),
+               pjoin(main_scripts, 'ipython-qtconsole'),
                pjoin(main_scripts, 'pycolor'),
                pjoin(main_scripts, 'irunner'),
                pjoin(main_scripts, 'iptest')