[buildj] Removing some waf specific stuff from the ProjectFile class
- From: Alberto Ruiz <aruiz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [buildj] Removing some waf specific stuff from the ProjectFile class
- Date: Sun, 14 Mar 2010 16:30:14 +0000 (UTC)
commit 8a87c80b873a032baa458da19825f2322cafdacc
Author: Alberto Ruiz <aruiz gnome org>
Date: Sun Mar 14 16:29:58 2010 +0000
Removing some waf specific stuff from the ProjectFile class
buildj.py | 7 +++----
wscript | 5 +++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/buildj.py b/buildj.py
index 203ae6b..b5f003c 100644
--- a/buildj.py
+++ b/buildj.py
@@ -124,11 +124,10 @@ class ProjectFile:
"List of pkg-config packages required"
requires = self.get_requires ()
return [require for require in requires if require.get_type () == "package"]
+
+ def replace_options (self, *args):
+ pass
- def get_check_pkg_arg_list (self):
- "WAF check_pkg arguments dictionary of all packages"
- return [package.get_check_pkg_args ()
- for package in self.get_packages_required ()]
class ProjectTarget:
def __init__(self, name, target):
diff --git a/wscript b/wscript
index 3c47e55..14bea65 100644
--- a/wscript
+++ b/wscript
@@ -81,8 +81,9 @@ def configure (conf):
for tool in project.get_tools ():
conf.check_tool (WAF_TOOLS[tool])
- for args in project.get_check_pkg_arg_list ():
- conf.check_cfg (**args)
+ #We check all the tools' required packages
+ for package in project.get_packages_required ():
+ conf.check_cfg (**package.get_check_pkg_args ())
#FIXME: This should be done upstream
if "vala" in project.get_tools():
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]