Skip to content

Commit

Permalink
add uuid deps
Browse files Browse the repository at this point in the history
  • Loading branch information
hahahahbenny committed Oct 28, 2024
2 parents d6113d8 + 51d24c4 commit a7ef102
Show file tree
Hide file tree
Showing 287 changed files with 6,406 additions and 1,103 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
xmake-version: branch@master

- name: Configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.2
uses: al-cheb/configure-pagefile-action@v1.4
with:
minimum-size: 8GB
maximum-size: 32GB
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cross_musl.yml → .github/workflows/cross.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Cross (Musl)
name: Cross

on:
pull_request:
Expand All @@ -10,12 +10,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
cross: [arm-unknown-linux-musleabi, aarch64-unknown-linux-musl]
cross: [arm-none-linux-gnueabihf, aarch64-none-linux-gnu]

runs-on: ${{ matrix.os }}

concurrency:
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-Musl-${{ matrix.cross }}
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-${{ matrix.cross }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v1
Expand All @@ -25,9 +25,9 @@ jobs:

- name: Installation
run: |
wget https://github.com/musl-cross/musl-cross/releases/download/20240903/${{ matrix.cross }}.tgz
tar -xvf ${{ matrix.cross }}.tgz
wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}.tar.xz
tar -xvf arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}.tar.xz
- name: Tests
run: |
xmake l ./scripts/test.lua -D -p cross --toolchain=muslcc --sdk=`pwd`/${{ matrix.cross }}
xmake l ./scripts/test.lua -D -p cross --sdk=`pwd`/arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}
5 changes: 4 additions & 1 deletion .github/workflows/macos_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,8 @@ jobs:
wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem
export CURL_CA_BUNDLE=/tmp/cacert.pem
sudo ln /opt/homebrew/bin/gfortran-14 /opt/homebrew/bin/gfortran
export PATH="$PATH:/opt/homebrew/Cellar/gcc/14.1.0_2/libexec/gcc/aarch64-apple-darwin23/14/"
find /opt/homebrew/Cellar/gcc/ -name f951
export PATH="$PATH:/opt/homebrew/Cellar/gcc/14.2.0/libexec/gcc/aarch64-apple-darwin23/14/"
export LIBRARY_PATH="$LIBRARY_PATH:/opt/homebrew/Cellar/gcc/14.2.0/lib/gcc/14/"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/homebrew/Cellar/gcc/14.2.0/lib/gcc/14/"
xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }}
5 changes: 4 additions & 1 deletion .github/workflows/macos_x86_64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,8 @@ jobs:
wget https://curl.haxx.se/ca/cacert.pem -O /tmp/cacert.pem
export CURL_CA_BUNDLE=/tmp/cacert.pem
sudo ln /usr/local/bin/gfortran-14 /usr/local/bin/gfortran
export PATH="$PATH:/usr/local/Cellar/gcc/14.1.0_2/libexec/gcc/x86_64-apple-darwin21/14/"
find /usr/local/Cellar/gcc/ -name f951
export PATH="$PATH:/usr/local/Cellar/gcc/14.2.0/libexec/gcc/x86_64-apple-darwin21/14/"
export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/Cellar/gcc/14.2.0/lib/gcc/14/"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/Cellar/gcc/14.2.0/lib/gcc/14/"
xmake l ./scripts/test.lua -D -a ${{ matrix.arch }} -k ${{ matrix.kind }}
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
xmake-version: branch@master

- name: Configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.2
uses: al-cheb/configure-pagefile-action@v1.4
with:
minimum-size: 8GB
maximum-size: 32GB
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/windows_v3.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Windows (v3.0)

on:
pull_request:
branches:
- dev

jobs:
build:
strategy:
fail-fast: false
matrix:
os: [windows-2022]
kind: [static, shared]
arch: [x64]

runs-on: ${{ matrix.os }}

concurrency:
group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Windows-v3-${{ matrix.os }}-${{ matrix.kind }}-${{ matrix.arch }}
cancel-in-progress: true
steps:
- uses: actions/checkout@v1
- uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: branch@master

- name: Configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.4
with:
minimum-size: 8GB
maximum-size: 32GB
disk-root: "D:"

