소스 검색

Use workflow xmake.lua to compile (#1750)

* 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
Chanchan 2 년 전
부모
커밋
d56ac68650
1개의 변경된 파일5개의 추가작업 그리고 18개의 파일을 삭제
  1. 5 18
      packages/w/workflow/xmake.lua

+ 5 - 18
packages/w/workflow/xmake.lua

@@ -5,14 +5,9 @@ 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.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_versions("v0.10.6", "654fe336ebaa8e715aff1975e3276bb5fd637529")
 
-    add_deps("cmake", "openssl")
+    add_deps("openssl")
 
     if is_plat("linux") then
         add_syslinks("pthread", "dl")
@@ -20,25 +15,17 @@ package("workflow")
 
     on_install("linux", "macosx", "android", function (package)
         local configs = {}
-        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"))
-        if package:is_plat("android") then
-            io.replace("src/CMakeLists.txt", "add_subdirectory(client)", "add_subdirectory(client)\nlink_libraries(ssl crypto)", {plain = true})
-        end
-        import("package.tools.cmake").install(package, configs, {packagedeps = "openssl"})
         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"))
+            configs.kind = "shared"
         end
+        import("package.tools.xmake").install(package, configs)
     end)
 
     on_test(function (package)
         assert(package:check_cxxsnippets({test = [[
         #include <stdio.h>
         #include "workflow/WFHttpServer.h"
-        static void test() {
+        void test() {
             WFHttpServer server([](WFHttpTask *task) {
                 task->get_resp()->append_output_body("<html>Hello World!</html>");
             });