From c1cdf07c7e0cf048480d46bf3b35c2b3847c4b6d Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 25 Oct 2021 07:54:36 +0200 Subject: [PATCH] [DEV] uptate new lutin declaration model --- .gitignore | 5 +++ GLD_ethread-tools.json | 52 +++++++++++++++++++++++++++++ GLD_ethread.json | 40 +++++++++++++++++++++++ lutin_ethread-tools.py | 74 ------------------------------------------ lutin_ethread.py | 59 --------------------------------- 5 files changed, 97 insertions(+), 133 deletions(-) create mode 100644 GLD_ethread-tools.json create mode 100644 GLD_ethread.json delete mode 100644 lutin_ethread-tools.py delete mode 100644 lutin_ethread.py diff --git a/.gitignore b/.gitignore index 0d20b64..405ec0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ +__pycache__ +.bck +out +target +build *.pyc diff --git a/GLD_ethread-tools.json b/GLD_ethread-tools.json new file mode 100644 index 0000000..6fae965 --- /dev/null +++ b/GLD_ethread-tools.json @@ -0,0 +1,52 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"Ewol thread tools", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + + "source": [ + "ethread/tools.cpp" + ], + "header": [ + "ethread/tools.hpp", + "ethread/Thread.hpp", + "ethread/Mutex.hpp", + "ethread/MutexRecursive.hpp", + "ethread/Semaphore.hpp" + ], + "path":[ + "." + ], + "compilation-version": { + "language": "c++", + "version": 2011 + }, + "dependency": [ + "etk-core" + ], + "target":{ + "Windows":{ + "source": [ + "ethread/Mutex.Windows.cpp", + "ethread/MutexRecursive.Windows.cpp", + "ethread/Thread.Windows.cpp", + "ethread/Semaphore.Windows.cpp" + ] + }, + "!Windows":{ + "source": [ + "ethread/Mutex.pthread.cpp", + "ethread/MutexRecursive.pthread.cpp", + "ethread/Thread.pthread.cpp", + "ethread/Semaphore.pthread.cpp" + ], + "dependency": [ + "pthread" + ] + } + } +} \ No newline at end of file diff --git a/GLD_ethread.json b/GLD_ethread.json new file mode 100644 index 0000000..7b56244 --- /dev/null +++ b/GLD_ethread.json @@ -0,0 +1,40 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"Ewol thread", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + + "source": [ + "ethread/debug.cpp", + "ethread/Future.cpp", + "ethread/Promise.cpp", + "ethread/Pool.cpp", + "ethread/PoolAction.cpp", + "ethread/PoolExecutor.cpp" + ], + "header": [ + "ethread/Future.hpp", + "ethread/Promise.hpp", + "ethread/Pool.hpp", + "ethread/PoolAction.hpp", + "ethread/PoolExecutor.hpp" + ], + "path":[ + "." + ], + "compilation-version": { + "language": "c++", + "version": 2011 + }, + "dependency": [ + "elog", + "etk", + "ethread-tools", + "echrono", + "ememory" + ] +} \ No newline at end of file diff --git a/lutin_ethread-tools.py b/lutin_ethread-tools.py deleted file mode 100644 index e83ea73..0000000 --- a/lutin_ethread-tools.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "Ewol thread tools" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def get_version(): - return "version.txt" - -def configure(target, my_module): - my_module.add_extra_flags() - # add the file to compile: - my_module.add_src_file([ - 'ethread/tools.cpp', - ]) - - my_module.add_header_file([ - 'ethread/tools.hpp', - 'ethread/Thread.hpp', - 'ethread/Mutex.hpp', - 'ethread/MutexRecursive.hpp', - 'ethread/Semaphore.hpp', - ]) - - if "Windows" in target.get_type(): - my_module.add_src_file([ - 'ethread/Mutex.Windows.cpp', - 'ethread/MutexRecursive.Windows.cpp', - 'ethread/Thread.Windows.cpp', - 'ethread/Semaphore.Windows.cpp', - ]) - else: - my_module.add_src_file([ - 'ethread/Mutex.pthread.cpp', - 'ethread/MutexRecursive.pthread.cpp', - 'ethread/Thread.pthread.cpp', - 'ethread/Semaphore.pthread.cpp', - ]) - my_module.add_depend([ - 'pthread', - ]) - # build in C++ mode - my_module.compile_version("c++", 2011) - # add dependency of the generic C++ library: - my_module.add_depend([ - 'etk-core', - ]) - #pthread is not availlable on Windows - if "Linux" in target.get_type() \ - or "Android" in target.get_type(): - my_module.add_depend([ - 'pthread' - ]) - - return True - - diff --git a/lutin_ethread.py b/lutin_ethread.py deleted file mode 100644 index 8137da5..0000000 --- a/lutin_ethread.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "Ewol thread" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def get_version(): - return "version.txt" - -def configure(target, my_module): - my_module.add_extra_flags() - # add the file to compile: - my_module.add_src_file([ - 'ethread/debug.cpp', - 'ethread/Future.cpp', - 'ethread/Promise.cpp', - 'ethread/Pool.cpp', - 'ethread/PoolAction.cpp', - 'ethread/PoolExecutor.cpp', - ]) - - my_module.add_header_file([ - 'ethread/Future.hpp', - 'ethread/Promise.hpp', - 'ethread/Pool.hpp', - 'ethread/PoolAction.hpp', - 'ethread/PoolExecutor.hpp', - ]) - - # build in C++ mode - my_module.compile_version("c++", 2011) - # add dependency of the generic C++ library: - my_module.add_depend([ - 'elog', - 'etk', - 'ethread-tools', - 'echrono', - 'ememory' - ]) - return True - -