[buildj] Added support for VERSION and APPNAME

[Alberto Ruiz <aruiz src gnome org>]

commit d11151ae799030f01728a51e050563158cf757de
Author: Alberto Ruiz <aruiz gnome org>
Date:   Fri Mar 12 03:40:15 2010 +0000

    Added support for VERSION and APPNAME

 project.js |    7 +++++++
 wscript    |   52 ++++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 53 insertions(+), 6 deletions(-)
---
diff --git a/project.js b/project.js
index d99e8e0..16ce6fc 100644
--- a/project.js
+++ b/project.js
@@ -26,6 +26,13 @@
 			"tool":    "cc",
 			"input":   ["program.c"]
 		},
+		"my_cpp_program":
+		{
+			"type": "program",
+			"tool": "cxx",
+			"input": ["cpprogram.cpp"],
+			"uses": ["my_static_lib"]
+		},
 		"my_shared_lib":
 		{
 			"type":    "sharedlib",
diff --git a/wscript b/wscript
index 2a9a260..0859a38 100644
--- a/wscript
+++ b/wscript
@@ -3,6 +3,9 @@ import Options
 import json
 import re
 
+APPNAME = None
+VERSION = None
+
 #BuilDj Tool -> Waf tool	
 WAF_TOOLS = {'cc':   'compiler_cc',
              'cxx':  'compiler_cxx',
@@ -99,7 +102,6 @@ class ProjectTarget:
 	def get_defines (self):
 		return self._get_string_list ("defines")
 	
-	######### VALA Target ########		
 	def get_build_arguments (self):
 		args = {"features": self.get_features (),
             "source":   self.get_input (),
@@ -238,6 +240,35 @@ class ProjectFile:
 	def __repr__ (self):
 		return str (self._json)
 		
+	def get_project_version (self):
+		project = self._project
+		
+		if not "project" in project:
+			#TODO: There must be a project name and a project 
+			return
+
+		project_node = project["project"]
+		
+		if "version" not in project_node:
+			#TODO: There must be a version		
+			pass		
+
+		return str(project_node["version"])
+		
+	def get_project_name (self):
+		project = self._project
+		if "project" not in project:
+			#TODO: There must be a project name and a project 
+			return
+			
+		project_node = project["project"]		
+		if "name" not in project_node:
+			#TODO: There must be a name
+			return
+
+		return  str(project_node["name"])
+		
+		
 	def get_targets (self):
 		project = self._project
 		if not "targets" in project:
@@ -286,7 +317,7 @@ class ProjectFile:
 #Mapping between tools and target classes
 TOOL_CLASS_MAP = {'cc':   CcTarget,
                   'cxx':   CcTarget,
-                  'vala': ValaTarget}
+                  'vala': ValaTarget}		
 
 def parse_project_file (project_file=DEFAULT_BUILDJ_FILE):
 	try:
@@ -296,6 +327,13 @@ def parse_project_file (project_file=DEFAULT_BUILDJ_FILE):
 	
 	return project
 
+def set_project_info (project_file=DEFAULT_BUILDJ_FILE):
+		project = parse_project_file ()
+
+		global APPNAME, VERSION
+		APPNAME = project.get_project_name ()
+		VERSION = project.get_project_version ()
+
 def normalize_package_name (name):
 	name = name.upper ()
 	nonalpha = re.compile (r'\W')
@@ -351,13 +389,15 @@ def configure (conf):
 	
 	for tool in project.get_tools ():
 		conf.check_tool (WAF_TOOLS[tool])
-		
-	if "vala" in project.get_tools():
-		#TODO: Check if it's already checked
-		conf.check_cfg (package="glib-2.0", mandatory=True)
 
 	for args in project.get_check_pkg_arg_list ():
 		conf.check_cfg (**args)
+		
+	#FIXME: This should be done upstream
+	if "vala" in project.get_tools():
+		if not conf.env.HAVE_GLIB_2_0:
+			conf.check_cfg (package="glib-2.0", mandatory=True)
+
 				
 def build(bld):
 	project = parse_project_file ()