Explorar el Código

add libwfkafka (#939)

* update workflow

* fix zstd

* add zlib
ruki hace 3 años
padre
commit
7bb210996c
Se han modificado 3 ficheros con 36 adiciones y 10 borrados
  1. 34 0
      packages/l/libwfkafka/xmake.lua
  2. 1 9
      packages/w/workflow/xmake.lua
  3. 1 1
      packages/z/zstd/xmake.lua

+ 34 - 0
packages/l/libwfkafka/xmake.lua

@@ -0,0 +1,34 @@
+package("libwfkafka")
+    set_homepage("https://github.com/sogou/workflow")
+    set_description("C++ Workflow's Kafka Client")
+    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.10", "7a0a9b184a6baa745235fc8b0cb59f6289111049b14f38657379ad6c029e6aaa")
+
+    add_deps("cmake", "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"))
+        local packagedeps = {"workflow", "lz4", "zstd", "snappy", "zlib"}
+        import("package.tools.cmake").install(package, configs, {packagedeps = packagedeps})
+        if package:config("shared") then
+            os.tryrm(path.join(package:installdir("lib"), "*.a"))
+        else
+            os.tryrm(path.join(package:installdir("lib"), "*.so"))
+            os.tryrm(path.join(package:installdir("lib"), "*.dylib"))
+        end
+    end)
+
+    on_test(function (package)
+        assert(package:has_cxxtypes("protocol::KafkaToppar", {configs = {languages = "c++11"}, includes = "workflow/KafkaMessage.h"}))
+    end)

+ 1 - 9
packages/w/workflow/xmake.lua

@@ -5,9 +5,7 @@ package("workflow")
 
     add_urls("https://github.com/sogou/workflow/archive/refs/tags/$(version).tar.gz",
              "https://github.com/sogou/workflow.git")
-    add_versions("v0.9.10", "90cab0cb9a7567ac56a39ae2361d2dc1f4c3ee7b")
-
-    add_configs("kafka", {description = "Use kafka protocol", default = false})
+    add_versions("v0.9.10", "7a0a9b184a6baa745235fc8b0cb59f6289111049b14f38657379ad6c029e6aaa")
 
     add_deps("cmake", "openssl")
 
@@ -15,12 +13,6 @@ package("workflow")
         add_syslinks("pthread", "dl")
     end
 
-    on_load(function(package)
-        if package:config("kafka") then
-            package:add("deps", "lz4", "zstd", "snappy")
-        end
-    end )
-
     on_install("linux", "macosx", "android", function (package)
         local configs = {}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))

+ 1 - 1
packages/z/zstd/xmake.lua

@@ -16,7 +16,7 @@ package("zstd")
                 add_files("lib/common/*.c")
                 add_files("lib/compress/*.c")
                 add_files("lib/decompress/*.c")
-                add_headerfiles("lib/zstd.h")
+                add_headerfiles("lib/*.h")
                 add_defines("XXH_NAMESPACE=ZSTD_")
                 if is_kind("shared") and is_plat("windows") then
                     add_defines("ZSTD_DLL_EXPORT")