refactor with LuaExpat

.gitlab-ci.yml

@@ -9,7 +9,7 @@ build:
   before_script:
     - apt update
     - apt -y install libsystemd0 libsystemd-dev
-    - apt -y install cmake lua-unit libmxml1 libmxml-dev lua-compat53-dev
+    - apt -y install cmake lua-unit lua-expat lua-compat53-dev
     - apt -y install luajit libluajit-5.1-dev
     - apt -y install lua5.1 liblua5.1-dev
     - apt -y install lua5.2 liblua5.2-dev

CMakeLists.txt

@@ -7,7 +7,6 @@ include(GNUInstallDirs)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(SYSTEMD REQUIRED libsystemd>=242)
-pkg_check_modules(MXML REQUIRED mxml)
 
 set(CONFIG_LUA_VER "" CACHE STRING "build for exact Lua version")
 
@@ -38,7 +37,7 @@ if( "${LUA_VER}" STREQUAL "5.1" OR "${LUA_VER}" STREQUAL "5.2" )
   cmake_path(GET COMPAT53 PARENT_PATH COMPAT53_DIR)
 endif()
 
-set(LSDBUS_SRCS src/lsdbus.c src/message.c src/introspect.c src/evl.c src/vtab.c)
+set(LSDBUS_SRCS src/lsdbus.c src/message.c src/evl.c src/vtab.c)
 
 set(LSDBUS_INST_DIR
   ${CMAKE_INSTALL_PREFIX}/lib/lua/${LUA_VER}/lsdbus/)
@@ -47,7 +46,7 @@ add_library(core SHARED ${LSDBUS_SRCS})
 target_compile_options(core PRIVATE -Wall -Wextra)
 target_compile_definitions(core PRIVATE LIBSYSTEMD_VERSION=${SYSTEMD_VERSION})
 target_include_directories(core PRIVATE ${LUA_INCLUDE_DIRS} ${COMPAT53_DIR})
-target_link_libraries(core ${SYSTEMD_LIBRARIES} ${MXML_LIBRARIES} )
+target_link_libraries(core ${SYSTEMD_LIBRARIES})
 set_target_properties(core PROPERTIES PREFIX "")
 install(TARGETS core LIBRARY DESTINATION ${LSDBUS_INST_DIR})
 

README.md

@@ -49,7 +49,7 @@ and sd-event APIs.
 First, ensure that the correct packages are installed. For example:
 
 ```sh
-$ sudo apt-get install cmake lua5.3 liblua5.3-dev libsystemd-dev libmxml-dev
+$ sudo apt-get install cmake lua5.3 liblua5.3-dev libsystemd-dev lua-expat
 ```
 
 To run the tests, install `lua-unit` or install it directly from here

lsdbus-scm-0.rockspec

@@ -16,6 +16,7 @@ source = {
 
 dependencies = {
    "lua >= 5.1",
+   "luaexpat >= 1.3.0",
    "compat53 >= 0.5", -- only for lua < 5.3
 }
 

src/lsdbus.c

@@ -564,8 +564,6 @@ static int lsdbus_bus_gc(lua_State *L)
 
 static const luaL_Reg lsdbus_f [] = {
 	{ "open", lsdbus_open },
-	{ "xml_fromfile", lsdbus_xml_fromfile },
-	{ "xml_fromstr", lsdbus_xml_fromstr },
 	/* { "testmsg_tolua", lsdbus_testmsg_tolua }, */
 	{ NULL, NULL },
 };

src/lsdbus.h

@@ -91,9 +91,6 @@ struct lsdbus_slot* __lsdbus_slot_push(lua_State *L, sd_bus_slot *slot, uint32_t
 int lsdbus_slot_push(lua_State *L, sd_bus_slot *slot, uint32_t flags);
 void init_reg_vtab_user(lua_State *L);
 
-int lsdbus_xml_fromfile(lua_State *L);
-int lsdbus_xml_fromstr(lua_State *L);
-
 void regtab_store(lua_State *L, const char* regtab, void *k, int funidx);
 int regtab_get(lua_State *L, const char* regtab, void *k);
 void regtab_clear(lua_State *L, const char* regtab, void *k);