Merge pull request zerebubuth#376 from mmd-osm/patch/staticxml2

Drop support for staticxml backend in production code

Author: mmd-osm

openstreetmap-cgimap.1

@@ -88,10 +88,6 @@ FCGI port number (e.g. 8000) to listen on. This option is for backwards compatib
 .TP
 .BR \-\-socket =\fISOCKET\fR
 FCGI port number (e.g. :8000) or UNIX socket to listen on.
-.TP
-.BR \-\-backend =\fIBACKEND\fR
-Backend to use, available options are: apidb, staticxml.
-Default is apidb.
 .SS ApiDB backend options
 .TP
 .BR \-\-dbname =\fIDBNAME\fR
@@ -155,7 +151,4 @@ Database character set to use for API write operations, if different from \-\-ch
 .TP
 .BR \-\-update\-dbport =\fIUPDATEPORT\fR
 Database port number or UNIX socket file name to use for API write operations, if different from \-\-dbport.
-.SS Static XML backend options:
-.TP
-.BR \-\-file =\fIFILE\fR
-File to load static OSM XML from.
+

src/CMakeLists.txt

@@ -99,4 +99,4 @@ target_link_libraries(cgimap_fcgi
 
 
 add_subdirectory(backend/apidb)
-add_subdirectory(backend/staticxml)
+

src/backend/staticxml/CMakeLists.txt

@@ -53,8 +53,6 @@ using namespace std::chrono_literals;
 #include "cgimap/backend/apidb/apidb.hpp"
 #endif
 
-#include "cgimap/backend/staticxml/staticxml.hpp"
-
 namespace po = boost::program_options;
 
 namespace {
@@ -295,7 +293,6 @@ void setup_backends() {
 #if ENABLE_APIDB
   register_backend(make_apidb_backend());
 #endif
-  register_backend(make_staticxml_backend());
 }
 
 

src/main.cpp

@@ -3,6 +3,22 @@
 ############
 if(BUILD_TESTING)
 
+    ##################
+    # cgimap_staticxml
+    ##################
+    add_library(cgimap_staticxml)
+
+    target_include_directories(cgimap_staticxml PUBLIC
+        .)
+
+    target_sources(cgimap_staticxml PRIVATE
+        staticxml.cpp)
+
+    target_link_libraries(cgimap_staticxml
+        cgimap_common_compiler_options
+        LibXml2::LibXml2
+        cgimap_core)
+
     ###########
     # test_core
     ###########

test/CMakeLists.txt

@@ -7,7 +7,7 @@
  * For a full list of authors see the git log.
  */
 
-#include "cgimap/backend/staticxml/staticxml.hpp"
+#include "staticxml.hpp"
 #include "cgimap/backend.hpp"
 #include "cgimap/output_formatter.hpp"
 #include "cgimap/api06/id_version.hpp"

src/backend/staticxml/staticxml.cpp test/staticxml.cpp

@@ -9,9 +9,9 @@
 
 #include "cgimap/process_request.hpp"
 #include "cgimap/output_buffer.hpp"
-#include "cgimap/backend/staticxml/staticxml.hpp"
 #include "cgimap/request_helpers.hpp"
 #include "cgimap/time.hpp"
+#include "staticxml.hpp"
 
 #include <boost/program_options.hpp>
 #include <fmt/core.h>