[buildj] fix support for targets in subdirectories



commit cf4f86e3dbb5b08538d148e048104ff5a91de3fe
Author: Abderrahim Kitouni <a kitouni gmail com>
Date:   Sun Aug 1 15:54:49 2010 +0100

    fix support for targets in subdirectories
    
    We should never pass unicode objects to waf. However just calling
    str(...) won't work with non-ascii filenames.

 buildj.py                 |    2 +-
 project.js                |    1 +
 valalib/vala_library.vala |    5 +++++
 wscript                   |    2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/buildj.py b/buildj.py
index 860fd67..c125717 100644
--- a/buildj.py
+++ b/buildj.py
@@ -171,7 +171,7 @@ class ProjectTarget(object):
 		return str(self._target["type"])
 
 	def get_path (self):
-		return self._target.get ("path", "")
+		return str(self._target.get ("path", ""))
 		
 	def get_features (self):
 		tool = self.get_tool ()
diff --git a/project.js b/project.js
index ecbdbf7..0095d82 100644
--- a/project.js
+++ b/project.js
@@ -49,6 +49,7 @@
 		{
 			"type": "sharedlib",
 			"tool": "vala",
+			"path": "valalib",
 			"input": ["vala_library.vala"],
 			"version": "12.4.5",
 			"gir": "Bleh-1.0"
diff --git a/valalib/vala_library.vala b/valalib/vala_library.vala
new file mode 100644
index 0000000..7e6bf4f
--- /dev/null
+++ b/valalib/vala_library.vala
@@ -0,0 +1,5 @@
+namespace BuilDj {
+	public class Test : Object {
+		public Test () {}
+	}
+}
diff --git a/wscript b/wscript
index e23572a..6379ab8 100644
--- a/wscript
+++ b/wscript
@@ -97,7 +97,7 @@ def build(bld):
 
 	for target in project.get_targets ():
 		args = target.get_build_arguments ()
-		args['path'] = bld.srcnode.find_dir(target.get_path().split('/'))
+		args['path'] = bld.srcnode.find_dir(target.get_path())
 		bld.new_task_gen (**args)
 
 		install_files = target.get_install_files ()



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