Towards a working distutils setup

4 files changed, 24 insertions, 13 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index f0aefc6..4c9f5ef 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include AUTHORS TODO
-recursive-include pulsecaster/
+recursive-include pulsecaster *.png *.svg *.glade
+
diff --git a/pulsecaster/pulsecaster b/pulsecaster/pulsecaster
index 9ec286e..5964cbc 100644
--- a/pulsecaster/pulsecaster
+++ b/pulsecaster/pulsecaster
@@ -22,5 +22,5 @@
 from pulsecaster import ui
 import gtk
 
-pk = ui.PulseCasterUi()
+pk = ui.PulseCasterUI()
 gtk.main()
diff --git a/pulsecaster/ui.py b/pulsecaster/ui.py
index 6e49f80..fc5431e 100644
--- a/pulsecaster/ui.py
+++ b/pulsecaster/ui.py
@@ -25,13 +25,14 @@ from pulseaudio.PulseObj import PulseObj
 from listener import *
 import gtk
 import os
+import sys
+import glob
 import gobject
 import pygst
 pygst.require('0.10')
 import gst
 
-# FIXME
-fname = os.getcwd() + '/data/pulsecaster.glade'
+#fname = os.getcwd() + '/data/pulsecaster.glade'
 _debug = True
 
 def _debugPrint(text):
@@ -41,9 +42,19 @@ def _debugPrint(text):
 class PulseCasterUI:
     def __init__(self):
         self.builder = gtk.Builder()
-        self.builder.add_from_file(fname)
+        try:
+            self.builder.add_from_file(os.path.join(os.getcwd(),'data','pulsecaster.glade')
+)
+            _debugPrint("loading glade file from current subdir")
+        except:
+            try:
+                self.builder.add_from_file(os.path.join(sys.prefix,'share','pulsecaster','pulsecaster.glade'))
+            except Exception,e:
+                print(e)
+                raise SystemExit("Cannot load resources")
+
         self.icontheme = gtk.icon_theme_get_default()
-        self.icontheme.append_search_path(os.path.join('/usr/share', NAME))
+        
         # Convenience for developers
         self.icontheme.append_search_path(os.path.join(os.getcwd(),
                                                        'data/icons/scalable'))
diff --git a/setup.py b/setup.py
index ab46a01..2ae652f 100644
--- a/setup.py
+++ b/setup.py
@@ -30,14 +30,13 @@ setup(
     keywords = KEYWORDS,
     url = URL,
 
-    install_requires = ['gtk>=2.14',
-                        'dbus>=0.83'],
-    # Also requires pulseaudio-libs >= 0.9.15
-    scripts = ['pulsecaster'],
+    scripts = ['pulsecaster/pulsecaster'],
     include_package_data = True,
-    package_data = {
-        'pulsecaster': ['data/pulsecaster.glade'],
-        },
+    data_files = [
+        ('share/pulsecaster/',["pulsecaster/data/pulsecaster.glade"]),
+        ('share/pulsecaster/icons/scalable/',['pulsecaster/data/icons/scalable/pulsecaster.svg','pulsecaster/data/icons/scalable/pulsecaster-logo.svg']),
+        ],
+    
     #message_extractors = {
     #    'pulsecaster': [('**.py', 'python', None),
     #                    ('**.glade', '', None),