From 869b35179bde6cf1cf48bb9f605d281a3b51e283 Mon Sep 17 00:00:00 2001 From: Chanchan Date: Tue, 31 Jan 2023 20:11:39 +0800 Subject: [PATCH] Use xmake in libwfkafka package (#1769) * update workflow(use xmake compile) * update workflow version * fix tab * remove extra space * mkdir install include dir * fix : update workflow latest xmake * remove unnecessary include * fix : change commit id * feat : use xmake in libwfkakfa --- packages/l/libwfkafka/xmake.lua | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/l/libwfkafka/xmake.lua b/packages/l/libwfkafka/xmake.lua index bbc5b4043..8ce881e4d 100644 --- a/packages/l/libwfkafka/xmake.lua +++ b/packages/l/libwfkafka/xmake.lua @@ -1,31 +1,25 @@ package("libwfkafka") set_homepage("https://github.com/sogou/workflow") - set_description("The Kafka Client of C++ Workflow") + set_description("C++ Parallel Computing and Asynchronous Networking Engine") set_license("Apache-2.0") add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version).tar.gz", "https://github.com/sogou/workflow.git") - add_versions("v0.9.11", "71b5531728d6b4f3666176dbc45d680350518af8") - add_versions("v0.10.1", "315eb1b1b5411e807e5ecc45ba5aa7db1d4f7c28") - add_versions("v0.10.2", "42d87f4f9eaa80e882ccdd71cd81d20899050266") - add_versions("v0.10.3", "116e6772cd13b88a3fb8420bcfbef98921252a1a") - add_versions("v0.10.4", "83d6346ca2c1bcd003f67100a4c77418f8acfed5") - add_versions("v0.10.5", "4216034831c142bb9be9a9ca781dea737c606919") - - add_deps("cmake", "openssl", "workflow", "lz4", "zstd", "snappy", "zlib") + add_versions("v0.10.6", "20d2177dda391676235687b03980eb50e9ea11dd") + + add_deps("openssl", "workflow", "lz4", "zstd", "snappy", "zlib") if is_plat("linux") then add_syslinks("pthread", "dl") end - add_links("wfkafka") - - on_install("linux", "macosx", function (package) - local configs = {"-DKAFKA=y"} - table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release")) - table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF")) + on_install("linux", "macosx", "android", function (package) + local configs = {} + if package:config("shared") then + configs.kind = "shared" + end local packagedeps = {"workflow", "lz4", "zstd", "snappy", "zlib"} - import("package.tools.cmake").install(package, configs, {packagedeps = packagedeps}) + import("package.tools.xmake").install(package, configs, {packagedeps = packagedeps}) if package:config("shared") then os.tryrm(path.join(package:installdir("lib"), "*.a")) else @@ -37,3 +31,4 @@ package("libwfkafka") on_test(function (package) assert(package:has_cxxtypes("protocol::KafkaToppar", {configs = {languages = "c++11"}, includes = "workflow/KafkaMessage.h"})) end) +