[gxml] * let waf compile code again using gee-0.8 (former gee-1.0)
- From: Richard Hans Schwarting <rschwart src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] * let waf compile code again using gee-0.8 (former gee-1.0)
- Date: Fri, 15 Jun 2012 22:07:44 +0000 (UTC)
commit 821781926dbf560086c705df1294d182f7da83fb
Author: Richard Schwarting <aquarichy gmail com>
Date: Fri Jun 15 18:07:29 2012 -0400
* let waf compile code again using gee-0.8 (former gee-1.0)
gxml/wscript_build | 2 +-
test/wscript_build | 3 +--
wscript | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gxml/wscript_build b/gxml/wscript_build
index a720f62..d8cbc88 100644
--- a/gxml/wscript_build
+++ b/gxml/wscript_build
@@ -6,7 +6,7 @@
bld.shlib(
# TODO: want to add --deps gxml.deps --vapi=gxml.vapi
- packages = 'gtk+-2.0 gee-1.0 libxml-2.0',
+ packages = 'gtk+-2.0 gee-0.8 libxml-2.0',
target = 'gxml',
uselib = 'GTK GLIB GEE XML',
source = ['Attr.vala', 'BackedNode.vala', 'CDATASection.vala', 'CharacterData.vala', 'Comment.vala', 'DocumentFragment.vala', 'DocumentType.vala', 'Document.vala', 'DomError.vala', 'Element.vala', 'EntityReference.vala', 'Entity.vala', 'Implementation.vala', 'NodeList.vala', 'NodeType.vala', 'Notation.vala', 'ProcessingInstruction.vala', 'Text.vala', 'XNode.vala', 'NamespaceAttr.vala'],
diff --git a/test/wscript_build b/test/wscript_build
index bffe01b..3642812 100644
--- a/test/wscript_build
+++ b/test/wscript_build
@@ -6,8 +6,7 @@
bld.program(
# TODO: want to add --deps gxml.deps
- # packages = 'gtk+-2.0 gxml gee-1.0 libxml-2.0',
- packages = 'gio-2.0 gxml gee-1.0 posix', # gee-1.0',
+ packages = 'gio-2.0 gxml gee-0.8 posix',
target = 'gxml_test',
uselib = 'GTK GLIB GEE XML',
use = 'gxml',
diff --git a/wscript b/wscript
index 544c3e1..bc44c5f 100644
--- a/wscript
+++ b/wscript
@@ -21,7 +21,7 @@ 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+-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='gee-0.8', 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` '
@@ -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 --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/
+ # TODO: fix valadoc usage, bld(rule="rm -rf doc; valadoc --vapidir=../vapi --package-name=" + APPNAME + " --package-version=" + VERSION + " --pkg libxml-2.0 --pkg gio-2.0 --pkg gee-0.8 ../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]