- name: Tests
run: |
git clone https://github.com/xmake-io/xmake.git --recurse-submodules -b master xmakesrc
cd xmakesrc/core
xmake
cd ../..
Copy-Item ./xmakesrc/core/build/xmake.exe ./xmakesrc/xmake
Copy-Item ./xmakesrc/scripts/xrepo.bat ./xmakesrc/xmake
Copy-Item ./xmakesrc/scripts/xrepo.ps1 ./xmakesrc/xmake
$Env:XMAKE_MAIN_REPO = "https://github.com/xmake-io/xmake-repo.git"
$Env:XMAKE_PROGRAM_DIR = $(Resolve-Path ./xmakesrc/xmake)
Set-Item -Path Env:Path -Value ($Env:XMAKE_PROGRAM_DIR + ";" + $Env:Path)
xmake --version
xmake l ./scripts/test.lua -vD -a ${{ matrix.arch }} -k ${{ matrix.kind }} --policies=compatibility.version:3.0 --linkjobs=2
Empty file removed clang
Empty file.
30 changes: 30 additions & 0 deletions packages/a/alcatraz/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package("alcatraz")
set_kind("binary")
set_homepage("https://github.com/weak1337/Alcatraz")
set_description("x64 binary obfuscator")

set_urls("https://github.com/weak1337/Alcatraz.git", {submodules = false})

add_versions("2023.07.14", "739e65ebadaeb3f8206fb2199700725331465abb")

add_deps("asmjit", "zydis")

on_install("@windows", function (package)
io.replace("Alcatraz/obfuscator/obfuscator.cpp", "#include <iostream>",
"#include <iostream>\n#include <bit>", {plain = true})

io.writefile("xmake.lua", [[
add_rules("mode.debug", "mode.release")
add_requires("asmjit", "zydis")
set_languages("c++20")
target("alcatraz")
set_kind("binary")
add_files("Alcatraz/**.cpp")
add_packages("asmjit", "zydis")
]])
import("package.tools.xmake").install(package)
end)

on_test(function (package)
os.vrun("alcatraz")
end)
1 change: 1 addition & 0 deletions packages/a/alembic/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package("alembic")

add_urls("https://github.com/alembic/alembic/archive/refs/tags/$(version).tar.gz",
"https://github.com/alembic/alembic.git")
add_versions("1.8.7", "6de0b97cd14dcfb7b2d0d788c951b6da3c5b336c47322ea881d64f18575c33da")
add_versions("1.8.6", "c572ebdea3a5f0ce13774dd1fceb5b5815265cd1b29d142cf8c144b03c131c8c")
add_versions("1.8.5", "180a12f08d391cd89f021f279dbe3b5423b1db751a9898540c8059a45825c2e9")

Expand Down
2 changes: 1 addition & 1 deletion packages/a/alsa-lib/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package("alsa-lib")
add_configs("versioned", {description = "pass flag --without-versioned", default = true, type = "boolean"})

if is_plat("linux") then
add_syslinks("pthread")
add_syslinks("pthread", "dl")
add_extsources("pacman::alsa-lib", "apt::libasound2-dev")
end

Expand Down
33 changes: 33 additions & 0 deletions packages/a/amrex/patches/24.09/remove-symlink.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
index 6e8af043..df5ca007 100644
--- a/Src/CMakeLists.txt
+++ b/Src/CMakeLists.txt
@@ -27,11 +27,7 @@ add_library(amrex ALIAS amrex_${AMReX_SPACEDIM_LAST}d)
add_library(AMReX::amrex ALIAS amrex_${AMReX_SPACEDIM_LAST}d)

# legacy symlink for build directory: libamrex.[so|a] / amrex.[dll.lib]
-add_custom_command(TARGET amrex_${AMReX_SPACEDIM_LAST}d POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E create_symlink
- $<TARGET_FILE_NAME:amrex_${AMReX_SPACEDIM_LAST}d>
- $<TARGET_FILE_DIR:amrex_${AMReX_SPACEDIM_LAST}d>/$<TARGET_FILE_PREFIX:amrex_${AMReX_SPACEDIM_LAST}d>amrex$<TARGET_FILE_SUFFIX:amrex_${AMReX_SPACEDIM_LAST}d>
-)
+


