From a99c382bc63b5f8ec35cb440ef87ca461f33f7c5 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 4 Oct 2016 23:41:29 +0200 Subject: [PATCH] [DEV] Update new lutin 2.2.0 (no legacy support) --- lutin_dollar-bench-corpus.py | 11 ++++---- lutin_dollar-converter.py | 11 ++++---- lutin_dollar-data.py | 7 ++--- lutin_dollar-generate-form.py | 11 ++++---- lutin_dollar-test.py | 7 ++--- lutin_dollar.py | 39 +++++++++++++------------- tool/recorder/lutin_dollar-recorder.py | 11 ++++---- 7 files changed, 45 insertions(+), 52 deletions(-) diff --git a/lutin_dollar-bench-corpus.py b/lutin_dollar-bench-corpus.py index cef3f73..0c95472 100644 --- a/lutin_dollar-bench-corpus.py +++ b/lutin_dollar-bench-corpus.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -24,14 +24,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([ - 'tool/bench-corpus/main.cpp' - ]) + 'tool/bench-corpus/main.cpp' + ]) my_module.add_depend([ 'dollar', 'test-debug', ]) - return my_module + return True diff --git a/lutin_dollar-converter.py b/lutin_dollar-converter.py index 1b3f833..cb54116 100644 --- a/lutin_dollar-converter.py +++ b/lutin_dollar-converter.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -24,14 +24,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([ - 'tool/converter/main.cpp' - ]) + 'tool/converter/main.cpp' + ]) my_module.add_depend([ 'dollar', 'test-debug', ]) - return my_module + return True diff --git a/lutin_dollar-data.py b/lutin_dollar-data.py index aad7adf..c1eb45e 100644 --- a/lutin_dollar-data.py +++ b/lutin_dollar-data.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -21,9 +21,8 @@ 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.copy_path('data/text/*.json', 'text') my_module.copy_path('data/figure/*.json', 'figure') - return my_module + return True diff --git a/lutin_dollar-generate-form.py b/lutin_dollar-generate-form.py index 8a9c421..7c2831d 100644 --- a/lutin_dollar-generate-form.py +++ b/lutin_dollar-generate-form.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -24,14 +24,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([ - 'tool/generate-form/main.cpp' - ]) + 'tool/generate-form/main.cpp' + ]) my_module.add_depend([ 'dollar', 'test-debug', ]) - return my_module + return True diff --git a/lutin_dollar-test.py b/lutin_dollar-test.py index f8033eb..14b223e 100644 --- a/lutin_dollar-test.py +++ b/lutin_dollar-test.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -24,8 +24,7 @@ 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' ]) @@ -36,5 +35,5 @@ def create(target, module_name): 'gtest', ]) my_module.copy_path('data/test/*.json', 'test') - return my_module + return True diff --git a/lutin_dollar.py b/lutin_dollar.py index 1f4a843..4a35deb 100644 --- a/lutin_dollar.py +++ b/lutin_dollar.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools @@ -24,29 +24,28 @@ 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() # add the file to compile: my_module.add_src_file([ - 'dollar/debug.cpp', - 'dollar/Engine.cpp', - 'dollar/EngineN.cpp', - 'dollar/EngineP.cpp', - 'dollar/EnginePPlus.cpp', - 'dollar/Gesture.cpp', - 'dollar/GestureN.cpp', - 'dollar/GestureP.cpp', - 'dollar/GesturePPlus.cpp', - 'dollar/Results.cpp', - 'dollar/tools.cpp', - 'dollar/Rectangle.cpp' - ]) + 'dollar/debug.cpp', + 'dollar/Engine.cpp', + 'dollar/EngineN.cpp', + 'dollar/EngineP.cpp', + 'dollar/EnginePPlus.cpp', + 'dollar/Gesture.cpp', + 'dollar/GestureN.cpp', + 'dollar/GestureP.cpp', + 'dollar/GesturePPlus.cpp', + 'dollar/Results.cpp', + 'dollar/tools.cpp', + 'dollar/Rectangle.cpp' + ]) my_module.add_header_file([ - 'dollar/*.hpp', - ], - destination_path="dollar") + 'dollar/*.hpp', + ], + destination_path="dollar") # build in C++ mode my_module.compile_version("c++", 2011) @@ -59,6 +58,6 @@ def create(target, module_name): 'esvg', 'ememory', ]) - return my_module + return True diff --git a/tool/recorder/lutin_dollar-recorder.py b/tool/recorder/lutin_dollar-recorder.py index 4c39278..c63155b 100644 --- a/tool/recorder/lutin_dollar-recorder.py +++ b/tool/recorder/lutin_dollar-recorder.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools import os @@ -27,8 +27,7 @@ def get_maintainer(): def get_version(): return [0,1] -def create(target, module_name): - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): my_module.add_src_file([ 'appl/Main.cpp', 'appl/debug.cpp', @@ -46,7 +45,7 @@ def create(target, module_name): "-DPROJECT_NAME=\"\\\"" + my_module.get_name() + "\\\"\"", "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" ]) - my_module.add_path(tools.get_current_path(__file__)) + my_module.add_path(".") my_module.set_pkg("VERSION_CODE", 1) my_module.add_pkg("RIGHT", "WRITE_EXTERNAL_STORAGE") @@ -54,8 +53,8 @@ def create(target, module_name): my_module.copy_path("data/freefont/*","fonts/") my_module.copy_path('data/reference/*', "reference") - my_module.set_pkg("ICON", os.path.join(tools.get_current_path(__file__), "data/icon.png")) - return my_module + my_module.set_pkg("ICON", "data/icon.png") + return True