Use more recent meson for release, docs, and windows with pip.

Author: bobbens

CHANGELOG.md

@@ -1,11 +1,14 @@
 ### Overview:
-- `naev-artwork` (Used to render naev artwork.) ***DEPRECATED***
 - `naev-docs` (Used for building website and docs.)
-- `naev-linux-archaic` (Used for old release builds) ***DEPRECATED***
 - `naev-macos` (Used to cross compile for macOS.)
 - `naev-release` (Used for packaging releases)
 - `naev-steamruntime` (Used for testing linux steam builds in the steamruntime (sniper) environment with extra dependencies installed.)
 - `naev-windows` (Used to cross compile for Windows.)
+- `naev-artwork` (Used to render naev artwork.) ***DEPRECATED***
+- `naev-linux-archaic` (Used for old release builds) ***DEPRECATED***
+
+### v1.12.4
+- `naev-windows`, `naev-release`, and `naev-docs` also try to use a recent meson as fedora 41 version is too old for rust
 
 ### v1.12.3
 - Update `naev-windows` to include more packages to help build Rust branch

naev-docs/Dockerfile

@@ -10,14 +10,16 @@ ENV IMAGE_NAME "naev-docs"
 COPY setup-devenv.sh /usr/bin
 
 # Install utilities
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make meson ninja-build clang gcc git GraphicsMagick llvm libyaml openssl optipng rustup zlib \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install make python3-pip meson ninja-build clang gcc git GraphicsMagick llvm libyaml openssl optipng rustup zlib \
     python3-pyyaml rsync tidy tar unzip xz zip \
 # Install ldoc
     lua-ldoc \
 # Install LaTeX packages
     latexmk texlive-luahbtex texlive-roboto texlive-preprint texlive-parskip texlive-sfmath \
     texlive-markdown texlive-csvsimple texlive-gobble texlive-microtype texlive-minted texlive-newunicodechar && \
     microdnf clean all && \
+# Need Meson >=1.7.0 for rust_std=2024, which needs Fedora 42
+    python3 -m pip install meson --upgrade && \
 # Verify tool versions and install locations.
     echo "Verifying latexmk install" && \
     command -v latexmk && \

naev-macos/Dockerfile

@@ -101,7 +101,7 @@ ENV APPIMAGE_EXTRACT_AND_RUN 1
 # Install build tools.
 RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pip python3-pyyaml rustup unzip tar texinfo xz zlib zip && \
     microdnf clean all && \
-# Need Meson >=1.2.0 for fancy wrap files.
+# Need Meson >=1.7.0 for rust_std=2024, which needs Fedora 42
     python3 -m pip install meson --upgrade && \
 # Verify tool version.
     echo "Verifying meson install" && \

naev-release/Dockerfile

@@ -23,10 +23,12 @@ WORKDIR /tmp
 # Install utilities
 RUN curl -L -O https://cli.github.com/packages/rpm/gh-cli.repo --output-dir /etc/yum.repos.d && \
     microdnf update -y && \
-    microdnf --nodocs --setopt=install_weak_deps=0 -y install gh meson ninja-build clang gcc python3-pyyaml file git readline-devel rustup tar xz unzip zip \
+    microdnf --nodocs --setopt=install_weak_deps=0 -y install gh python3-pip meson ninja-build clang gcc python3-pyyaml file git readline-devel rustup tar xz unzip zip \
 # Install SteamCMD and friends
     glibc.i686 SDL2.i686 && \
     microdnf clean all && \
+# Need Meson >=1.7.0 for rust_std=2024, which needs Fedora 42
+    python3 -m pip install meson --upgrade && \
 # Download and install SteamCMD
     curl -L -O http://media.steampowered.com/installer/steamcmd_linux.tar.gz && \
     mkdir -p /opt/steamcmd && \

naev-steamruntime/Dockerfile

@@ -16,7 +16,7 @@ ENV RANLIB llvm-ranlib
 ENV STRIP llvm-strip
 ENV LD ld.lld
 
-ENV CFLAGS "-fPIC" 
+ENV CFLAGS "-fPIC"
 ENV CXXFLAGS "-fPIC"
 
 # Install luarocks deps
@@ -143,7 +143,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip \
     apt-get clean && \
 # Install mutagen module for soundtrack generation
     python3 -m pip install mutagen && \
-# Need Meson >=1.2.0 for fancy wrap files.
+# Need Meson >=1.7.0 for rust_std=2024, which is obviously not up-to-date in steamOS
     python3 -m pip install meson --upgrade && \
 # Verify meson and python.
     echo "Verifying python install" && \
@@ -165,4 +165,4 @@ ENV APPIMAGE_EXTRACT_AND_RUN 1
 # Set WORKDIR when you spin up the image.
 RUN mkdir -p /tmp/naevBuild
 WORKDIR /tmp/naevBuild
-CMD [ "/usr/bin/setup-devenv.sh", "/bin/bash" ]
+CMD [ "/usr/bin/setup-devenv.sh", "/bin/bash" ]

naev-windows/Dockerfile

@@ -14,7 +14,7 @@ COPY _copr:copr.fedorainfracloud.org:jackgreiner:ucrt64-libraries.repo /etc/yum.
 COPY setup-devenv.sh /usr/bin
 
 RUN microdnf update -y && \
-    microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gcc gettext git lld llvm meson ninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
+    microdnf --nodocs --setopt=install_weak_deps=0 -y install clang gcc gettext git lld llvm python3-pip meson ninja-build python3-pyyaml rustup tar texinfo xz unzip zip \
 # OK, seems like the rust is a bit a of mess as it is trying to compile some things internally with hardcoded mingw64 paths
 # We have to toss the dependencies here so that it works. In particular, mlua-sys seems to want to build luajit
 # Would make sense to try to use either only ucrt64 or mingw64 stuff someday
@@ -25,6 +25,8 @@ RUN microdnf update -y && \
     ucrt64-gcc ucrt64-gcc-c++ ucrt64-dlfcn ucrt64-enet ucrt64-freetype ucrt64-libvorbis ucrt64-libxml2 ucrt64-libtiff \
     ucrt64-openal-soft ucrt64-SDL2 ucrt64-SDL2_image ucrt64-libpng mingw32-nsis ucrt64-pcre2 ucrt64-physfs && \
     microdnf clean all && \
+# Need Meson >=1.7.0 for rust_std=2024, which needs Fedora 42
+    python3 -m pip install meson --upgrade && \
 # Install openblas for mingw (building this from source is an option but probably painful)
     curl -L -O https://github.com/OpenMathLib/OpenBLAS/releases/download/v0.3.28/OpenBLAS-0.3.28-x64-64.zip && \
     unzip OpenBLAS-0.3.28-x64-64.zip -d /usr/x86_64-w64-mingw32ucrt/sys-root/mingw && \