eswyft/homekit
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pio: fix libs paths

Browse Source
This commit is contained in:
Evgeny Zinoviev 2023-06-11 01:43:36 +03:00
parent 1215bbf102
commit 00b3cd120f
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pio/libs/main/library.json
View File

@ -1,12 +1,12 @@
{
"name": "homekit_main",
"version": "1.0.10",
"version": "1.0.11",
"build": {
"flags": "-I../../include"
},
"dependencies": {
"homekit_mqtt_module_ota": "file://../common/libs/mqtt_module_ota",
"homekit_mqtt_module_diagnostics": "file://../common/libs/mqtt_module_diagnostics"
"homekit_mqtt_module_ota": "file://../../include/pio/libs/mqtt_module_ota",
"homekit_mqtt_module_diagnostics": "file://../../include/pio/libs/mqtt_module_diagnostics"
}
}

4
include/pio/libs/mqtt_module_diagnostics/library.json
View File

@ -1,10 +1,10 @@
{
"name": "homekit_mqtt_module_diagnostics",
"version": "1.0.2",
"version": "1.0.3",
"build": {
"flags": "-I../../include"
},
"dependencies": {
"homekit_mqtt": "file://../common/libs/mqtt"
"homekit_mqtt": "file://../../include/pio/libs/mqtt"
}
}

6
include/pio/libs/mqtt_module_ota/library.json
View File

@ -1,11 +1,11 @@
{
"name": "homekit_mqtt_module_ota",
"version": "1.0.5",
"version": "1.0.6",
"build": {
"flags": "-I../../include"
},
"dependencies": {
"homekit_led": "file://../common/libs/led",
"homekit_mqtt": "file://../common/libs/mqtt"
"homekit_led": "file://../../include/pio/libs/led",
"homekit_mqtt": "file://../../include/pio/libs/mqtt"
}
}

6
include/pio/libs/mqtt_module_relay/library.json
View File

@ -1,11 +1,11 @@
{
"name": "homekit_mqtt_module_relay",
"version": "1.0.5",
"version": "1.0.6",
"build": {
"flags": "-I../../include"
},
"dependencies": {
"homekit_mqtt": "file://../common/libs/mqtt",
"homekit_relay": "file://../common/libs/relay"
"homekit_mqtt": "file://../../include/pio/libs/mqtt",
"homekit_relay": "file://../../include/pio/libs/relay"
}
}

4
include/pio/libs/mqtt_module_temphum/library.json
View File

@ -5,7 +5,7 @@
"flags": "-I../../include"
},
"dependencies": {
"homekit_mqtt": "file://../common/libs/mqtt",
"homekit_temphum": "file://../common/libs/temphum"
"homekit_mqtt": "file://../../include/pio/libs/mqtt",
"homekit_temphum": "file://../../include/pio/libs/temphum"
}
}

6
include/py/homekit/pio/products.py
View File

@ -89,8 +89,10 @@ def platformio_ini(product_config: dict,
buf.write(f'upload_port = {upload_port}\n')
buf.write(f'monitor_speed = {monitor_speed}\n')
if libs:
buf.write(f'lib_deps =')
buf.write(f'lib_deps =\n')
for lib in libs:
if lib.startswith('homekit_'):
lib = 'file://../../include/pio/libs/'+lib[8:]
buf.write(f' {lib}\n')
buf.write(f'build_flags =\n')
if defines:
@ -107,7 +109,7 @@ def platformio_ini(product_config: dict,
if type(value) is str and not is_enum:
buf.write('"\\"')
buf.write('\n')
buf.write(f' -I../common/include')
buf.write(f' -I../../include/pio/include')
buf.write(f'\nbuild_type = {build_type}')
return buf.getvalue()