Move device files into subfolders (first: devices/mqtt).

2024-04-03 21:57:42 +02:00
parent e29a32f24b
commit 5305aa7fe3
4 changed files with 13 additions and 4 deletions
--- a/apps/aqhome-mqttlog/xmlread.c
+++ b/apps/aqhome-mqttlog/xmlread.c
@@ -94,7 +94,7 @@ AQHMQTT_DEVICE_LIST *AqHomeMqttLog_ReadDataDeviceFiles(AQHOME_MQTT *aqh)
 {
  GWEN_STRINGLIST *sl;

-  sl=AQH_GetListOfMatchingDataFiles("aqhome/devices", "*.xml");
+  sl=AQH_GetListOfMatchingDataFiles("aqhome/devices/mqtt", "*.xml");
  if (sl) {
    AQHMQTT_DEVICE_LIST *deviceList;

--- a/devices/0BUILD
+++ b/devices/0BUILD
@@ -1,8 +1,9 @@
 <?xml?>

 <gwbuild>
-  <data dist="true" install="$(datadir)/aqhome/devices">
-    tasmota_plug.xml
-  </data>
+
+  <subdirs>
+    mqtt
+  </subdirs>

 </gwbuild>
--- a/devices/mqtt/0BUILD
+++ b/devices/mqtt/0BUILD
@@ -0,0 +1,8 @@
+<?xml?>
+
+<gwbuild>
+  <data dist="true" install="$(datadir)/aqhome/devices/mqtt">
+    tasmota_plug.xml
+  </data>
+
+</gwbuild>
--- a/devices/mqtt/tasmota_plug.xml
+++ b/devices/mqtt/tasmota_plug.xml