[WIP]improve xmake port, add py-bind opt

Author: Willaaaaaaa

packages/d/dynareadout/port/xmake.lua

@@ -1,33 +1,16 @@
 set_project("dynareadout")
+add_rules("mode.debug", "mode.release")
 
-option("build_test")
-    set_default(false)
-    set_showmenu(true)
-
-option("build_cpp")
-    set_default(true)
-    set_showmenu(true)
-
-option("build_python")
-    set_default(false)
-    set_showmenu(true)
-    
-option("profiling")
-    set_default(false)
-    set_showmenu(true)
-    add_defines("PROFILING")
-option_end()
+option("build_cpp", {default = true})
+option("build_python", {default = false})
+option("profiling", {default = false, defines = "PROFILING"})
 
-add_rules("mode.debug", "mode.release")
 target("dynareadout")
     set_kind("$(kind)")
     set_languages("ansi")
-    if is_plat("linux") then
-        add_cflags("-fPIC")
-    end
     add_options("profiling")
     add_files("src/*.c")
-    if not get_config("profiling") then
+    if not has_config("profiling") then
         remove_files("src/profiling.c")
     end
     add_headerfiles("src/*.h")
@@ -36,16 +19,13 @@ target("dynareadout")
     end
 target_end()
 
-if get_config("build_cpp") or get_config("build_python") then
+if has_config("build_cpp", "build_python") then
     if is_plat("macosx") then
         add_requires("boost", {configs = {filesystem = true}})
     end
     target("dynareadout_cpp")
         set_kind("$(kind)")
         set_languages("cxx17")
-        if is_plat("linux") then
-            add_cxxflags("-fPIC")
-        end
         add_deps("dynareadout")
         add_includedirs("src")
         add_files("src/cpp/*.cpp")
@@ -59,48 +39,20 @@ if get_config("build_cpp") or get_config("build_python") then
     target_end()
 end
 
-if get_config("build_test") then
-    add_requires("doctest 2.4.8")
-    target("dynareadout_test")
-        set_kind("binary")
-        set_languages("cxx17")
-        add_deps("dynareadout")
-        if is_plat("linux") then
-            add_cxxflags("-fPIC")
-        end
-        if get_config("build_cpp") then
-            add_deps("dynareadout_cpp")
-            add_defines("BINOUT_CPP", "D3PLOT_CPP")
-            add_includedirs("src/cpp")
-        end
-        add_packages("doctest")
-        add_includedirs("src")
-        add_options("profiling")
-        add_files("test/*.cpp")
-    target_end()
-end
-
-if get_config("build_python") then
-    add_requires("python3", "pybind11")
+if has_config("build_python") then
+    add_requires("python 3.x", "pybind11")
     target("pybind11_module")
-        set_kind("shared")
         set_languages("cxx17")
-        if is_plat("linux") then
-            add_cxxflags("-fPIC")
-        end
         add_deps("dynareadout_cpp")
-        add_packages("pybind11")
+        add_packages("python", "pybind11")
+        add_rules("python.module")
         add_options("profiling")
         add_files("src/python/*.cpp")
         add_headerfiles("src/python/*.hpp")
         add_includedirs("src", "src/cpp")
         add_rpathdirs("@executable_path")
 
         on_load(function (target)
-            local ext_file = os.tmpfile()
-            os.execv("python3-config", {"--extension-suffix"}, {stdout=ext_file})
-            ext_name = io.readfile(ext_file)
-            ext_name = ext_name:gsub("%s+", "")
-            target:set("filename", "dynareadout" .. (is_mode("debug") and "_d" or "") .. ext_name)
+            target:set("filename", "dynareadout" .. (is_mode("debug") and "_d" or ""))
         end)
 end

packages/d/dynareadout/xmake.lua

@@ -6,11 +6,12 @@ package("dynareadout")
     add_urls("https://github.com/xmake-mirror/dynareadout/releases/download/$(version)/$(version).tar.gz")
     add_versions("24.07", "11138c1236f44434adf99ad86dc3315fcba17e59dd4b0ae0e6564972e2de12c5")
 
-    add_configs("cpp",         {description = "Build the C++ bindings",                       default = true,  type = "boolean"})
-    add_configs("profiling",   {description = "Build with profiling features",                default = true, type = "boolean"})
+    add_configs("cpp_bind",     {description = "Build the C++ bindings",        default = true,  type = "boolean"})
+    add_configs("profiling",    {description = "Build with profiling features", default = true,  type = "boolean"})
+    add_configs("python_bind",  {description = "Build the python bindings",     default = true, type = "boolean"})
 
     on_load(function (package)
-        if package:config("cpp") then
+        if package:config("cpp_bind") then
             package:add("links", "dynareadout_cpp", "dynareadout")
         else
             package:add("links", "dynareadout")
@@ -24,16 +25,17 @@ package("dynareadout")
         os.cd("lib/dynareadout")
         os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua")
         local configs = {}
-        configs.build_test = "n"
-        configs.build_cpp = package:config("cpp") and "y" or "n"
+        configs.build_cpp = package:config("cpp_bind") and "y" or "n"
         configs.profiling = package:config("profiling") and "y" or "n"
+        configs.build_python = package:config("python_bind") and "y" or "n"
         import("package.tools.xmake").install(package, configs)
+        wprint("The original repository PucklaJ/dynareadout is no longer public. You are using a mirror of this repository.")
     end)
 
     on_test(function (package)
         assert(package:has_cfuncs("binout_open", {includes = "binout.h", configs = {languages = "ansi"}}))
         assert(package:has_cfuncs("d3plot_open", {includes = "d3plot.h", configs = {languages = "ansi"}}))
-        if package:config("cpp") then
+        if package:config("cpp_bind") then
             assert(package:has_cxxtypes("dro::Binout", {includes = "binout.hpp", configs = {languages = "cxx17"}}))
             assert(package:has_cxxtypes("dro::D3plot", {includes = "d3plot.hpp", configs = {languages = "cxx17"}}))
             assert(package:has_cxxtypes("dro::Array<int32_t>",  {includes = {"array.hpp", "cstdint"}, configs = {languages = "cxx17"}}))