VDV: embed vdv452.xml if EMBED_RESOURCE_FILES

Author: rouault

ogr/ogrsf_frmts/vdv/CMakeLists.txt

@@ -2,10 +2,21 @@ add_gdal_driver(TARGET ogr_VDV SOURCES ogr_vdv.h ogrvdvdatasource.cpp PLUGIN_CAP
 gdal_standard_includes(ogr_VDV)
 
 set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/vdv452.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/data/vdv452.xsd
 )
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    list(APPEND GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/vdv452.xml
+    )
+endif()
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
   APPEND
   PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_VDV OGR_ENABLE_DRIVER_VDV_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_VDV PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()

ogr/ogrsf_frmts/vdv/embedded_resources.c

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char vdv452_xml[] = {
+#embed "data/vdv452.xml"
+    , 0};
+
+const char *VDVGet452XML(void)
+{
+    return vdv452_xml;
+}

ogr/ogrsf_frmts/vdv/embedded_resources.h

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *VDVGet452XML(void);
+
+CPL_C_END

ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp

@@ -15,6 +15,10 @@
 #include "cpl_time.h"
 #include <map>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #ifndef STARTS_WITH_CI
 #define STARTS_WITH(a, b) (strncmp(a, b, strlen(b)) == 0)
 #define STARTS_WITH_CI(a, b) EQUALN(a, b, strlen(b))
@@ -1702,14 +1706,34 @@ static bool OGRVDVWriteHeader(VSILFILE *fpL, CSLConstList papszOptions)
 
 static bool OGRVDVLoadVDV452Tables(OGRVDV452Tables &oTables)
 {
+    CPLXMLNode *psRoot = nullptr;
+#if defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    const char *pszXMLDescFilename = nullptr;
+#else
     const char *pszXMLDescFilename = CPLFindFile("gdal", "vdv452.xml");
-    if (pszXMLDescFilename == nullptr)
+#endif
+    if (pszXMLDescFilename == nullptr ||
+        EQUAL(pszXMLDescFilename, "vdv452.xml"))
     {
+#ifdef EMBED_RESOURCE_FILES
+        static const bool bOnce [[maybe_unused]] = []()
+        {
+            CPLDebug("VDV", "Using embedded vdv452.xml");
+            return true;
+        }();
+        psRoot = CPLParseXMLString(VDVGet452XML());
+#else
         CPLDebug("VDV", "Cannot find XML file : %s", "vdv452.xml");
         return false;
+#endif
     }
 
-    CPLXMLNode *psRoot = CPLParseXMLFile(pszXMLDescFilename);
+#ifdef EMBED_RESOURCE_FILES
+    if (!psRoot)
+#endif
+    {
+        psRoot = CPLParseXMLFile(pszXMLDescFilename);
+    }
     if (psRoot == nullptr)
     {
         return false;