Fix reading of logo.

ikanobori · ikanobori · commit 645e9785dbb3 · 2009-12-29T21:14:55.000+01:00
Add logo to package data.
Create entry point for bpython-gtk

--HG--
branch : GTK-prettify
rename : data/logo.png =&gt; bpython/logo.png
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -30,6 +30,7 @@
 from __future__ import with_statement
 import inspect
 import sys
+import os
 from locale import LC_ALL, getpreferredencoding, setlocale
 
 import gobject
@@ -639,7 +640,8 @@ def main(args=None):
     # branding
 
     # fix icon to be distributed and loaded from the correct path
-    icon = gtk.gdk.pixbuf_new_from_file('/home/simon/src/bpython/data/logo.png')
+    icon = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__),
+                                                     'logo.png'))
 
     window.set_title('bpython')
     window.set_icon(icon)
diff --git a/bpython/logo.png b/bpython/logo.png
diff --git a/data/bpython-gtk b/data/bpython-gtk
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import sys
+from bpython.gtk_ import main
+
+sys.exit(main())
diff --git a/setup.py b/setup.py
@@ -46,12 +46,15 @@
         (os.path.join(man_dir, 'man5'), ['doc/bpython-config.5']),
         ('share/applications', ['data/bpython.desktop'])
     ],
+    package_data = {'bpython': ['logo.png']},
     entry_points = {
         'console_scripts': [
             'bpython = bpython.cli:main',
+            'bpython-gtk = bpython.gtk_:main',
         ],
     },
-    scripts = ([] if using_setuptools else ['data/bpython']),
+    scripts = ([] if using_setuptools else ['data/bpython', 
+                                            'data/bpython-gtk']),
     cmdclass=dict(build_py=build_py)
 )
 
