diff --git a/lutin_esignal-sample.py b/lutin_esignal-sample.py index 58e495e..c1ccd88 100644 --- a/lutin_esignal-sample.py +++ b/lutin_esignal-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,11 +23,13 @@ def get_compagny_name(): def get_maintainer(): return "authors.txt" -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/sampleAll.cpp' - ]) - my_module.add_depend(['esignal', 'test-debug']) - return my_module + 'sample/sampleAll.cpp' + ]) + my_module.add_depend([ + 'esignal', + 'test-debug' + ]) + return True diff --git a/lutin_esignal-test.py b/lutin_esignal-test.py index 7e06a45..be71553 100644 --- a/lutin_esignal-test.py +++ b/lutin_esignal-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(): @@ -25,18 +24,21 @@ def get_compagny_name(): def get_maintainer(): return "authors.txt" -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/main.cpp', - 'test/declareSignals.cpp', - 'test/test_signal_counter.cpp', - 'test/test_signal_class_func.cpp', - 'test/test_signal_recursive.cpp', - 'test/test_signal_shared_ptr_func.cpp', - 'test/test_signal_static_func.cpp', - 'test/test_isignal.cpp' - ]) - my_module.add_depend(['esignal', 'gtest', 'test-debug']) - return my_module + 'test/main.cpp', + 'test/declareSignals.cpp', + 'test/test_signal_counter.cpp', + 'test/test_signal_class_func.cpp', + 'test/test_signal_recursive.cpp', + 'test/test_signal_shared_ptr_func.cpp', + 'test/test_signal_static_func.cpp', + 'test/test_isignal.cpp' + ]) + my_module.add_depend([ + 'esignal', + 'gtest', + 'test-debug' + ]) + return True diff --git a/lutin_esignal.py b/lutin_esignal.py index 6a6cbdd..f2aceca 100644 --- a/lutin_esignal.py +++ b/lutin_esignal.py @@ -1,9 +1,6 @@ #!/usr/bin/python -import lutin.module as module import lutin.tools as tools import lutin.debug as debug -import os -import lutin.multiprocess as lutinMultiprocess def get_type(): @@ -27,34 +24,33 @@ def get_maintainer(): def get_version(): return "version.txt" -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): my_module.add_extra_flags() my_module.add_src_file([ - 'esignal/debug.cpp', - 'esignal/Connection.cpp', - 'esignal/InterfaceData.cpp', - 'esignal/Base.cpp', - 'esignal/details/Signal.cpp', - ]) + 'esignal/debug.cpp', + 'esignal/Connection.cpp', + 'esignal/InterfaceData.cpp', + 'esignal/Base.cpp', + 'esignal/details/Signal.cpp', + ]) my_module.add_header_file([ - 'esignal/debug.hpp', - 'esignal/Interface.hpp', - 'esignal/InterfaceData.hpp', - 'esignal/Base.hpp', - 'esignal/Signal.hpp', - 'esignal/Connection.hpp', - 'esignal/details/Signal.hxx', - ]) + 'esignal/debug.hpp', + 'esignal/Interface.hpp', + 'esignal/InterfaceData.hpp', + 'esignal/Base.hpp', + 'esignal/Signal.hpp', + 'esignal/Connection.hpp', + 'esignal/details/Signal.hxx', + ]) my_module.compile_version("c++", 2011) my_module.add_depend([ 'etk', 'ememory' ]) - my_module.add_path(tools.get_current_path(__file__)) + my_module.add_path(".") my_module.add_flag('c++', [ "-DESIGNAL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) my_module.add_tools(['esignal-test']) - return my_module + return True