forked from xmake-io/xmake-repo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
Merge branch 'dev' of https://github.com/xmake-io/xmake-repo into dev
Showing
238 changed files
with
4,038 additions
and
603 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ name: Deploy | |
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - dev | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| add_rules("mode.debug", "mode.release") | ||
|
|
||
| add_requires("minizip-ng") | ||
| add_packages("minizip-ng") | ||
|
|
||
| target("11zip") | ||
| set_kind("$(kind)") | ||
| set_languages("c++17") | ||
| add_files("src/*.cpp") | ||
| remove_files("src/elzip_fs_fallback.cpp") | ||
| add_includedirs("include", "include/elzip") | ||
|
|
||
| add_headerfiles("include/(**.hpp)") | ||
|
|
||
| if is_plat("windows") and is_kind("shared") then | ||
| add_rules("utils.symbols.export_all", {export_classes = true}) | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package("11zip") | ||
| set_homepage("https://github.com/Sygmei/11Zip") | ||
| set_description("Dead simple zipping / unzipping C++ Lib") | ||
| set_license("MIT") | ||
|
|
||
| add_urls("https://github.com/Sygmei/11Zip/archive/516e161d5c96aa8f2603fb30b10b7770a87332c2.tar.gz", | ||
| "https://github.com/Sygmei/11Zip.git") | ||
|
|
||
| add_versions("2023.05.10", "9e4052571c73ecd8e328fa9e8399f606604baa3373103d2e7dddb75019330ee0") | ||
|
|
||
| add_includedirs("include", "include/elzip") | ||
|
|
||
| add_deps("minizip-ng") | ||
|
|
||
| on_install("macosx", "android", "linux", "windows", "mingw", function (package) | ||
| io.replace("src/unzipper.cpp", "unzLocateFile(zipFile_, filename.data(), nullptr)", "unzLocateFile(zipFile_, filename.data(), 0)", {plain = true}) | ||
| os.cp(path.join(package:scriptdir(), "port", "xmake.lua"), "xmake.lua") | ||
| import("package.tools.xmake").install(package) | ||
| end) | ||
|
|
||
| on_test(function (package) | ||
| assert(package:check_cxxsnippets({test = [[ | ||
| void test() { | ||
| std::string zipname; | ||
| elz::extractZip(zipname); | ||
| } | ||
| ]]}, {configs = {languages = "c++17"}, includes = "elzip/elzip.hpp"})) | ||
| end) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index af78061..8aba951 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -39,13 +39,15 @@ function(add_security_flags target) | ||
| target_compile_options( ${target} PRIVATE -fstack-protector-strong) | ||
| endif() | ||
| elseif(WIN32) | ||
| - target_compile_options( ${target} PRIVATE /GS /DynamicBase) | ||
| - if(BUILD_WITH_STATIC_CRT) | ||
| - target_compile_options( ${target} PRIVATE "/MT") | ||
| - endif() | ||
| - if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") | ||
| - # These options for 32 bit builds only | ||
| - target_compile_options( ${target} PRIVATE /SAFESEH /NXCOMPAT ) | ||
| + if (MSVC) | ||
| + target_compile_options( ${target} PRIVATE /GS /DynamicBase) | ||
| + if(BUILD_WITH_STATIC_CRT) | ||
| + target_compile_options( ${target} PRIVATE "/MT") | ||
| + endif() | ||
| + if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") | ||
| + # These options for 32 bit builds only | ||
| + target_compile_options( ${target} PRIVATE /SAFESEH /NXCOMPAT ) | ||
| + endif() | ||
| endif() | ||
| endif() | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package("algo_plus") | ||
| set_kind("library", {headeronly = true}) | ||
| set_homepage("https://csrt-ntua.github.io/AlgoPlus") | ||
| set_description("AlgoPlus is a C++17 library for complex data structures and algorithms") | ||
| set_license("Apache-2.0") | ||
|
|
||
| add_urls("https://github.com/CSRT-NTUA/AlgoPlus.git") | ||
| add_versions("2024.07.02", "1287dfc5bf666bace15af9c14d03e807b71efa82") | ||
|
|
||
| add_deps("nlohmann_json") | ||
|
|
||
| on_install(function (package) | ||
| for _, file in ipairs(os.files("src/**.h")) do | ||
| io.replace(file, "../../../../third_party/json.hpp", "nlohmann/json.hpp", {plain = true}) | ||
| end | ||
| os.cp("src/*", package:installdir("include")) | ||
| end) | ||
|
|
||
| on_test(function (package) | ||
| assert(package:check_cxxsnippets({test = [[ | ||
| void test() { | ||
| std::vector<std::vector<double> > data; | ||
| int CLUSTERS; | ||
| kmeans a(data, CLUSTERS); | ||
| } | ||
| ]]}, {configs = {languages = "c++17"}, includes = {"machine_learning/clustering/kmeans/kmeans.h"}})) | ||
| end) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package("antlr4-runtime") | ||
| set_homepage("http://antlr.org") | ||
| set_description("ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing, or translating structured text or binary files.") | ||
| set_license("BSD-3-Clause") | ||
|
|
||
| add_urls("https://github.com/antlr/antlr4/archive/refs/tags/$(version).tar.gz", | ||
| "https://github.com/antlr/antlr4.git") | ||
|
|
||
| add_versions("4.13.1", "da20d487524d7f0a8b13f73a8dc326de7fc2e5775f5a49693c0a4e59c6b1410c") | ||
|
|
||
| if is_plat("mingw") and is_subhost("msys") then | ||
| add_extsources("pacman::antlr4-runtime-cpp") | ||
| elseif is_plat("linux") then | ||
| add_extsources("pacman::antlr4-runtime", "apt::libantlr4-runtime-dev") | ||
| elseif is_plat("macosx") then | ||
| add_extsources("brew::antlr4-cpp-runtime") | ||
| end | ||
|
|
||
| if is_plat("linux", "bsd") then | ||
| add_syslinks("m", "pthread") | ||
| elseif is_plat("macosx") then | ||
| add_frameworks("CoreFoundation") | ||
| end | ||
|
|
||
| add_includedirs("include", "include/antlr4-runtime") | ||
|
|
||
| add_deps("cmake") | ||
|
|
||
| on_install(function (package) | ||
| local configs = {"-DANTLR_BUILD_CPP_TESTS=OFF", "-DANTLR4_INSTALL=ON"} | ||
| table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release")) | ||
| table.insert(configs, "-DANTLR_BUILD_SHARED=" .. (package:config("shared") and "ON" or "OFF")) | ||
| table.insert(configs, "-DANTLR_BUILD_STATIC=" .. (package:config("shared") and "OFF" or "ON")) | ||
|
|
||
| os.cd("runtime/Cpp") | ||
| io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")]], "", {plain = true}) | ||
| io.replace("CMakeLists.txt", [[set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")]], "", {plain = true}) | ||
| import("package.tools.cmake").install(package, configs) | ||
| if not package:config("shared") then | ||
| package:add("defines", "ANTLR4CPP_STATIC") | ||
| end | ||
| end) | ||
|
|
||
| on_test(function (package) | ||
| assert(package:check_cxxsnippets({test = [[ | ||
| void test() { | ||
| antlr4::ANTLRInputStream x; | ||
| } | ||
| ]]}, {configs = {languages = "c++17"}, includes = "antlr4-runtime/antlr4-runtime.h"})) | ||
| end) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| From 34bb2c023d60d22e4b1a31750d9b649d7729209e Mon Sep 17 00:00:00 2001 | ||
| From: xpxz <[email protected]> | ||
| Date: Wed, 19 Jun 2024 14:08:48 +0800 | ||
| Subject: [PATCH] remove const in set_to_text_limit | ||
|
|
||
| --- | ||
| include/asio2/http/detail/flex_body.hpp | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/include/asio2/http/detail/flex_body.hpp b/include/asio2/http/detail/flex_body.hpp | ||
| index 491f5b8a..18e682db 100644 | ||
| --- a/include/asio2/http/detail/flex_body.hpp | ||
| +++ b/include/asio2/http/detail/flex_body.hpp | ||
| @@ -136,7 +136,7 @@ class basic_flex_body<TextBody, FileBody>::value_type | ||
| inline bool is_text() const noexcept { return !is_file(); } | ||
| inline bool is_file() const noexcept { return file_.is_open(); } | ||
|
|
||
| - inline void set_to_text_limit(std::uint64_t v) const noexcept | ||
| + inline void set_to_text_limit(std::uint64_t v) noexcept | ||
| { | ||
| this->to_text_limit_ = v; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package("aws-lc") | ||
| set_homepage("https://github.com/aws/aws-lc") | ||
| set_description("AWS-LC is a general-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers. It іs based on code from the Google BoringSSL project and the OpenSSL project.") | ||
|
|
||
| add_urls("https://github.com/aws/aws-lc/archive/refs/tags/$(version).tar.gz", | ||
| "https://github.com/aws/aws-lc.git") | ||
|
|
||
| add_versions("v1.31.0", "f2dfe0ef8fe21482b6795da01a1b226f826e9a084833ff8d5371a02f9623c150") | ||
|
|
||
| add_configs("jitter", {description = "Enable FIPS entropy source: CPU Jitter", default = false, type = "boolean"}) | ||
| add_configs("tools", {description = "Build tools", default = false, type = "boolean"}) | ||
|
|
||
| add_deps("cmake") | ||
| if is_plat("windows") then | ||
| add_deps("nasm") | ||
| end | ||
|
|
||
| add_links("ssl", "crypto") | ||
|
|
||
| if is_plat("windows", "mingw") then | ||
| add_syslinks("ws2_32") | ||
| elseif is_plat("linux", "bsd") then | ||
| add_syslinks("pthread", "dl", "m") | ||
| end | ||
|
|
||
| on_install(function (package) | ||
| if package:config("shared") and package:is_plat("windows") then | ||
| package:add("defines", "BORINGSSL_SHARED_LIBRARY") | ||
| end | ||
|
|
||
| local configs = { | ||
| "-DBUILD_TESTING=OFF", | ||
| "-DCMAKE_INSTALL_INCLUDEDIR=include", | ||
| "-DBUILD_LIBSSL=ON", | ||
| "-DDISABLE_GO=ON", "-DDISABLE_PERL=ON" | ||
| } | ||
|
|
||
| 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")) | ||
|
|
||
| table.insert(configs, "-DBUILD_LIBSSL=ON") | ||
| table.insert(configs, "-DENABLE_FIPS_ENTROPY_CPU_JITTER=" .. (package:config("jitter") and "ON" or "OFF")) | ||
| table.insert(configs, "-DBUILD_TOOL=" .. (package:config("tools") and "ON" or "OFF")) | ||
| import("package.tools.cmake").install(package, configs) | ||
| end) | ||
|
|
||
| on_test(function (package) | ||
| assert(package:has_cfuncs("SSL_new", {includes = "openssl/ssl.h"})) | ||
| end) |
Oops, something went wrong.