Allow generation of build time data files in out-of-source builds. Also fix generation of data file for devices/mem24 subfolder

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/xml_to_data/device_xml_to_data.cpp b/src/xml_to_data/device_xml_to_data.cpp
index 5ad40a5..84d177f 100644
--- a/src/xml_to_data/device_xml_to_data.cpp
+++ b/src/xml_to_data/device_xml_to_data.cpp
@@ -241,10 +241,16 @@ Device::Package Device::XmlToDataBase::processPackage(TQDomElement element)
 void Device::XmlToDataBase::parse()
 {
   // process device files
-  TQStringList files = TQDir::current().entryList("*.xml");
+  TQStringList files;
+  TQDir xmlFilesDir;
+  if (!xmlFolder.isEmpty())
+  {
+    xmlFilesDir.setPath(xmlFolder);
+  }
+  files = xmlFilesDir.entryList("*.xml");
   for (uint i=0; i<uint(files.count()); i++) {
     _data = 0;
-    TQDomDocument doc = parseFile(files[i]);
+    TQDomDocument doc = parseFile(xmlFilesDir.absFilePath(files[i]));
     TQDomElement root = doc.documentElement();
     if ( root.nodeName()!="device" ) tqFatal("root node should be \"device\"");
     processDevice(root);