#
diff --git a/Tools/CMake/AMReXInstallHelpers.cmake b/Tools/CMake/AMReXInstallHelpers.cmake
index 7c832d3a..ea5ea535 100644
--- a/Tools/CMake/AMReXInstallHelpers.cmake
+++ b/Tools/CMake/AMReXInstallHelpers.cmake
@@ -72,11 +72,6 @@ function (install_amrex_targets)
# legacy symlink for: libamrex.[so|a] / amrex.[dll.lib]
# escape spaces for generated cmake_install.cmake file
file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}/lib" ABS_INSTALL_LIB_DIR)
- install(CODE "file(CREATE_LINK
- $<TARGET_FILE_NAME:amrex_${AMReX_SPACEDIM_LAST}d>
- \"${ABS_INSTALL_LIB_DIR}/$<TARGET_FILE_PREFIX:amrex_${AMReX_SPACEDIM_LAST}d>amrex$<TARGET_FILE_SUFFIX:amrex_${AMReX_SPACEDIM_LAST}d>\"
- COPY_ON_ERROR SYMBOLIC)"
- )

# Install fortran modules if Fortran is enabled
get_property(_lang GLOBAL PROPERTY ENABLED_LANGUAGES)
89 changes: 89 additions & 0 deletions packages/a/amrex/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package("amrex")
set_homepage("https://amrex-codes.github.io/amrex")
set_description("AMReX: Software Framework for Block Structured AMR")

add_urls("https://github.com/AMReX-Codes/amrex/releases/download/$(version)/amrex-$(version).tar.gz",
"https://github.com/AMReX-Codes/amrex.git")

add_versions("24.09", "a1435d16532d04a1facce9a9ae35d68a57f7cd21a5f22a6590bde3c265ea1449")

add_patches("24.09", "patches/24.09/remove-symlink.patch", "d71adb07252e488ee003f6f04fea756864d6af2232b43208c9e138e062eb6e4d")

add_configs("openmp", {description = "Enable OpenMP", default = false, type = "boolean"})
add_configs("mpi", {description = "Enable MPI", default = false, type = "boolean", readonly = true})
add_configs("cuda", {description = "Enable CUDA", default = false, type = "boolean"})
add_configs("hdf5", {description = "Enable HDF5-based I/O", default = false, type = "boolean"})
add_configs("fortran", {description = "Enable fortran", default = false, type = "boolean"})
add_configs("tools", {description = "Build tools", default = false, type = "boolean"})

if is_plat("linux", "bsd") then
add_syslinks("pthread")
end

add_deps("cmake")

if on_check then
on_check("windows", function (package)
import("core.base.semver")

local msvc = package:toolchain("msvc")
if msvc then
local vs_sdkver = msvc:config("vs_sdkver")
assert(vs_sdkver and semver.match(vs_sdkver):gt("10.0.19041"), "package(amrex) require vs_sdkver > 10.0.19041.0")
end
end)
end

on_load(function (package)
if package:config("openmp") then
package:add("deps", "openmp")
end
if package:config("cuda") then
package:add("deps", "cuda")
end
if package:config("hdf5") then
package:add("deps", "hdf5")
end
if package:config("fortran") and package:is_plat("linux", "macosx") then
package:add("deps", "gfortran", {kind = "binary"})
end
end)

on_install("windows", "macosx", "linux", "bsd", "mingw", function (package)
local configs = {"-DAMReX_ENABLE_TESTS=OFF"}
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, "-DAMReX_PIC=" .. (package:config("pic") and "ON" or "OFF"))

local configs_map = {
openmp = "OMP",
tools = "PLOTFILE_TOOLS",
}
for name, enabled in table.orderpairs(package:configs()) do
if not package:extraconf("configs", name, "builtin") then
local real = configs_map[name] or name:upper()
local enabled = (package:config(name) and "ON" or "OFF")
table.insert(configs, format("-DAMReX_%s=%s", real, enabled))
end
end

if package:is_plat("windows") then
os.mkdir(path.join(package:buildir(), "Src/pdb"))
end
import("package.tools.cmake").install(package, configs)
end)

on_test(function (package)
assert(package:check_cxxsnippets({test = [[
#include <AMReX.H>
#include <AMReX_Print.H>
void test(int argc, char* argv[]) {
amrex::Initialize(argc,argv);
{
amrex::Print() << "Hello world from AMReX version " << amrex::Version() << "\n";
}
amrex::Finalize();
}
]]}, {configs = {languages = "c++17"}}))
end)
1 change: 1 addition & 0 deletions packages/a/apr/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package("apr")

