diff --git a/lutin_ejson-sample.py b/lutin_ejson-sample.py index d77a01d..5a45be7 100644 --- a/lutin_ejson-sample.py +++ b/lutin_ejson-sample.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools -import datetime def get_type(): return "BINARY" @@ -24,14 +23,16 @@ def get_compagny_name(): def get_maintainer(): return ["Mr DUPIN Edouard "] -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): my_module.add_src_file([ - 'sample/main.cpp', - 'sample/read.cpp', - 'sample/write.cpp' - ]) - my_module.add_depend(['ejson', 'test-debug']) + 'sample/main.cpp', + 'sample/read.cpp', + 'sample/write.cpp' + ]) + my_module.add_depend([ + 'ejson', + 'test-debug' + ]) my_module.copy_path('sample/read.json') - return my_module + return True diff --git a/lutin_ejson-test.py b/lutin_ejson-test.py index e6468ec..91968e9 100644 --- a/lutin_ejson-test.py +++ b/lutin_ejson-test.py @@ -1,7 +1,6 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools -import datetime def get_type(): @@ -28,11 +27,14 @@ def get_compagny_name(): def get_maintainer(): return ["Mr DUPIN Edouard "] -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): my_module.add_src_file([ - 'test/test.cpp' - ]) - my_module.add_depend(['ejson', 'gtest', 'test-debug']) - return my_module + 'test/test.cpp' + ]) + my_module.add_depend([ + 'ejson', + 'gtest', + 'test-debug' + ]) + return True diff --git a/lutin_ejson.py b/lutin_ejson.py index ea35fda..900b69e 100644 --- a/lutin_ejson.py +++ b/lutin_ejson.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -24,55 +24,58 @@ def get_maintainer(): def get_version(): return "version.txt" -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) - my_module.add_depend(['elog', 'etk', 'ememory']) +def configure(target, my_module): + my_module.add_depend([ + 'elog', + 'etk', + 'ememory' + ]) my_module.add_extra_flags() my_module.add_src_file([ - 'ejson/debug.cpp', - 'ejson/FilePos.cpp', - 'ejson/valueType.cpp', - 'ejson/Document.cpp', - 'ejson/Array.cpp', - 'ejson/Boolean.cpp', - 'ejson/Null.cpp', - 'ejson/Number.cpp', - 'ejson/String.cpp', - 'ejson/Object.cpp', - 'ejson/Value.cpp', - 'ejson/internal/Document.cpp', - 'ejson/internal/Array.cpp', - 'ejson/internal/Boolean.cpp', - 'ejson/internal/Null.cpp', - 'ejson/internal/Number.cpp', - 'ejson/internal/String.cpp', - 'ejson/internal/Object.cpp', - 'ejson/internal/Value.cpp' - ]) + 'ejson/debug.cpp', + 'ejson/FilePos.cpp', + 'ejson/valueType.cpp', + 'ejson/Document.cpp', + 'ejson/Array.cpp', + 'ejson/Boolean.cpp', + 'ejson/Null.cpp', + 'ejson/Number.cpp', + 'ejson/String.cpp', + 'ejson/Object.cpp', + 'ejson/Value.cpp', + 'ejson/internal/Document.cpp', + 'ejson/internal/Array.cpp', + 'ejson/internal/Boolean.cpp', + 'ejson/internal/Null.cpp', + 'ejson/internal/Number.cpp', + 'ejson/internal/String.cpp', + 'ejson/internal/Object.cpp', + 'ejson/internal/Value.cpp' + ]) my_module.add_header_file([ - 'ejson/FilePos.hpp', - 'ejson/ejson.hpp', - 'ejson/valueType.hpp', - 'ejson/Document.hpp', - 'ejson/Array.hpp', - 'ejson/Boolean.hpp', - 'ejson/Null.hpp', - 'ejson/Number.hpp', - 'ejson/String.hpp', - 'ejson/Object.hpp', - 'ejson/Value.hpp', - 'ejson/iterator.hpp', - 'ejson/details/iterator.hxx', - 'ejson/internal/Document.hpp', - 'ejson/internal/Array.hpp', - 'ejson/internal/Boolean.hpp', - 'ejson/internal/Null.hpp', - 'ejson/internal/Number.hpp', - 'ejson/internal/String.hpp', - 'ejson/internal/Object.hpp', - 'ejson/internal/Value.hpp' - ]) - my_module.add_path(tools.get_current_path(__file__)) - return my_module + 'ejson/FilePos.hpp', + 'ejson/ejson.hpp', + 'ejson/valueType.hpp', + 'ejson/Document.hpp', + 'ejson/Array.hpp', + 'ejson/Boolean.hpp', + 'ejson/Null.hpp', + 'ejson/Number.hpp', + 'ejson/String.hpp', + 'ejson/Object.hpp', + 'ejson/Value.hpp', + 'ejson/iterator.hpp', + 'ejson/details/iterator.hxx', + 'ejson/internal/Document.hpp', + 'ejson/internal/Array.hpp', + 'ejson/internal/Boolean.hpp', + 'ejson/internal/Null.hpp', + 'ejson/internal/Number.hpp', + 'ejson/internal/String.hpp', + 'ejson/internal/Object.hpp', + 'ejson/internal/Value.hpp' + ]) + my_module.add_path(".") + return True