From b3cad882f81f86042bf50f8f835d17e779467f79 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_ewol-test.py | 21 +- lutin_ewol.py | 345 +++++++++--------- .../lutin_ewol-sample-CustomWidget.py | 29 +- .../HelloWord/lutin_ewol-sample-HelloWord.py | 27 +- .../wallpaper/lutin_ewol-sample-wallpaper.py | 33 +- .../lutin_ewol-tools-visual-test.py | 9 +- 6 files changed, 228 insertions(+), 236 deletions(-) diff --git a/lutin_ewol-test.py b/lutin_ewol-test.py index eb39b38c..67c29dcf 100644 --- a/lutin_ewol-test.py +++ b/lutin_ewol-test.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools def get_type(): @@ -23,13 +23,16 @@ 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/testApplication.cpp', - 'test/testWindows.cpp' - ]) - my_module.add_depend(['ewol', 'gtest', 'test-debug']) - return my_module + 'test/main.cpp', + 'test/testApplication.cpp', + 'test/testWindows.cpp' + ]) + my_module.add_depend([ + 'ewol', + 'gtest', + 'test-debug' + ]) + return True diff --git a/lutin_ewol.py b/lutin_ewol.py index 906440ea..51ece764 100644 --- a/lutin_ewol.py +++ b/lutin_ewol.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 +import lutin.tools as tools def get_type(): @@ -27,207 +24,205 @@ def get_maintainer(): def get_version(): return "version.txt" -def create(target, module_name): - # module name is 'edn' and type binary. - my_module = module.Module(__file__, module_name, get_type()) +def configure(target, my_module): # add extra compilation flags: my_module.add_extra_flags() # add the file to compile: my_module.add_src_file([ - 'ewol/ewol.cpp', - 'ewol/debug.cpp', - 'ewol/Padding.cpp', - 'ewol/translate.cpp', - 'ewol/DrawProperty.cpp', - 'ewol/gravity.cpp' - ]) + 'ewol/ewol.cpp', + 'ewol/debug.cpp', + 'ewol/Padding.cpp', + 'ewol/translate.cpp', + 'ewol/DrawProperty.cpp', + 'ewol/gravity.cpp' + ]) my_module.add_header_file([ - 'ewol/debug.hpp', # TODO : Remove this ... - 'ewol/ewol.hpp', - 'ewol/Padding.hpp', - 'ewol/translate.hpp', - 'ewol/DrawProperty.hpp', - 'ewol/gravity.hpp' - ]) + 'ewol/debug.hpp', # TODO : Remove this ... + 'ewol/ewol.hpp', + 'ewol/Padding.hpp', + 'ewol/translate.hpp', + 'ewol/DrawProperty.hpp', + 'ewol/gravity.hpp' + ]) # compositing: my_module.add_src_file([ - 'ewol/compositing/Compositing.cpp', - 'ewol/compositing/TextBase.cpp', - 'ewol/compositing/Text.cpp', - 'ewol/compositing/TextDF.cpp', - 'ewol/compositing/Drawing.cpp', - 'ewol/compositing/Image.cpp', - 'ewol/compositing/Sprite.cpp', - 'ewol/compositing/Shaper.cpp', - 'ewol/compositing/Area.cpp' - ]) + 'ewol/compositing/Compositing.cpp', + 'ewol/compositing/TextBase.cpp', + 'ewol/compositing/Text.cpp', + 'ewol/compositing/TextDF.cpp', + 'ewol/compositing/Drawing.cpp', + 'ewol/compositing/Image.cpp', + 'ewol/compositing/Sprite.cpp', + 'ewol/compositing/Shaper.cpp', + 'ewol/compositing/Area.cpp' + ]) my_module.add_header_file([ - 'ewol/compositing/Text.hpp', - 'ewol/compositing/Drawing.hpp', - 'ewol/compositing/Sprite.hpp', - 'ewol/compositing/Area.hpp', - 'ewol/compositing/Shaper.hpp', - 'ewol/compositing/TextDF.hpp', - 'ewol/compositing/TextBase.hpp', - 'ewol/compositing/Compositing.hpp', - 'ewol/compositing/Image.hpp' - ]) + 'ewol/compositing/Text.hpp', + 'ewol/compositing/Drawing.hpp', + 'ewol/compositing/Sprite.hpp', + 'ewol/compositing/Area.hpp', + 'ewol/compositing/Shaper.hpp', + 'ewol/compositing/TextDF.hpp', + 'ewol/compositing/TextBase.hpp', + 'ewol/compositing/Compositing.hpp', + 'ewol/compositing/Image.hpp' + ]) # context: my_module.add_src_file([ - 'ewol/context/ConfigFont.cpp', - 'ewol/context/Context.cpp', - 'ewol/context/Application.cpp', - 'ewol/context/InputManager.cpp' - ]) + 'ewol/context/ConfigFont.cpp', + 'ewol/context/Context.cpp', + 'ewol/context/Application.cpp', + 'ewol/context/InputManager.cpp' + ]) my_module.add_header_file([ - 'ewol/context/ConfigFont.hpp', - 'ewol/context/Context.hpp', - 'ewol/context/Application.hpp', - 'ewol/context/InputManager.hpp' - ]) + 'ewol/context/ConfigFont.hpp', + 'ewol/context/Context.hpp', + 'ewol/context/Application.hpp', + 'ewol/context/InputManager.hpp' + ]) # event properties: my_module.add_src_file([ - 'ewol/event/Entry.cpp', - 'ewol/event/Time.cpp', - 'ewol/event/Input.cpp' - ]) + 'ewol/event/Entry.cpp', + 'ewol/event/Time.cpp', + 'ewol/event/Input.cpp' + ]) my_module.add_header_file([ - 'ewol/event/Time.hpp', - 'ewol/event/Input.hpp', - 'ewol/event/Entry.hpp' - ]) + 'ewol/event/Time.hpp', + 'ewol/event/Input.hpp', + 'ewol/event/Entry.hpp' + ]) # object: my_module.add_src_file([ - 'ewol/object/Manager.cpp', - 'ewol/object/Object.cpp', - 'ewol/object/Worker.cpp' - ]) + 'ewol/object/Manager.cpp', + 'ewol/object/Object.cpp', + 'ewol/object/Worker.cpp' + ]) my_module.add_header_file([ - 'ewol/object/Worker.hpp', - 'ewol/object/Manager.hpp', - 'ewol/object/Object.hpp' - ]) + 'ewol/object/Worker.hpp', + 'ewol/object/Manager.hpp', + 'ewol/object/Object.hpp' + ]) # resources: my_module.add_src_file([ - 'ewol/resource/Colored3DObject.cpp', - 'ewol/resource/ColorFile.cpp', - 'ewol/resource/ConfigFile.cpp', - 'ewol/resource/FontFreeType.cpp', - 'ewol/resource/Image.cpp', - 'ewol/resource/ImageDF.cpp', - 'ewol/resource/Texture.cpp', - 'ewol/resource/TexturedFont.cpp', - 'ewol/resource/DistanceFieldFont.cpp' - ]) + 'ewol/resource/Colored3DObject.cpp', + 'ewol/resource/ColorFile.cpp', + 'ewol/resource/ConfigFile.cpp', + 'ewol/resource/FontFreeType.cpp', + 'ewol/resource/Image.cpp', + 'ewol/resource/ImageDF.cpp', + 'ewol/resource/Texture.cpp', + 'ewol/resource/TexturedFont.cpp', + 'ewol/resource/DistanceFieldFont.cpp' + ]) my_module.add_header_file([ - 'ewol/resource/FontFreeType.hpp', - 'ewol/resource/TexturedFont.hpp', - 'ewol/resource/ColorFile.hpp', - 'ewol/resource/font/FontBase.hpp', - 'ewol/resource/font/Kerning.hpp', - 'ewol/resource/font/GlyphProperty.hpp', - 'ewol/resource/DistanceFieldFont.hpp', - 'ewol/resource/ImageDF.hpp', - 'ewol/resource/Colored3DObject.hpp', - 'ewol/resource/ConfigFile.hpp', - 'ewol/resource/Texture.hpp', - 'ewol/resource/Image.hpp' - ]) + 'ewol/resource/FontFreeType.hpp', + 'ewol/resource/TexturedFont.hpp', + 'ewol/resource/ColorFile.hpp', + 'ewol/resource/font/FontBase.hpp', + 'ewol/resource/font/Kerning.hpp', + 'ewol/resource/font/GlyphProperty.hpp', + 'ewol/resource/DistanceFieldFont.hpp', + 'ewol/resource/ImageDF.hpp', + 'ewol/resource/Colored3DObject.hpp', + 'ewol/resource/ConfigFile.hpp', + 'ewol/resource/Texture.hpp', + 'ewol/resource/Image.hpp' + ]) # widget: my_module.add_src_file([ - 'ewol/widget/ButtonColor.cpp', - 'ewol/widget/Button.cpp', - 'ewol/widget/CheckBox.cpp', - 'ewol/widget/ColorBar.cpp', - 'ewol/widget/Composer.cpp', - 'ewol/widget/Container.cpp', - 'ewol/widget/Container2.cpp', - 'ewol/widget/ContainerN.cpp', - 'ewol/widget/ContextMenu.cpp', - 'ewol/widget/Entry.cpp', - 'ewol/widget/Gird.cpp', - 'ewol/widget/Image.cpp', - 'ewol/widget/Joystick.cpp', - 'ewol/widget/Label.cpp', - 'ewol/widget/Layer.cpp', - 'ewol/widget/List.cpp', - 'ewol/widget/ListFileSystem.cpp', - 'ewol/widget/Manager.cpp', - 'ewol/widget/Menu.cpp', - 'ewol/widget/meta/ColorChooser.cpp', - 'ewol/widget/meta/FileChooser.cpp', - 'ewol/widget/meta/Parameter.cpp', - 'ewol/widget/meta/ParameterList.cpp', - 'ewol/widget/meta/StdPopUp.cpp', - 'ewol/widget/meta/SpinBase.cpp', - 'ewol/widget/PopUp.cpp', - 'ewol/widget/ProgressBar.cpp', - 'ewol/widget/Scroll.cpp', - 'ewol/widget/Select.cpp', - 'ewol/widget/Sizer.cpp', - 'ewol/widget/Slider.cpp', - 'ewol/widget/Spacer.cpp', - 'ewol/widget/Widget.cpp', - 'ewol/widget/WidgetScrolled.cpp', - 'ewol/widget/Windows.cpp', - 'ewol/widget/WSlider.cpp', - 'ewol/widget/Spin.cpp', - ]) + 'ewol/widget/ButtonColor.cpp', + 'ewol/widget/Button.cpp', + 'ewol/widget/CheckBox.cpp', + 'ewol/widget/ColorBar.cpp', + 'ewol/widget/Composer.cpp', + 'ewol/widget/Container.cpp', + 'ewol/widget/Container2.cpp', + 'ewol/widget/ContainerN.cpp', + 'ewol/widget/ContextMenu.cpp', + 'ewol/widget/Entry.cpp', + 'ewol/widget/Gird.cpp', + 'ewol/widget/Image.cpp', + 'ewol/widget/Joystick.cpp', + 'ewol/widget/Label.cpp', + 'ewol/widget/Layer.cpp', + 'ewol/widget/List.cpp', + 'ewol/widget/ListFileSystem.cpp', + 'ewol/widget/Manager.cpp', + 'ewol/widget/Menu.cpp', + 'ewol/widget/meta/ColorChooser.cpp', + 'ewol/widget/meta/FileChooser.cpp', + 'ewol/widget/meta/Parameter.cpp', + 'ewol/widget/meta/ParameterList.cpp', + 'ewol/widget/meta/StdPopUp.cpp', + 'ewol/widget/meta/SpinBase.cpp', + 'ewol/widget/PopUp.cpp', + 'ewol/widget/ProgressBar.cpp', + 'ewol/widget/Scroll.cpp', + 'ewol/widget/Select.cpp', + 'ewol/widget/Sizer.cpp', + 'ewol/widget/Slider.cpp', + 'ewol/widget/Spacer.cpp', + 'ewol/widget/Widget.cpp', + 'ewol/widget/WidgetScrolled.cpp', + 'ewol/widget/Windows.cpp', + 'ewol/widget/WSlider.cpp', + 'ewol/widget/Spin.cpp', + ]) my_module.add_header_file([ - 'ewol/widget/Menu.hpp', - 'ewol/widget/Slider.hpp', - 'ewol/widget/WidgetScrolled.hpp', - 'ewol/widget/ListFileSystem.hpp', - 'ewol/widget/Panned.hpp', - 'ewol/widget/WSlider.hpp', - 'ewol/widget/Container2.hpp', - 'ewol/widget/Windows.hpp', - 'ewol/widget/CheckBox.hpp', - 'ewol/widget/Container.hpp', - 'ewol/widget/PopUp.hpp', - 'ewol/widget/Label.hpp', - 'ewol/widget/Composer.hpp', - 'ewol/widget/Sizer.hpp', - 'ewol/widget/Scroll.hpp', - 'ewol/widget/ContainerN.hpp', - 'ewol/widget/Spacer.hpp', - 'ewol/widget/Button.hpp', - 'ewol/widget/Manager.hpp', - 'ewol/widget/Entry.hpp', - 'ewol/widget/ContextMenu.hpp', - 'ewol/widget/Gird.hpp', - 'ewol/widget/ProgressBar.hpp', - 'ewol/widget/ColorBar.hpp', - 'ewol/widget/ButtonColor.hpp', - 'ewol/widget/Layer.hpp', - 'ewol/widget/Joystick.hpp', - 'ewol/widget/Widget.hpp', - 'ewol/widget/meta/StdPopUp.hpp', - 'ewol/widget/meta/SpinBase.hpp', - 'ewol/widget/meta/ParameterList.hpp', - 'ewol/widget/meta/ColorChooser.hpp', - 'ewol/widget/meta/Parameter.hpp', - 'ewol/widget/meta/FileChooser.hpp', - 'ewol/widget/Image.hpp', - 'ewol/widget/List.hpp', - 'ewol/widget/Select.hpp', - 'ewol/widget/Spin.hpp' - ]) + 'ewol/widget/Menu.hpp', + 'ewol/widget/Slider.hpp', + 'ewol/widget/WidgetScrolled.hpp', + 'ewol/widget/ListFileSystem.hpp', + 'ewol/widget/Panned.hpp', + 'ewol/widget/WSlider.hpp', + 'ewol/widget/Container2.hpp', + 'ewol/widget/Windows.hpp', + 'ewol/widget/CheckBox.hpp', + 'ewol/widget/Container.hpp', + 'ewol/widget/PopUp.hpp', + 'ewol/widget/Label.hpp', + 'ewol/widget/Composer.hpp', + 'ewol/widget/Sizer.hpp', + 'ewol/widget/Scroll.hpp', + 'ewol/widget/ContainerN.hpp', + 'ewol/widget/Spacer.hpp', + 'ewol/widget/Button.hpp', + 'ewol/widget/Manager.hpp', + 'ewol/widget/Entry.hpp', + 'ewol/widget/ContextMenu.hpp', + 'ewol/widget/Gird.hpp', + 'ewol/widget/ProgressBar.hpp', + 'ewol/widget/ColorBar.hpp', + 'ewol/widget/ButtonColor.hpp', + 'ewol/widget/Layer.hpp', + 'ewol/widget/Joystick.hpp', + 'ewol/widget/Widget.hpp', + 'ewol/widget/meta/StdPopUp.hpp', + 'ewol/widget/meta/SpinBase.hpp', + 'ewol/widget/meta/ParameterList.hpp', + 'ewol/widget/meta/ColorChooser.hpp', + 'ewol/widget/meta/Parameter.hpp', + 'ewol/widget/meta/FileChooser.hpp', + 'ewol/widget/Image.hpp', + 'ewol/widget/List.hpp', + 'ewol/widget/Select.hpp', + 'ewol/widget/Spin.hpp' + ]) # tools: my_module.add_src_file([ - 'ewol/tools/message.cpp' - ]) + 'ewol/tools/message.cpp' + ]) my_module.add_header_file([ - 'ewol/tools/message.hpp' - ]) + 'ewol/tools/message.hpp' + ]) my_module.copy_path('data/theme/shape/square/*','theme/shape/square') my_module.copy_path('data/theme/shape/round/*','theme/shape/round') @@ -259,11 +254,11 @@ def create(target, module_name): 'egami', 'edtaa3']) - my_module.add_path(tools.get_current_path(__file__)) + my_module.add_path(".") my_module.add_flag('c++', [ - "-DEWOL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) + "-DEWOL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" + ]) - return my_module + return True diff --git a/sample/CustomWidgets/lutin_ewol-sample-CustomWidget.py b/sample/CustomWidgets/lutin_ewol-sample-CustomWidget.py index e9e99cb2..6225c091 100644 --- a/sample/CustomWidgets/lutin_ewol-sample-CustomWidget.py +++ b/sample/CustomWidgets/lutin_ewol-sample-CustomWidget.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools def get_type(): @@ -26,21 +26,22 @@ 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', - 'appl/Windows.cpp', - 'appl/widget/VectorDisplay.cpp', - ]) - my_module.add_depend(['ewol']) + 'appl/Main.cpp', + 'appl/debug.cpp', + 'appl/Windows.cpp', + 'appl/widget/VectorDisplay.cpp', + ]) + my_module.add_depend([ + 'ewol' + ]) my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - my_module.add_path(tools.get_current_path(__file__)) - return my_module + "-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"", + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" + ]) + my_module.add_path(".") + return True diff --git a/sample/HelloWord/lutin_ewol-sample-HelloWord.py b/sample/HelloWord/lutin_ewol-sample-HelloWord.py index 0595616e..82d7a618 100644 --- a/sample/HelloWord/lutin_ewol-sample-HelloWord.py +++ b/sample/HelloWord/lutin_ewol-sample-HelloWord.py @@ -1,5 +1,5 @@ #!/usr/bin/python -import lutin.module as module +import lutin.debug as debug import lutin.tools as tools def get_type(): @@ -26,18 +26,19 @@ 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', - 'appl/Windows.cpp', - ]) - my_module.add_depend(['ewol']) + 'appl/Main.cpp', + 'appl/debug.cpp', + 'appl/Windows.cpp', + ]) + my_module.add_depend([ + 'ewol' + ]) my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) - my_module.add_path(tools.get_current_path(__file__)) - return my_module + "-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"", + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" + ]) + my_module.add_path(".") + return True diff --git a/sample/wallpaper/lutin_ewol-sample-wallpaper.py b/sample/wallpaper/lutin_ewol-sample-wallpaper.py index 2f0236cc..3dbecf5e 100644 --- a/sample/wallpaper/lutin_ewol-sample-wallpaper.py +++ b/sample/wallpaper/lutin_ewol-sample-wallpaper.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(): @@ -31,30 +30,24 @@ 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', - 'appl/WidgetDisplay.cpp', - 'appl/Windows.cpp', - ]) + 'appl/Main.cpp', + 'appl/debug.cpp', + 'appl/WidgetDisplay.cpp', + 'appl/Windows.cpp', + ]) my_module.add_depend(['ewol']) my_module.add_flag('c++', [ - "-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"", - "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" - ]) + "-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\"", + "-DAPPL_VERSION=\"\\\"" + tools.version_to_string(get_version()) + "\\\"\"" + ]) my_module.copy_path('data/SnowFlake.svg','') - my_module.add_path(tools.get_current_path(__file__)) + my_module.add_path(".") # set the package properties : - my_module.set_pkg("COMPAGNY_TYPE", get_compagny_type()) - my_module.set_pkg("COMPAGNY_NAME", get_compagny_name()) - my_module.set_pkg("MAINTAINER", get_maintainer()) - my_module.set_pkg("ICON", tools.get_current_path(__file__) + "/../data/icon.png") + my_module.set_pkg("ICON", "../data/icon.png") my_module.set_pkg("SECTION", "example") my_module.set_pkg("PRIORITY", "extra") - my_module.set_pkg("DESCRIPTION", get_desc()) - my_module.set_pkg("NAME", get_name()) my_module.set_pkg("ANDROID_APPL_TYPE", "WALLPAPER") @@ -68,7 +61,7 @@ def create(target, module_name): # add the currrent module at the - return my_module + return True diff --git a/tools/visual_test/lutin_ewol-tools-visual-test.py b/tools/visual_test/lutin_ewol-tools-visual-test.py index 5f5b4cca..9b7e8781 100755 --- a/tools/visual_test/lutin_ewol-tools-visual-test.py +++ b/tools/visual_test/lutin_ewol-tools-visual-test.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 @@ -24,8 +24,7 @@ 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): # add the file to compile: my_module.add_src_file([ 'appl/debug.cpp', @@ -47,7 +46,7 @@ def create(target, module_name): my_module.copy_path('data/sphere.obj','') my_module.copy_path('data/gui.xml','') - my_module.add_path(tools.get_current_path(__file__)) + my_module.add_path(".") my_module.copy_path("data/FreeSerif*","fonts/") @@ -67,7 +66,7 @@ def create(target, module_name): my_module.pkg_add("RIGHT", "VIBRATE") """ - return my_module + return True