[DEV] update the model

This commit is contained in:
Edouard DUPIN 2021-10-28 23:56:18 +02:00
parent cdb88347ed
commit e98d901fa4
2 changed files with 108 additions and 22 deletions

View File

@ -9,4 +9,14 @@ encoding//lutin/multiprocess.py=utf-8
encoding//lutin/system.py=utf-8 encoding//lutin/system.py=utf-8
encoding//lutin/target.py=utf-8 encoding//lutin/target.py=utf-8
encoding//lutin/tools.py=utf-8 encoding//lutin/tools.py=utf-8
encoding//lutin/z_system/lutinSystem_IOs_c.py=utf-8
encoding//lutin/z_system/lutinSystem_Linux_c.py=utf-8
encoding//lutin/z_system/lutinSystem_Linux_cxx.py=utf-8 encoding//lutin/z_system/lutinSystem_Linux_cxx.py=utf-8
encoding//lutin/z_system/lutinSystem_Linux_egl.py=utf-8
encoding//lutin/z_system/lutinSystem_Linux_mysql.py=utf-8
encoding//lutin/z_system/lutinSystem_Linux_opengl.py=utf-8
encoding//lutin/z_target/lutinTarget_Android.py=utf-8
encoding//lutin/z_target/lutinTarget_Debian.py=utf-8
encoding//lutin/z_target/lutinTarget_IOs.py=utf-8
encoding//lutin/z_target/lutinTarget_MacOs.py=utf-8
encoding//lutin/z_target/lutinTarget_Windows.py=utf-8

View File

@ -54,7 +54,7 @@ list_of_property_module=[
"maintainer", "maintainer",
"version", "version",
"version-id", "version-id",
"extra-flag" "code-quality"
]; ];
list_of_element_ignored=[ list_of_element_ignored=[
@ -69,9 +69,12 @@ list_of_element_availlable=[
"dependency", "dependency",
"copy", "copy",
"flag", "flag",
"compilator", # todo
"mode", "mode",
"platform", "target",
"arch" "arch",
"bus-size", # todo
"sanity-compilation" # todo "isolate", "intricate", "*" permit to specify element to copy for the isolation mode. intricate is for current mode where everything is mixed together ...
]; ];
""" """
@ -85,10 +88,10 @@ list_of_element_availlable=[
"author":"file://../authors.txt", "author":"file://../authors.txt",
"version":"1.5.3", "version":"1.5.3",
"__version":"file://../version.txt", "__version":"file://../version.txt",
"extra-flag":"MEDIUM", "code-quality":"MEDIUM",
"mode": { "mode": {
"*": { "*": {
"platform": { "target": {
"*": { "*": {
"arch": { "arch": {
"*": {}, "*": {},
@ -101,10 +104,9 @@ list_of_element_availlable=[
}, },
"debug": { "debug": {
}
},
"source": { "source": [
"list":[
{ {
"source":"xxx/plop.cpp", "source":"xxx/plop.cpp",
"flag":[ "flag":[
@ -114,13 +116,27 @@ list_of_element_availlable=[
"xxx/Yyy.cpp", "xxx/Yyy.cpp",
"xxx/YuyTer.cpp" "xxx/YuyTer.cpp"
"xxx/plouf.java" "xxx/plouf.java"
] ],
"source": {
"c": [
...
],
"c++": [
...
],
"nasm": [
...
] ...
}, },
"header": { "header": [
"list": [
"xxx/Yyy.hpp", "xxx/Yyy.hpp",
"xxx/YuyTer.hpp" "xxx/YuyTer.hpp"
] ],
"header": {
"c": [
"xxx/Yyy.hpp",
"xxx/YuyTer.hpp"
]
}, },
"path":[ "path":[
"." "."
@ -138,14 +154,20 @@ list_of_element_availlable=[
... ...
]; ];
"mode": { "mode": {
"*": {
},
"debug": { "debug": {
}, },
"release": { "release": {
},
"coverage": {
} }
}, },
"platform": { "target": {
"*": { "*": {
}, },
@ -180,6 +202,9 @@ list_of_element_availlable=[
"value": "-DGALE_DOES_NOT_BUILD_X11" "value": "-DGALE_DOES_NOT_BUILD_X11"
} }
}, },
},
"Debian": { ## Debian/Ubuntu/Suze/RedHat/ArchLinux/Gento ... heritate from linux ...
}, },
"IOs": { "IOs": {
@ -196,19 +221,70 @@ list_of_element_availlable=[
}, },
} }
"arch": { "arch": {
"X86_32": { "x86": {
}, },
"X86_64": { "arm": {
}, },
"ARM-v9": { "ppc": {
}, }
"ARM_64": { "misc": {
} }
}, },
"bus-size": {
"*": {
},
"8": {
},
"16": {
},
"32": {
},
"64": {
},
"128": {
}
},
"compilator": {
"*": {
},
"gcc": {
},
"clang": {
},
"mingw": {
},
"msvc": {
},
"intel": {
}
},
"sanity-compilation": {
"*": {
},
"isolate": {
},
"intricate": {
}
}
} }
get_compilator get_compilator
@ -295,7 +371,7 @@ def parse_node_mode(target, path, json_path, my_module, data):
def parse_node_platform(target, path, json_path, my_module, data): def parse_node_platform(target, path, json_path, my_module, data):
for elem in data.keys(): for elem in data.keys():
if check_compatible("platform", elem, target.get_type(), json_path): if check_compatible("target", elem, target.get_type(), json_path):
parse_node_generic(target, path, json_path, my_module, data[elem]); parse_node_generic(target, path, json_path, my_module, data[elem]);
def parse_node_generic(target, path, json_path, my_module, data, first = False ): def parse_node_generic(target, path, json_path, my_module, data, first = False ):
@ -369,8 +445,8 @@ def parse_node_generic(target, path, json_path, my_module, data, first = False )
if "arch" in data.keys(): if "arch" in data.keys():
parse_node_arch(target, path, json_path, my_module, data["arch"]); parse_node_arch(target, path, json_path, my_module, data["arch"]);
if "platform" in data.keys(): if "target" in data.keys():
parse_node_platform(target, path, json_path, my_module, data["platform"]); parse_node_platform(target, path, json_path, my_module, data["target"]);
if "mode" in data.keys(): if "mode" in data.keys():
parse_node_mode(target, path, json_path, my_module, data["mode"]); parse_node_mode(target, path, json_path, my_module, data["mode"]);