Adapt extension and test build scripts, test files are picked up dynamically now

diff --git a/extensions/wscript_build b/extensions/wscript_build
index aa93727ac6d7d1a9b11cad55f5a6804091c49327..8ce7027f894981cb5019a6cd8fa35b2ec4d0c347 100644 (file)
--- a/extensions/wscript_build
+++ b/extensions/wscript_build
@@ -4,25 +4,26 @@
 
 extensions = os.listdir ('extensions')
 for extension in extensions:
-    try:
-        folder = 'extensions' + os.sep + extension
+    folder = 'extensions' + os.sep + extension
+    if os.path.isdir (folder):
         files = os.listdir (folder)
         target = extension
         source = ''
         for fila in files:
             if fila[-2:] == '.c':
                 source += ' ' + extension + os.sep + fila
-        includes = '.' + os.sep + '..'
-    except:
+        if not source:
+            Utils.pprint ('RED', folder + ': No source files found')
+            continue
+    else:
         if extension[-2:] != '.c':
             continue
         target = extension[:-2]
         source = extension
-        includes = '..'
 
     obj = bld.new_task_gen ('cc', 'shlib')
     obj.target = target
-    obj.includes = includes
+    obj.includes = '..'
     obj.source = source
     obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
     obj.uselib_local = 'katze'

diff --git a/tests/wscript_build b/tests/wscript_build
index 1a9ebc814b13b2b7791b82035a6670d88868c918..e167569bea93fb9e2b6baeb50490efcf29f0997e 100644 (file)
--- a/tests/wscript_build
+++ b/tests/wscript_build
@@ -2,10 +2,29 @@
 # WAF build script for midori
 # This file is licensed under the terms of the expat license, see the file EXPAT.
 
-obj = bld.new_task_gen ('cc', 'program')
-obj.target = 'magic-uri'
-obj.includes = '.. ../midori'
-obj.source = 'magic-uri.c'
-obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
-obj.uselib_local = 'midori'
-obj.unit_test = 1
+tests = os.listdir ('tests')
+for test in tests:
+    folder = 'tests' + os.sep + test
+    if os.path.isdir (folder):
+        files = os.listdir (folder)
+        target = test
+        source = ''
+        for fila in files:
+            if fila[-2:] == '.c':
+                source += ' ' + test + os.sep + fila
+        if not source:
+            Utils.pprint ('RED', folder + ': No source files found')
+            continue
+    else:
+        if test[-2:] != '.c':
+            continue
+        target = test[:-2]
+        source = test
+
+    obj = bld.new_task_gen ('cc', 'program')
+    obj.target = 'test-' + target
+    obj.includes = '.. ../midori'
+    obj.source = source
+    obj.uselib = 'UNIQUE LIBSOUP GIO GTK SQLITE WEBKIT LIBXML'
+    obj.uselib_local = 'midori'
+    obj.unit_test = 1