Browse Source

update re2 to 2023.11.01 (#2928)

* update re2 to 2023.11.01

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua
xpxz 1 year ago
parent
commit
60dc45280f
1 changed files with 38 additions and 11 deletions
  1. 38 11
      packages/r/re2/xmake.lua

+ 38 - 11
packages/r/re2/xmake.lua

@@ -10,6 +10,7 @@ package("re2")
     add_versions("2021.08.01", "cd8c950b528f413e02c12970dce62a7b6f37733d7f68807e73a2d9bc9db79bc8")
     add_versions("2021.08.01", "cd8c950b528f413e02c12970dce62a7b6f37733d7f68807e73a2d9bc9db79bc8")
     add_versions("2021.11.01", "8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669")
     add_versions("2021.11.01", "8c45f7fba029ab41f2a7e6545058d9eec94eef97ce70df58e92d85cfc08b4669")
     add_versions("2022.02.01", "9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27")
     add_versions("2022.02.01", "9c1e6acfd0fed71f40b025a7a1dabaf3ee2ebb74d64ced1f9ee1b0b01d22fd27")
+    add_versions("2023.11.01", "4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a")
 
 
     add_deps("cmake")
     add_deps("cmake")
 
 
@@ -17,23 +18,49 @@ package("re2")
         add_syslinks("pthread")
         add_syslinks("pthread")
     end
     end
 
 
+    on_load(function (package)
+        if package:version():eq("2023.11.01") then
+            if not package:is_plat("macosx", "linux", "windows", "mingw", "cross") then
+                raise("re2 2023.11.01 only support macosx linux windows mingw cross")
+            end
+            package:add("deps", "abseil")
+        end
+    end)
+
     on_install(function (package)
     on_install(function (package)
         local configs = {"-DRE2_BUILD_TESTING=OFF"}
         local configs = {"-DRE2_BUILD_TESTING=OFF"}
+        if package:version():eq("2023.11.01") then
+            table.insert(configs, "-DCMAKE_CXX_STANDARD=17")
+        end
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         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"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         import("package.tools.cmake").install(package, configs)
         import("package.tools.cmake").install(package, configs)
     end)
     end)
 
 
     on_test(function (package)
     on_test(function (package)
-        assert(package:check_cxxsnippets({test = [[
-            #include <string>
-            #include <cassert>
-            void test() {
-                int i;
-                std::string s;
-                assert(RE2::FullMatch("ruby:1234", "(\\w+):(\\d+)", &s, &i));
-                assert(s == "ruby");
-                assert(i == 1234);
-            }
-        ]]}, {configs = {languages = "c++11"}, includes = "re2/re2.h"}))
+        if package:version():eq("2023.11.01") then
+            assert(package:check_cxxsnippets({test = [[
+                #include <string>
+                #include <cassert>
+                void test() {
+                    int i;
+                    std::string s;
+                    assert(RE2::FullMatch("ruby:1234", "(\\w+):(\\d+)", &s, &i));
+                    assert(s == "ruby");
+                    assert(i == 1234);
+                }
+            ]]}, {configs = {languages = "c++17"}, includes = "re2/re2.h"}))
+        else
+            assert(package:check_cxxsnippets({test = [[
+                #include <string>
+                #include <cassert>
+                void test() {
+                    int i;
+                    std::string s;
+                    assert(RE2::FullMatch("ruby:1234", "(\\w+):(\\d+)", &s, &i));
+                    assert(s == "ruby");
+                    assert(i == 1234);
+                }
+            ]]}, {configs = {languages = "c++11"}, includes = "re2/re2.h"}))
+        end
     end)
     end)