Merge branch 'master' into stable

This reverts commit e3f052f181.

.gitea/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Check repository out.
         uses: actions/checkout@v3
       - name: Build Docker Image
-        run: "docker build -t git.mixedup.dev/refuel/docker-cross-compiler:${{gitea.ref_name}} ."
+        run: "docker build --no-cache -t git.mixedup.dev/refuel/docker-cross-compiler:${{gitea.ref_name}} ."
       - name: Upload Docker Image
         run: "docker push git.mixedup.dev/refuel/docker-cross-compiler:${{gitea.ref_name}}"
       - name: Alias image as latest and push.

Dockerfile

@@ -2,7 +2,7 @@
 # packages needed to build this project.
 #
 # As always, debian > ubuntu <3
-FROM debian:stable-slim
+FROM debian:trixie-slim
 WORKDIR /root
 
 # Set host name.
@@ -13,11 +13,6 @@ RUN echo docker_cross_compiler > /etc/hostname
     RUN apt-get update
     RUN apt-get install -y sudo wget
 
-    # Add the .NET package repository to the repository listing.
-    RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-    RUN dpkg -i packages-microsoft-prod.deb
-    RUN rm packages-microsoft-prod.deb
-
     # APT dependencies.
     RUN apt-get update
     RUN apt-get install -y \
@@ -27,21 +22,19 @@ RUN echo docker_cross_compiler > /etc/hostname
         clang \
         cpio \
         curl \
-        dotnet-sdk-6.0 \
         gcc-arm-linux-gnueabihf \
         gcc-aarch64-linux-gnu \
         gcc-i686-linux-gnu \
         git \
         libbz2-dev \
         libharfbuzz-dev \
+        liblzma-dev \
         libpng-dev \
         libssl-dev \
         libxml2-dev \
         llvm \
-        lzma-dev \
         mingw-w64 \
         meson \
-        nuget \
         ninja-build \
         nodejs \
         patch \
@@ -50,8 +43,19 @@ RUN echo docker_cross_compiler > /etc/hostname
         xz-utils \
         zlib1g-dev
 
+    # Install dotnet 6.0 even if Micro$lop doesn't support it :P
+    WORKDIR /root/
+    COPY share/*.tar.gz /root/
+    RUN mkdir -p /usr/lib64/dotnet
+    WORKDIR /usr/lib64/dotnet
+    RUN tar -zxf /root/dotnet-sdk-6.0.428-linux-x64.tar.gz
+    RUN tar -zxf /root/dotnet-sdk-8.0.421-linux-x64.tar.gz
+    RUN tar -zxf /root/dotnet-sdk-10.0.300-linux-x64.tar.gz
+    RUN ln -s /usr/lib64/dotnet/dotnet /usr/local/bin/dotnet
+
     # Clone osxcross
     # Let's do this later.
+    WORKDIR /root/
     RUN git clone --recurse-submodules "https://github.com/tpoechtrager/osxcross.git" osxcross
 
     # Download packaged SDK from this random github (very safe i know)
@@ -74,7 +78,6 @@ RUN echo docker_cross_compiler > /etc/hostname
     WORKDIR /home/refuel
 
     # Copy bashrc
-    RUN cp /etc/bash.bashrc ~/.bashrc
     COPY sh/bashrc.sh /home/refuel/.bashrc
 
 # Execute an interactive shell.

cmake/osx-arm64.cmake

@@ -1,7 +1,7 @@
 # ReFuel Toolchain file for OSX-ARM64 systems.
 # Copyright (C) 2024
 
-set(CMAKE_SYSTEM_NAME OSX)
+set(CMAKE_SYSTEM_NAME Darwin)
 
 set(CMAKE_C_COMPILER aarch64-apple-darwin23-clang)
 set(CMAKE_CXX_COMPILER aarch64-apple-darwin23-clang++)

cmake/osx-x64.cmake

@@ -1,7 +1,7 @@
 # ReFuel Toolchain file for OSX-ARM64 systems.
 # Copyright (C) 2024
 
-set(CMAKE_SYSTEM_NAME OSX)
+set(CMAKE_SYSTEM_NAME Darwin)
 
 set(CMAKE_C_COMPILER x86_64-apple-darwin23-clang)
 set(CMAKE_CXX_COMPILER x86_64-apple-darwin23-clang++)

sh/bashrc.sh

@@ -1,4 +1,22 @@
+source /etc/bash.bashrc
+
+# Set location for AppHost lookup
+[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=/usr/lib64/dotnet
+
+# Add dotnet tools directory to PATH
+DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
+case "$PATH" in
+    *"$DOTNET_TOOLS_PATH"* ) true ;;
+    * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
+esac
+
+# Extract self-contained executables under HOME
+# to avoid multi-user issues from using the default '/var/tmp'.
+[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract"
+
+
 echo ReFuel Project - Copyright \(C\) 2023
 echo
 echo This is an interactive shell for ReFuel build image.
 echo SuperUser \(su/sudo\) commands are enabled without a password. Beware.
+

sh/build_native.sh

@@ -16,7 +16,7 @@ fi
 
 if [ -z "$ARCHS" ]
 then
-    ARCHS="linux-arm linux-arm64 linux-x64 win-x64 win-x86"
+    ARCHS="linux-arm linux-arm64 linux-x64 win-x64 win-x86 osx-arm64 osx-x64"
 fi
 
 if [ -z "$DST" ]
@@ -43,11 +43,9 @@ for ARCH in $ARCHS; do
     cmake -B $BUILD -S $SRC \
         -G Ninja \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_C_FLAGS=-static-libgcc \
-        -DCMAKE_CXX_FLAGS=-static-libgcc \
         -DCMAKE_INSTALL_PREFIX=$PREFIX \
         -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN \
-        $QUIK_ADDITIONAL_CMAKE
+        $REFUEL_ADDITIONAL_CMAKE
 
     # Build and install.
     ninja -C $BUILD all

share/.gitattributes

@@ -0,0 +1 @@
+**/*.deb -diff