Merge lp:~kalikiana/midori/foldermess into lp:midori

[Cris Dywan]

 Split config files and install from folders recursively

Install behavior essentially unchanged - except new files are picked up from 'config' and 'data' in the source without a change to the build.
.desktop files, faq.* and midori.* remain special-cased to avoid unnecessary bugs
This fixes nojs file installation.
(It should take care of tabby as well, though wrt the freeze that's not a concern)
I dropped data/com.nokia.midori.service - it's been unused for a while, and we can avoid a special-case for it

[Paweł Forysiuk (tuxator)]

review: Approve

=== added directory 'config'
=== renamed directory 'data/extensions' => 'config/extensions'
=== renamed file 'data/search' => 'config/search'
=== removed file 'data/com.nokia.midori.service'
--- data/com.nokia.midori.service	2009-01-27 01:57:40 +0000
+++ data/com.nokia.midori.service	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.midori
-Exec=/usr/bin/midori

=== modified file 'wscript'
--- wscript	2013-07-30 21:00:46 +0000
+++ wscript	2013-08-04 23:40:37 +0000
@@ -466,9 +466,6 @@
         bld.install_files ('${DOCDIR}/', \
             'AUTHORS COPYING ChangeLog EXPAT README data/faq.html data/faq.css')
 
-    # Install default configuration
-    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')
-
     if bld.env['INTLTOOL']:
         obj = bld.new_task_gen ('intltool_po')
         obj.podir = 'po'
@@ -478,9 +475,12 @@
         bld.add_subdirs ('docs/api')
         bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*')
 
-    for desktop in [APPNAME + '.desktop', APPNAME + '-private.desktop']:
+    for res_file in os.listdir ('data'):
         if is_win32 (bld.env):
             break
+        if not '.desktop' in res_file:
+            continue
+        desktop = res_file[:-3]
         appdir = '${MDATADIR}/applications'
         if bld.env['INTLTOOL']:
             obj = bld.new_task_gen ('intltool_in')
@@ -519,20 +519,26 @@
         else:
             Utils.pprint ('BLUE', "logo-shade could not be rasterized.")
 
-    for res_file in ['about.css', 'error.html', 'close.png', 'gtk3.css', 'speeddial-head.html']:
-        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/' + res_file)
-
-    if bld.env['addons']:
-        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
-        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
-
-        if 1:
-            extensions = os.listdir ('data/extensions')
-            for extension in extensions:
-                source = 'data/extensions/' + extension +  '/config'
-                if os.path.exists (source):
-                    bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \
-                                       '/extensions/' + extension, source)
+    for res_file in os.listdir ('data'):
+        if '.desktop' in res_file or 'faq.' in res_file or 'midori.' in res_file:
+            continue
+        dest = '${MDATADIR}/' + APPNAME + '/res'
+        if (os.path.isdir ('data/' + res_file)):
+            dest += '/' + res_file
+            res_file += '/*'
+        bld.install_files (dest, 'data/' + res_file)
+
+    for config_file in os.listdir ('config'):
+        dest = '${SYSCONFDIR}/xdg/' + APPNAME
+        if (os.path.isdir ('config/' + config_file)):
+            dest += '/' + config_file
+            for child in os.listdir ('config/' + config_file):
+                if (os.path.isdir ('config/' + config_file + '/' + child)):
+                    dest += '/' + child
+                    child += '/*'
+                bld.install_files (dest, 'config/' + config_file + '/' + child)
+            continue
+        bld.install_files (dest, 'config/' + config_file)
 
     if Options.commands['check'] or bld.env['tests']:
         bld.add_subdirs ('tests')