From 634dfba75bc4b34a9c9bce36139b318b7c74552b Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 25 Oct 2021 07:49:34 +0200 Subject: [PATCH] [DEV] uptate new lutin declaration model --- .gitignore | 5 ++ GLD_egami-sample.json | 22 ++++++++ GLD_egami-test.json | 28 +++++++++ GLD_egami.json | 91 ++++++++++++++++++++++++++++++ lutin_egami-sample.py | 45 --------------- lutin_egami-test.py | 45 --------------- lutin_egami.py | 88 ----------------------------- tools/cutter/GLD_egami-cutter.json | 20 +++++++ tools/cutter/lutin_egami-cutter.py | 46 --------------- tools/viewer/GLD_egami-viewer.json | 24 ++++++++ tools/viewer/lutin_egami-viewer.py | 61 -------------------- 11 files changed, 190 insertions(+), 285 deletions(-) create mode 100644 GLD_egami-sample.json create mode 100644 GLD_egami-test.json create mode 100644 GLD_egami.json delete mode 100644 lutin_egami-sample.py delete mode 100644 lutin_egami-test.py delete mode 100644 lutin_egami.py create mode 100755 tools/cutter/GLD_egami-cutter.json delete mode 100755 tools/cutter/lutin_egami-cutter.py create mode 100755 tools/viewer/GLD_egami-viewer.json delete mode 100755 tools/viewer/lutin_egami-viewer.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_egami-sample.json b/GLD_egami-sample.json new file mode 100644 index 0000000..12e340f --- /dev/null +++ b/GLD_egami-sample.json @@ -0,0 +1,22 @@ +{ + "type":"BINARY", + "sub-type":"SAMPLE", + "group-id":"com.atria-soft", + "description":"Test software for egami", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "code-quality":"MEDIUM", + + "source": [ + "sample/main.cpp", + "sample/read.cpp", + "sample/write.cpp" + ], + "dependency": [ + "egami", + "test-debug" + ] +} \ No newline at end of file diff --git a/GLD_egami-test.json b/GLD_egami-test.json new file mode 100644 index 0000000..3f50631 --- /dev/null +++ b/GLD_egami-test.json @@ -0,0 +1,28 @@ +{ + "type":"BINARY", + "sub-type":"TEST", + "group-id":"com.atria-soft", + "description":"Test software for egami", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "code-quality":"MEDIUM", + + "source": [ + "test/main.cpp" + ], + "dependency": [ + "egami", + "etest", + "test-debug", + "algue" + ], + "copy": [ + { + "path":"data/*", + "to":"" + } + ] +} \ No newline at end of file diff --git a/GLD_egami.json b/GLD_egami.json new file mode 100644 index 0000000..a000c50 --- /dev/null +++ b/GLD_egami.json @@ -0,0 +1,91 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"Image generator from multiple image type", + "license":"MPL-2", + "license-file":"file://LICENCE.txt", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "code-quality":"MEDIUM", + + "source": [ + "egami/Image.cpp", + "egami/ImageMono.cpp", + "egami/egami.cpp", + "egami/debug.cpp", + "egami/wrapperBMP.cpp", + "egami/wrapperEDF.cpp" + ], + "header": [ + "egami/Image.hpp", + "egami/ImageMono.hpp", + "egami/egami.hpp" + ], + "path":[ + "." + ], + "compilation-version": { + "language": "c++", + "version": 2017 + }, + "flag": [ + { + "language": "c++", + "value": [ + "-DPROJECT_NAME=\"{{{project.name}}}\"", + "-DAPPL_VERSION=\"{{{project.version}}}\"" + ] + } + ], + "dependency": [ + "etk", + "edtaa3", + { + "name": "png", + "optional": true, + "export": true, + "flag": { + "language": "c++", + "value": "-DEGAMI_BUILD_PNG" + }, + "source": "egami/wrapperPNG.cpp" + },{ + "name": "esvg", + "optional": true, + "export": true, + "flag": { + "language": "c++", + "value": "-DEGAMI_BUILD_ESVG" + }, + "source": "egami/wrapperSVG.cpp" + },{ + "name": "jpeg", + "optional": true, + "export": true, + "flag": { + "language": "c++", + "value": "-DEGAMI_BUILD_JPEG" + }, + "source": "egami/wrapperJPG.cpp" + },{ + "name": "openjpeg", + "optional": true, + "export": true, + "flag": { + "language": "c++", + "value": "-DEGAMI_BUILD_JPEG2000" + }, + "source": "egami/wrapperJPG2000.cpp" + },{ + "name": "tiff", + "optional": true, + "export": true, + "flag": { + "language": "c++", + "value": "-DEGAMI_BUILD_TIFF" + }, + "source": "egami/wrapperTIFF.cpp" + } + ] +} diff --git a/lutin_egami-sample.py b/lutin_egami-sample.py deleted file mode 100644 index 2e98783..0000000 --- a/lutin_egami-sample.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TEST" - -def get_desc(): - return "Test software for egami" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - my_module.add_depend([ - 'egami', - 'test-debug' - ]) - my_module.add_src_file([ - 'sample/main.cpp', - 'sample/read.cpp', - 'sample/write.cpp' - ]) - my_module.copy_path('data/*') - return True - - - - - - - diff --git a/lutin_egami-test.py b/lutin_egami-test.py deleted file mode 100644 index c30ab71..0000000 --- a/lutin_egami-test.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TEST" - -def get_desc(): - return "Test software for egami" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - my_module.add_depend([ - 'egami', - 'etest', - 'test-debug', - 'algue', - ]) - my_module.add_src_file([ - 'test/main.cpp' - ]) - my_module.copy_path('data/*') - return True - - - - - - - diff --git a/lutin_egami.py b/lutin_egami.py deleted file mode 100644 index f809b3f..0000000 --- a/lutin_egami.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "image generator from multiple image type" - -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() - my_module.add_src_file([ - 'egami/Image.cpp', - 'egami/ImageMono.cpp', - 'egami/egami.cpp', - 'egami/debug.cpp', - 'egami/wrapperBMP.cpp', - 'egami/wrapperEDF.cpp' - ]) - my_module.add_header_file([ - 'egami/Image.hpp', - 'egami/ImageMono.hpp', - 'egami/egami.hpp', - ]) - my_module.add_depend([ - 'etk', - 'edtaa3' - ]) - my_module.add_flag('c++', [ - '-Wno-write-strings', - '-Wall' - ]) - my_module.add_optionnal_depend( - 'png', - ["c++", "-DEGAMI_BUILD_PNG"], - src_file=[ - 'egami/wrapperPNG.cpp', - ] - ) - my_module.add_optionnal_depend( - 'esvg', - ["c++", "-DEGAMI_BUILD_ESVG"], - src_file=[ - 'egami/wrapperSVG.cpp', - ] - ) - my_module.add_optionnal_depend( - 'jpeg', - ["c++", "-DEGAMI_BUILD_JPEG"], - src_file=[ - 'egami/wrapperJPG.cpp', - ] - ) - my_module.add_optionnal_depend( - 'openjpeg', - ["c++", "-DEGAMI_BUILD_JPEG2000"], - src_file=[ - 'egami/wrapperJPG2000.cpp', - ] - ) - my_module.add_optionnal_depend( - 'tiff', - ["c++", "-DEGAMI_BUILD_TIFF"], - src_file=[ - 'egami/wrapperTIFF.cpp', - ] - ) - my_module.add_path(".") - return True - - diff --git a/tools/cutter/GLD_egami-cutter.json b/tools/cutter/GLD_egami-cutter.json new file mode 100755 index 0000000..b03e948 --- /dev/null +++ b/tools/cutter/GLD_egami-cutter.json @@ -0,0 +1,20 @@ +{ + "type":"BINARY", + "sub-type":"TOOL", + "group-id":"com.atria-soft", + "description":"Egami simple image cutter (bash tools)", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp" + ], + "dependency": [ + "egami" + ] +} \ No newline at end of file diff --git a/tools/cutter/lutin_egami-cutter.py b/tools/cutter/lutin_egami-cutter.py deleted file mode 100755 index 896efe9..0000000 --- a/tools/cutter/lutin_egami-cutter.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools -import os - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TOOL" - -def get_desc(): - return "egami simple image cutter (bash tools)" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - # add the file to compile: - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - ]) - - my_module.add_depend([ - 'egami', - ]) - - #my_module.copy_file('data/icon.png','icon.png') - - my_module.add_path(".") - - return True - - - - diff --git a/tools/viewer/GLD_egami-viewer.json b/tools/viewer/GLD_egami-viewer.json new file mode 100755 index 0000000..3a5720c --- /dev/null +++ b/tools/viewer/GLD_egami-viewer.json @@ -0,0 +1,24 @@ +{ + "type":"BINARY", + "sub-type":"TOOL", + "group-id":"com.atria-soft", + "description":"Egami simple image viewer (visual)", + "license":"MPL-2", + "license-file":"file://../../LICENCE.txt", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/init.cpp", + "appl/MainWindows.cpp" + ], + "dependency": [ + "ewol" + ], + "path":[ + "." + ] +} \ No newline at end of file diff --git a/tools/viewer/lutin_egami-viewer.py b/tools/viewer/lutin_egami-viewer.py deleted file mode 100755 index e883288..0000000 --- a/tools/viewer/lutin_egami-viewer.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools -import os - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TOOL" - -def get_desc(): - return "egami simple image viewer (visual)" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - # add the file to compile: - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/init.cpp', - 'appl/MainWindows.cpp', - ]) - - my_module.add_depend(['ewol']) - - my_module.copy_file('data/icon.png','icon.png') - - my_module.add_path(".") - - """ - # set the package properties : - my_module.pkg_set("VERSION", versionID) - my_module.pkg_set("COMPAGNY_TYPE", "org") - my_module.pkg_set("COMPAGNY_NAME", "Edouard DUPIN") - my_module.pkg_set("MAINTAINER", ["Mr DUPIN Edouard "]) - my_module.pkg_set("ICON", tools.get_current_path(__file__) + "/../data/icon.png") - my_module.pkg_set("SECTION", ["Development"]) - my_module.pkg_set("PRIORITY", "optional") - my_module.pkg_set("DESCRIPTION", "ewol test software") - my_module.pkg_set("NAME", "test software") - - my_module.pkg_add("RIGHT", "SET_ORIENTATION") - my_module.pkg_add("RIGHT", "VIBRATE") - """ - - return True - - - -