[DEV] uptate new lutin declaration model

This commit is contained in:
Edouard DUPIN 2021-10-25 07:51:48 +02:00
parent f59da3a903
commit 8e27ddbbfd
19 changed files with 221 additions and 378 deletions

5
.gitignore vendored
View File

@ -1,3 +1,8 @@
__pycache__
.bck
out
target
build
###################################
# folders

View File

@ -0,0 +1,21 @@
{
"type":"BINARY",
"sub-type":"SAMPLE",
"group-id":"com.atria-soft",
"description":"e-net TEST test software for enet",
"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-client-http.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

View File

@ -0,0 +1,21 @@
{
"type":"BINARY",
"sub-type":"SAMPLE",
"group-id":"com.atria-soft",
"description":"e-net TEST test software for enet",
"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-client-websocket.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

22
GLD_enet-test-client.json Normal file
View File

@ -0,0 +1,22 @@
{
"type":"BINARY",
"sub-type":"SAMPLE",
"group-id":"com.atria-soft",
"description":"e-net TEST test software for enet",
"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-client.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

View File

@ -0,0 +1,21 @@
{
"type":"BINARY",
"sub-type":"SAMPLE",
"group-id":"com.atria-soft",
"description":"e-net TEST test software for enet",
"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-server-http.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

View File

@ -0,0 +1,21 @@
{
"type":"BINARY",
"sub-type":"SAMPLE",
"group-id":"com.atria-soft",
"description":"e-net TEST test software for enet",
"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-server-websocket.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

21
GLD_enet-test-server.json Normal file
View File

@ -0,0 +1,21 @@
{
"type":"BINARY",
"sub-type":"SAMPLE",
"group-id":"com.atria-soft",
"description":"e-net TEST test software for enet",
"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-server.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

22
GLD_enet-test.json Normal file
View File

@ -0,0 +1,22 @@
{
"type":"BINARY",
"sub-type":"TEST",
"group-id":"com.atria-soft",
"description":"e-net TEST basic backend",
"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-test.cpp",
"test/main-unit-pourcentEncoding.cpp"
],
"dependency": [
"enet",
"etest",
"test-debug"
]
}

56
GLD_enet.json Normal file
View File

@ -0,0 +1,56 @@
{
"type":"LIBRARY",
"group-id":"com.atria-soft",
"description":"Algorithm generic",
"license":"MPL-2",
"license-file":"file://LICENCE.txt",
"maintainer":"file://authors.txt",
"author":"file://authors.txt",
"version":"file://version.txt",
"code-quality":"MEDIUM",
"source": [
"enet/debug.cpp",
"enet/enet.cpp",
"enet/Udp.cpp",
"enet/Tcp.cpp",
"enet/TcpServer.cpp",
"enet/TcpClient.cpp",
"enet/Http.cpp",
"enet/Ftp.cpp",
"enet/WebSocket.cpp",
"enet/pourcentEncoding.cpp"
],
"header": [
"enet/enet.hpp",
"enet/debug.hpp",
"enet/Udp.hpp",
"enet/Tcp.hpp",
"enet/TcpServer.hpp",
"enet/TcpClient.hpp",
"enet/Http.hpp",
"enet/Ftp.hpp",
"enet/WebSocket.hpp",
"enet/pourcentEncoding.hpp"
],
"path":[
"."
],
"compilation-version": {
"language": "c++",
"version": 2017
},
"dependency": [
"etk",
"ememory",
"algue",
"ethread"
],
"target": {
"windows":{
"dependency": [
"ws2"
]
}
}
}

View File

@ -443,6 +443,7 @@ void enet::Http::getHeader() {
}
}
//parse first element:
ENET_INFO("Request: " << list[0]);
etk::Vector<etk::String> listLineOne = etk::split(list[0], ' ');
if (listLineOne.size() < 2) {
ENET_ERROR("can not parse answear : " << listLineOne);
@ -481,6 +482,10 @@ void enet::Http::getHeader() {
m_requestHeader.setQuery(pourcentUriDecode(basicUri.extract(pos+1)));
}
// Get http version:
while ( m_requestHeader.getUri().size() > 0
&& m_requestHeader.getUri()[0] == '/') {
m_requestHeader.setUri(m_requestHeader.getUri().extract(1));
}
enum enet::HTTPProtocol valueProtocol;
etk::from_string(valueProtocol, listLineOne[2]);
m_requestHeader.setProtocol(valueProtocol);
@ -730,6 +735,10 @@ enet::HttpAnswer::HttpAnswer(enum HTTPAnswerCode _code, const etk::String& _help
}
etk::String enet::HttpAnswer::getAutoData() const {
return "<html><head></head></body><br/><br/><br/><center><b>" + etk::toString(m_what) + ": " + getProtocolName()[m_what] + "</b></center></body></html>";
}
void enet::HttpAnswer::display() const {
ENET_PRINT("display header 'Answer' ");
ENET_PRINT(" protocol=" << m_protocol);
@ -841,4 +850,4 @@ etk::Stream& enet::operator <<(etk::Stream& _os, enum enet::HTTPAnswerCode _obj)
etk::Stream& enet::operator <<(etk::Stream& _os, enum enet::HTTPReqType _obj) {
_os << "enet::HTTPReqType::" << etk::toString(_obj);
return _os;
}
}

View File

@ -165,6 +165,7 @@ namespace enet {
const etk::String& getHelp() const {
return m_helpMessage;
}
etk::String getAutoData() const;
};
enum class HTTPReqType {
HTTP_GET,

View File

@ -1,44 +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 "e-net TEST test software for enet"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-client-http.cpp'
])
return True

View File

@ -1,44 +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 "e-net TEST test software for enet"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-client-websocket.cpp'
])
return True

View File

@ -1,44 +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 "e-net TEST test software for enet"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-client.cpp'
])
return True

View File

@ -1,44 +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 "e-net TEST test software for enet"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-server-http.cpp'
])
return True

View File

@ -1,44 +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 "e-net TEST test software for enet"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-server-websocket.cpp'
])
return True

View File

@ -1,44 +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 "e-net TEST test software for enet"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-server.cpp'
])
return True

View File

@ -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 "e-net TEST basic backend"
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 configure(target, my_module):
my_module.add_path(".")
my_module.add_depend([
'enet',
'etest',
'test-debug'
])
my_module.add_src_file([
'test/main-test.cpp',
'test/main-unit-pourcentEncoding.cpp'
])
return True

View File

@ -1,68 +0,0 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.tools as tools
def get_type():
return "LIBRARY"
def get_desc():
return "TCP/UDP/HTTP/FTP interface"
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_depend([
'etk',
'ememory',
'algue',
'ethread'
])
my_module.add_path(".")
my_module.add_src_file([
'enet/debug.cpp',
'enet/enet.cpp',
'enet/Udp.cpp',
'enet/Tcp.cpp',
'enet/TcpServer.cpp',
'enet/TcpClient.cpp',
'enet/Http.cpp',
'enet/Ftp.cpp',
'enet/WebSocket.cpp',
'enet/pourcentEncoding.cpp',
])
my_module.add_header_file([
'enet/enet.hpp',
'enet/debug.hpp',
'enet/Udp.hpp',
'enet/Tcp.hpp',
'enet/TcpServer.hpp',
'enet/TcpClient.hpp',
'enet/Http.hpp',
'enet/Ftp.hpp',
'enet/WebSocket.hpp',
'enet/pourcentEncoding.hpp',
])
if "Windows" in target.get_type():
my_module.add_depend("ws2");
return True