[Xfce4-commits] <midori:master> Only install extension data files if extensions are built

Christian Dywan noreply at xfce.org
Wed Nov 4 14:38:02 CET 2009


Updating branch refs/heads/master
         to 3a491840f5358037adf705db7ac43ae3ffebcfd4 (commit)
       from 643b59eeb20850bbb7bf8d5810057be55f8cb3f1 (commit)

commit 3a491840f5358037adf705db7ac43ae3ffebcfd4
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Nov 3 23:40:53 2009 +0100

    Only install extension data files if extensions are built

 wscript |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/wscript b/wscript
index 1d380a8..e686b13 100644
--- a/wscript
+++ b/wscript
@@ -455,22 +455,25 @@ def build (bld):
             bld.install_files ('${MDATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png')
         else:
             Utils.pprint ('BLUE', "logo-shade could not be rasterized.")
+
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/error.html')
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html')
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial.json')
     bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/mootools.js')
-    bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
-    bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
-
-    # FIXME: Determine the library naming for other platforms
-    if Options.platform == 'linux':
-        extensions = os.listdir ('data/extensions')
-        for extension in extensions:
-            folder = 'lib' + extension + '.so'
-            source = 'data/extensions/' + extension +  '/config'
-            if os.path.exists (source):
-                bld.install_files ('${SYSCONFDIR}/' + APPNAME + \
-                                   '/extensions/' + folder, source)
+
+    if bld.env['addons']:
+        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.js')
+        bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
+
+        # FIXME: Determine the library naming for other platforms
+        if Options.platform == 'linux':
+            extensions = os.listdir ('data/extensions')
+            for extension in extensions:
+                folder = 'lib' + extension + '.so'
+                source = 'data/extensions/' + extension +  '/config'
+                if os.path.exists (source):
+                    bld.install_files ('${SYSCONFDIR}/' + APPNAME + \
+                                       '/extensions/' + folder, source)
 
     if Options.commands['check']:
         bld.add_subdirs ('tests')



More information about the Xfce4-commits mailing list