OTHER: Handle resources from data subdir in a cleaner way

data/promoe.desktop

@@ -5,7 +5,7 @@ Name=Promoe
 GenericName=XMMS2 Client
 Categories=Qt;Application;AudioVideo;Audio;
 Exec=promoe
-Icon=xmms2
+Icon=promoe
 Terminal=false
 Type=Application
 

data/wscript

@@ -38,10 +38,10 @@ def set_options(opt):
 def configure(conf):
     pass
 def build(bld):
-    obj              = bld.new_task_gen('qt4', 'staticlib', 'cxx')
+    obj              = bld.new_task_gen('qt4', 'cxx')
     obj.target       = 'promoe_data'
     obj.install_path = 0 # Don't install
-    obj.source       = 'Almond-blue.qrc'
+    obj.source       = 'skins/Almond-blue.qrc'
     obj.uselib       = 'QTCORE'
     pass
 

lib/wscript

@@ -49,7 +49,7 @@ def set_options(opt):
 def configure(conf):
     pass
 def build(bld):
-    obj                 = bld.new_task_gen('qt4', 'staticlib', 'cxx')
+    obj                 = bld.new_task_gen('qt4', 'cstaticlib', 'cxx')
     obj.target          = 'promoe_lib'
     obj.install_path    = 0 # Don't install
     obj.includes        = '.'

src/wscript

@@ -91,16 +91,15 @@ def build(bld):
     if bld.env['HAVE_SERVERBROWSER']:
         sources.append('ServerBrowser.cpp')
 
-    sources.append("../data/Almond-blue.qrc")
-
     incdirs = bld_subdirs
     incdirs.append('.')
 
-    obj              = bld.new_task_gen('qt4', 'program', 'cxx')
+    obj              = bld.new_task_gen('qt4', 'cprogram', 'cxx')
     obj.target       = 'promoe'
     obj.includes     = incdirs
     obj.source       = sources
     obj.uselib_local = 'promoe_lib'
+    obj.add_objects  = 'promoe_data'
     obj.uselib       = 'QTCORE QTGUI AVAHI-CLIENT AVAHI-QT4'
     pass
 

wscript

@@ -46,6 +46,7 @@ def set_options(opt):
     opt.tool_options('qt4')
 
     opt.sub_options('lib')
+    opt.sub_options('data')
     opt.sub_options('src')
 
 
@@ -65,7 +66,7 @@ def configure(conf):
                 os.path.join(conf.env['PROMOE_DATADIR'], 'Skins'))
 
     conf.sub_config('lib')
-#    conf.sub_config('data')
+    conf.sub_config('data')
     conf.sub_config('src')
 
     conf.write_config_header('promoe_config.h')
@@ -75,9 +76,10 @@ def configure(conf):
 
 def build(bld):
     bld.add_subdirs('lib')
-#    bld.add_subdirs('data')
+    bld.add_subdirs('data')
     bld.add_subdirs('src')
 
-    bld.install_files('${MANDIR}/man1', 'promoe.1')
-    bld.install_files('${DATADIR}/applications', 'promoe.desktop')
+    bld.install_files('${MANDIR}/man1', 'data/promoe.1')
+    bld.install_files('${DATADIR}/applications', 'data/promoe.desktop')
+    bld.install_files('${DATADIR}/icons', 'data/icons/ashton-flame1/promoe.svg')