add_urls("https://github.com/apache/apr/archive/refs/tags/$(version).tar.gz",
"https://github.com/apache/apr.git")
add_versions("1.7.5", "6d0712c529503cd2457011d03164491bbc16d0050bc40ef89568b1ac491c6600")
add_versions("1.7.4", "060b6e5ca8b3251545a93777c9ef744ceff02d4a59bb60a7dd9b3da9da33673e")
add_versions("1.7.0", "a7e2c5e6d60f6c7b1611b31a2f914a3e58f44eded5b064f0bae43ff30b16a4e6")

Expand Down
4 changes: 0 additions & 4 deletions packages/a/aravis/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ package("aravis")
if libusb and not libusb:is_system() then
io.replace("meson.build", "libusb-1.0", "libusb", {plain = true})
end
local libxml2 = package:dep("libxml2")
if not libxml2:is_system() then
io.replace("meson.build", "libxml-2.0", "libxml2", {plain = true})
end

local configs = {"-Dviewer=disabled", "-Dtests=false"}
table.insert(configs, "-Ddefault_library=" .. (package:config("shared") and "shared" or "static"))
Expand Down
1 change: 1 addition & 0 deletions packages/a/arduinojson/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package("arduinojson")
add_urls("https://github.com/bblanchon/ArduinoJson/archive/refs/tags/$(version).tar.gz",
"https://github.com/bblanchon/ArduinoJson.git")

add_versions("v7.2.0", "d20aefd14f12bd907c6851d1dfad173e4fcd2d993841fa8c91a1d8ab5a71188b")
add_versions("v7.1.0", "74bc745527a274bcab85c6498de77da749627113c4921ccbcaf83daa7ac35dee")
add_versions("v7.0.4", "98ca14d98e9f1e8978ce5ad3ca0eeda3d22419d17586c60f299f369078929917")
add_versions("v7.0.3", "6da2d069e0caa0c829444912ee13e78bdf9cc600be632428a164c92e69528000")
Expand Down
6 changes: 6 additions & 0 deletions packages/a/assimp/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,12 @@ package("assimp")
if minizip and not minizip:is_system() then
packagedeps = table.join2(packagedeps or {}, "minizip")
end
-- fix ninja debug build
os.mkdir(path.join(package:buildir(), "code/pdb"))
-- MDd == _DEBUG + _MT + _DLL
if package:is_debug() and package:has_runtime("MD", "MT") then
io.replace("CMakeLists.txt", "/D_DEBUG", "", {plain = true})
end
end

local zlib = package:dep("zlib")
Expand Down
1 change: 1 addition & 0 deletions packages/a/atomic_queue/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package("atomic_queue")

add_urls("https://github.com/max0x7ba/atomic_queue/archive/refs/tags/$(version).tar.gz",
"https://github.com/max0x7ba/atomic_queue.git")
add_versions("v1.6.5", "0257efe6781637091ff7f11d836cff4a8e0b5ea22c943fa70e00e83d83360583")
add_versions("v1.6.4", "e9c3ae4b850dc6503ee484748701f06f3737ad177c5cb31030f74e3fef40e282")
add_versions("v1.5", "599b76a0222e7b54118d6f0fb686845c9d323107f2de76b3f68292b057e5a99f")
add_versions("v1.6.3", "0ad6e0203d90367f6a4e496449dfd9ad65b80168fadafef4eac08820c6bda79c")
Expand Down
11 changes: 11 additions & 0 deletions packages/a/autotools/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package("autotools")
set_kind("binary")

if is_subhost("msys") then
add_deps("pacman::autotools")
else
add_deps("autoconf", "automake", "libtool")
end

on_install("@linux", "@macosx", "@bsd", "@msys", function (package)
end)
1 change: 1 addition & 0 deletions packages/a/aws-c-auth/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package("aws-c-auth")
add_urls("https://github.com/awslabs/aws-c-auth/archive/refs/tags/$(version).tar.gz",
"https://github.com/awslabs/aws-c-auth.git")

add_versions("v0.7.31", "7f97aacef6bd1649734383c2bf022250671f353b7fa60d195e6865d7f4594b43")
add_versions("v0.7.29", "f49f5dce1153e908dd9c0639f4aa4b1477f8564a28635f433cc0be121a18106e")
add_versions("v0.7.25", "8f7993f8fad2992ca19c00123ea16e72c4d13acbeeb6333061034a299274f081")
add_versions("v0.7.22", "f249a12a6ac319e929c005fb7efd5534c83d3af3a3a53722626ff60a494054bb")
Expand Down
Loading

0 comments on commit a7ef102

Please sign in to comment.