[gxml] * update waf to 1.7.0, update wscript from bitrot, update gtk to 3.0 from 2.0



commit d64dd1881843e7bc2a3aadfa54a0209710adc00f
Author: Richard Schwarting <aquarichy gmail com>
Date:   Sun Jun 3 04:39:27 2012 -0400

    * update waf to 1.7.0, update wscript from bitrot, update gtk to 3.0 from 2.0

 waf     |  Bin 4126 -> 87377 bytes
 wscript |   10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/waf b/waf
index 106f473..8593add 100755
Binary files a/waf and b/waf differ
diff --git a/wscript b/wscript
index 81e956d..544c3e1 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
 # /
 
 # the following two variables are used by the target "waf dist"
-VERSION = '0.0.2'
+VERSION = '0.0.3'
 SHORTVERSION= '0.0'
 APPNAME = 'gxml'
 
@@ -20,15 +20,15 @@ def options(opt):
 def configure(conf):
     conf.load('compiler_c vala')
     conf.check_cfg(package='glib-2.0', uselib_store='GLIB', atleast_version='2.10.0', mandatory=1, args='--cflags --libs')
-    conf.check_cfg(package='gtk+-2.0', uselib_store='GTK', atleast_version='2.10.0', mandatory=1, args='--cflags --libs')
+    conf.check_cfg(package='gtk+-3.0', uselib_store='GTK', atleast_version='3.2.0', mandatory=1, args='--cflags --libs')
     conf.check_cfg(package='gee-1.0', uselib_store='GEE', atleast_version='0.6.1', mandatory=1, args='--cflags --libs')
     conf.check_cfg(package='libxml-2.0', uselib_store='XML', atleast_version='2.7.8', mandatory=1, args='--cflags --libs')
     # will probably want mroe packages :D
     # conf.env['VALAFLAGS'] = '-g --vapi=gxml.vapi --deps gxml.deps' # --use-header --header=gxml.h --includedir=`pwd` '
     conf.env.CFLAGS = ['-g']
 
-    conf.check_tool ('gcc vala') # do we need to do this?  only saw it in the valadoc example
-    conf.check_tool ('valadoc')
+    # conf.check_tool ('gcc vala') # do we need to do this?  only saw it in the valadoc example
+    # conf.check_tool ('valadoc') # apparently check_tool doesn't exist in waf 1.7.0? 
 
 def build(bld):
     bld.recurse('gxml test')
@@ -36,7 +36,7 @@ def build(bld):
     bld(rule="cp ${SRC} ${TGT}", source="test/test.xml", target="build/test/")
     bld(rule="cp ${SRC} ${TGT}", source="test/test_out_path_expected.xml", target="build/test/")
     bld(rule="cp ${SRC} ${TGT}", source="test/test_out_stream_expected.xml", target="build/test/")
-    bld(rule="rm -rf doc; valadoc --package-name=" + APPNAME + " --package-version=" + VERSION + " --pkg libxml-2.0 --pkg gio-2.0 --pkg gee-1.0 ../gxml/*.vala -o doc");
+    bld(rule="rm -rf doc; valadoc --vapidir=../vapi --package-name=" + APPNAME + " --package-version=" + VERSION + " --pkg libxml-2.0 --pkg gio-2.0 --pkg gee-1.0 ../gxml/*.vala -o doc"); # occurs in build/
 
     ## want to call valadoc, but TypeError encountered by WAF, sigh
     # bld(features='valadoc',



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]