star9029 1 anno fa
parent
commit
8b24cd9580

+ 5 - 4
packages/o/oatpp-openssl/xmake.lua

@@ -3,9 +3,10 @@ package("oatpp-openssl")
     set_description("It provides secure server and client connection providers for oatpp applications.")
     set_license("Apache-2.0")
 
-    add_urls("https://github.com/oatpp/oatpp-openssl/archive/$(version).tar.gz",
+    add_urls("https://github.com/oatpp/oatpp-openssl/archive/5925e8ba856fa71cda8937c4cb357508d4fdb3fb.tar.gz",
              "https://github.com/oatpp/oatpp-openssl.git")
-    add_versions("1.3.0", "5925e8ba856fa71cda8937c4cb357508d4fdb3fb")
+
+    add_versions("1.3.0", "540ab736ca8f7b8a89c23ad51655e038b59c6df8a08a60b95125843c9643a405")
 
     if is_plat("windows") then
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
@@ -22,7 +23,7 @@ package("oatpp-openssl")
 
     on_install("linux", "macosx", "windows|x64", function (package)
         local configs = {"-DOATPP_BUILD_TESTS=OFF"}
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         if package:is_plat("windows") then
             table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))
@@ -32,7 +33,7 @@ package("oatpp-openssl")
 
     on_test(function (package)
         assert(package:check_cxxsnippets({test = [[
-           #include "oatpp-openssl/server/ConnectionProvider.hpp"
+            #include "oatpp-openssl/server/ConnectionProvider.hpp"
             #include "oatpp-openssl/Config.hpp"
             #include "oatpp-openssl/configurer/TrustStore.hpp"
             void test() {

+ 3 - 2
packages/o/oatpp-websocket/xmake.lua

@@ -3,8 +3,9 @@ package("oatpp-websocket")
     set_description("It provides WebSocket functionality for oatpp applications.")
     set_license("Apache-2.0")
 
-    add_urls("https://github.com/oatpp/oatpp-websocket/archive/$(version).tar.gz",
+    add_urls("https://github.com/oatpp/oatpp-websocket/archive/refs/tags/$(version).tar.gz",
              "https://github.com/oatpp/oatpp-websocket.git")
+
     add_versions("1.0.0", "2e4ed596d1e8c15f0b9c6d5ba994b8fde623a6dfd256a17c8f99d86427115981")
     add_versions("1.2.5", "b930034aaed40715ccc9b9df094292ea6e2a44f31bf830d1e15db5255ece9184")
     add_versions("1.3.0", "8215765238c595e296c9ea961670064ff9c44e3e0f9accda59d81b10cc29873b")
@@ -23,7 +24,7 @@ package("oatpp-websocket")
 
     on_install("linux", "macosx", "windows|x64", function (package)
         local configs = {"-DOATPP_BUILD_TESTS=OFF"}
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         if package:is_plat("windows") then
             table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))

+ 6 - 4
packages/o/oatpp/xmake.lua

@@ -1,11 +1,11 @@
 package("oatpp")
-
     set_homepage("https://oatpp.io/")
     set_description("Modern Web Framework for C++. High performance, simple API, cross platform, zero dependency.")
     set_license("Apache-2.0")
 
-    add_urls("https://github.com/oatpp/oatpp/archive/$(version).tar.gz",
+    add_urls("https://github.com/oatpp/oatpp/archive/refs/tags/$(version).tar.gz",
              "https://github.com/oatpp/oatpp.git")
+
     add_versions("1.0.0", "9ba7c75e3ada8ec894ec10beae712e775774a835fd3de89d8c34e17740202619")
     add_versions("1.2.5", "36276e8b23e68ece1e6093c3f06fc80e3d42a5f4e47cdeef5e7e63f36eeddaad")
     add_versions("1.3.0", "e1f80fa8fd7a74da6737e7fee1a4db68b4d7085a3f40e7d550752d6ff5714583")
@@ -14,10 +14,12 @@ package("oatpp")
         add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
     end
 
-    add_deps("cmake")
     if is_plat("windows") then
         add_syslinks("ws2_32")
     end
+
+    add_deps("cmake")
+
     on_load(function (package)
         package:add("includedirs", path.join("include", "oatpp-" .. package:version_str(), "oatpp"))
         package:add("linkdirs", path.join("lib", "oatpp-" .. package:version_str()))
@@ -25,7 +27,7 @@ package("oatpp")
 
     on_install("linux", "macosx", "windows|x64", function (package)
         local configs = {"-DOATPP_BUILD_TESTS=OFF"}
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         if package:is_plat("windows") then
             table.insert(configs, "-DOATPP_MSVC_LINK_STATIC_RUNTIME=" .. (package:config("vs_runtime"):startswith("MT") and "ON" or "OFF"))