]> spindle.queued.net Git - midori/commitdiff
Upgrade waf to 1.5.16
authorChristian Dywan <christian@twotoasts.de>
Fri, 23 Apr 2010 20:51:10 +0000 (22:51 +0200)
committerChristian Dywan <christian@twotoasts.de>
Sat, 24 Apr 2010 10:44:46 +0000 (12:44 +0200)
The new waf has better support for Windows and Vala.

waf
wscript

diff --git a/waf b/waf
index 3de0239bbacadea9f7deebf3b9fba4033c228554..22d00ed292a2816a8f7d80765032313db6763106 100755 (executable)
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index 759efa8dc4cee49635c53213144adc4447878286..4b14385656ad0c069c1773f6e4b897a016363b0e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -18,7 +18,10 @@ import Options
 import Utils
 import pproc as subprocess
 import os
-import UnitTest
+try:
+    import UnitTest
+except:
+    import unittestw as UnitTest
 import Task
 from TaskGen import extension, feature, taskgen
 import misc
@@ -531,6 +534,10 @@ def build (bld):
     if Options.commands['clean']:
         distclean ()
 
+def check (ctx):
+    # The real work happens in shutdown ()
+    pass
+
 def distclean ():
     if os.path.exists ('po/LINGUAS'):
         os.remove ('po/LINGUAS')