Introduce CMake and Ninja

Unlike "standard" CMake, this build defaults to the Ninja generator and
w64dk toolchain without looking for Visual Studio.

Author: skeeto

Dockerfile

@@ -20,6 +20,8 @@ ARG VIM_VERSION=9.0
 ARG CCACHE_VERSION=4.12.3
 ARG XXHASH_VERSION=0.8.3
 ARG ZSTD_VERSION=1.5.7
+ARG CMAKE_VERSION=4.2.3
+ARG NINJA_VERSION=1.13.1
 
 RUN apt-get update && apt-get install --yes --no-install-recommends \
   build-essential cmake curl libgmp-dev libmpc-dev libmpfr-dev m4 p7zip-full
@@ -44,7 +46,9 @@ RUN curl --insecure --location --remote-name-all --remote-header-name \
     https://downloads.sourceforge.net/project/pdcurses/pdcurses/$PDCURSES_VERSION/PDCurses-$PDCURSES_VERSION.tar.gz \
     https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz \
     https://github.com/Cyan4973/xxhash/archive/refs/tags/v$XXHASH_VERSION.tar.gz \
-    https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz
+    https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz \
+    https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION.tar.gz \
+    https://github.com/ninja-build/ninja/archive/refs/tags/v$NINJA_VERSION.tar.gz
 COPY src/SHA256SUMS $PREFIX/src/
 RUN sha256sum -c $PREFIX/src/SHA256SUMS \
  && tar xJf 7z$Z7_VERSION-src.tar.xz --xform 's%^%7z/%' \
@@ -64,7 +68,9 @@ RUN sha256sum -c $PREFIX/src/SHA256SUMS \
  && tar xjf vim-$VIM_VERSION.tar.bz2 \
  && tar xJf ccache-$CCACHE_VERSION.tar.xz \
  && tar xzf xxHash-$XXHASH_VERSION.tar.gz \
- && tar xzf zstd-$ZSTD_VERSION.tar.gz
+ && tar xzf zstd-$ZSTD_VERSION.tar.gz \
+ && tar xzf cmake-$CMAKE_VERSION.tar.gz \
+ && tar xzf ninja-$NINJA_VERSION.tar.gz
 COPY src/w64devkit.c src/w64devkit.ico src/libmemory.c src/libchkstk.S \
      src/alias.c src/debugbreak.c src/pkg-config.c src/vc++filt.c \
      src/peports.c src/profile $PREFIX/src/
@@ -535,6 +541,34 @@ RUN $ARCH-gcc -DEXE=ccache.exe -DCMD=gcc \
             -Wl,--gc-sections -s -nostdlib \
             -o $PREFIX/lib/ccache/{}.com $PREFIX/src/alias.c -lkernel32
 
+WORKDIR /ninja
+RUN cmake -DCMAKE_BUILD_TYPE=MinSizeRel \
+        -DCMAKE_SYSTEM_NAME=Windows \
+        -DCMAKE_CXX_COMPILER=$ARCH-g++ \
+        -DCMAKE_EXE_LINKER_FLAGS="-s" \
+        -DBUILD_TESTING=OFF \
+        /ninja-$NINJA_VERSION \
+ && make -j$(nproc) \
+ && cp ninja.exe $PREFIX/bin/
+
+WORKDIR /cmake
+COPY src/cmake-force-ninja.patch $PREFIX/src/
+RUN cat $PREFIX/src/cmake-*.patch | patch -d/cmake-$CMAKE_VERSION -p1 \
+ && cmake -DCMAKE_BUILD_TYPE=MinSizeRel \
+        -DCMAKE_SYSTEM_NAME=Windows \
+        -DCMAKE_C_COMPILER=$ARCH-gcc \
+        -DCMAKE_CXX_COMPILER=$ARCH-g++ \
+        -DCMAKE_RC_COMPILER=$ARCH-windres \
+        -DCMAKE_EXE_LINKER_FLAGS="-s" \
+        -DCMAKE_INSTALL_PREFIX=$PREFIX \
+        -DBUILD_CursesDialog=OFF \
+        -DBUILD_QtDialog=OFF \
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_USE_OPENSSL=OFF \
+        /cmake-$CMAKE_VERSION \
+ && make -j$(nproc) \
+ && make install
+
 WORKDIR /7z
 COPY src/7z.mak $PREFIX/src/
 RUN sed -i s/CommCtrl/commctrl/ $(grep -Rl CommCtrl CPP/) \
@@ -545,7 +579,8 @@ RUN sed -i s/CommCtrl/commctrl/ $(grep -Rl CommCtrl CPP/) \
 # Pack up a release
 
 WORKDIR /
-RUN rm -rf $PREFIX/share/man/ $PREFIX/share/info/ $PREFIX/share/gcc-*
+RUN rm -rf $PREFIX/share/man/ $PREFIX/share/info/ $PREFIX/share/gcc-* \
+           $PREFIX/doc/ $PREFIX/man/
 COPY README.md Dockerfile w64devkit.ini $PREFIX/
 RUN printf "id ICON \"$PREFIX/src/w64devkit.ico\"" >w64devkit.rc \
  && $ARCH-windres -o w64devkit.o w64devkit.rc \

README.md

@@ -9,6 +9,7 @@ Included tools:
 * [Mingw-w64 GCC][w64] : compilers, linker, assembler
 * [GDB][gdb] : debugger
 * [GNU Make][make] : standard build tool
+* [CMake][cmake] with [Ninja][ninja]: build system
 * [busybox-w32][bb] : standard unix utilities, including sh
 * [Vim][vim] : powerful text editor
 * [Universal Ctags][ctags] : source navigation
@@ -71,7 +72,7 @@ The x86 kit requires Windows XP or later and an SSE2-capable processor
 (e.g. at least Pentium 4); limited Unicode support. The toolchain targets
 the same by default. Runtimes contain SSE2 instructions, so GCC `-march`
 will not reliably target less capable processors when runtimes are linked
-(exceptions: `-lmemory`, `-lchkstk`).
+(exceptions: `-lmemory`, `-lchkstk`). CMake requires at least Windows 7.
 
 ## Build cache
 
@@ -211,6 +212,7 @@ binaries.
 [break]: https://nullprogram.com/blog/2022/06/26/
 [bs]: https://www.rdegges.com/2016/i-dont-give-a-shit-about-licensing/
 [ccache]: https://ccache.dev/
+[cmake]: https://cmake.org/
 [crt]: https://nullprogram.com/blog/2023/02/15/
 [ctags]: https://github.com/universal-ctags/ctags
 [debugbreak]: https://nullprogram.com/blog/2022/07/31/
@@ -231,6 +233,7 @@ binaries.
 [lic2]: https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-libraries/winpthreads/COPYING
 [make]: https://www.gnu.org/software/make/
 [names]: https://learn.microsoft.com/en-us/cpp/build/reference/decorated-names
+[ninja]: https://ninja-build.org/
 [san]: http://mingw-w64.org/doku.php/contribute#sanitizers_asan_tsan_usan
 [san2]: https://groups.google.com/forum/#!topic/address-sanitizer/q0e5EBVKZT4
 [vim]: https://www.vim.org/

src/SHA256SUMS

@@ -16,3 +16,5 @@ b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01  mpfr-4.2.2.tar
 a6456bc154999d83d0c20d968ac7ba6e7df0d02f3cb6427fb248660bacfb336e  vim-9.0.tar.bz2
 aae608dfe8213dfd05d909a57718ef82f30722c392344583d3f39050c7f29a80  xxHash-0.8.3.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-1.5.7.tar.gz
+7efaccde8c5a6b2968bad6ce0fe60e19b6e10701a12fce948c2bf79bac8a11e9  cmake-4.2.3.tar.gz
+f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23  ninja-1.13.1.tar.gz

src/cmake-force-ninja.patch

@@ -0,0 +1,8 @@
+Default to Ninja even if Visual Studio is installed.
+
+--- a/Source/cmake.cxx
++++ b/Source/cmake.cxx
+@@ -2818,2 +2818,3 @@ std::unique_ptr<cmGlobalGenerator> cmake::EvaluateDefaultGlobalGenerator()
+ #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW)
++  return cm::make_unique<cmGlobalNinjaGenerator>(this);
+   std::string found;

src/variant-x86.patch

@@ -1,46 +1,50 @@
 --- a/Dockerfile
 +++ b/Dockerfile
-@@ -62,3 +62,3 @@
+@@ -77,3 +77,3 @@ COPY src/w64devkit.c src/w64devkit.ico src/libmemory.c src/libchkstk.S \
 
 -ARG ARCH=x86_64-w64-mingw32
 +ARG ARCH=i686-w64-mingw32
 
-@@ -90,2 +90,3 @@
+@@ -109,2 +109,3 @@ RUN echo '#include <crtdefs.h>' \
          --with-default-msvcrt=msvcrt-os \
 +        --with-default-win32-winnt=0x0501 \
   && make -j$(nproc) \
-@@ -102,2 +103,3 @@
+@@ -121,2 +122,3 @@ RUN cat $PREFIX/src/gcc-*.patch | patch -d/gcc-$GCC_VERSION -p1 \
          --with-sysroot=/bootstrap \
 +        --with-arch=pentium4 \
          --target=$ARCH \
-@@ -138,4 +140,4 @@
+@@ -160,4 +162,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
          --disable-dependency-tracking \
 -        --disable-lib32 \
 -        --enable-lib64 \
 +        --enable-lib32 \
 +        --disable-lib64 \
          CFLAGS="-Os" \
-@@ -223,2 +225,3 @@
+@@ -246,2 +248,3 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-headers/configure \
          --with-default-msvcrt=msvcrt-os \
 +        --with-default-win32-winnt=0x0501 \
   && make -j$(nproc) \
-@@ -233,4 +236,4 @@
+@@ -256,4 +259,4 @@ RUN /mingw-w64-v$MINGW_VERSION/mingw-w64-crt/configure \
          --disable-dependency-tracking \
 -        --disable-lib32 \
 -        --enable-lib64 \
 +        --enable-lib32 \
 +        --disable-lib64 \
          CFLAGS="-Os" \
-@@ -257,2 +260,3 @@
+@@ -284,2 +287,3 @@ RUN echo 'BEGIN {print "pecoff"}' \
          --with-native-system-header-dir=/include \
 +        --with-arch=pentium4 \
          --target=$ARCH \
-@@ -277,2 +281,3 @@
+@@ -302,2 +306,3 @@ RUN echo 'BEGIN {print "pecoff"}' \
          --disable-win32-registry \
 +        --disable-win32-utf8-manifest \
          --enable-mingw-wildcard \
-@@ -384,3 +389,3 @@
+@@ -424,3 +429,3 @@ COPY src/busybox-* $PREFIX/src/
  RUN cat $PREFIX/src/busybox-*.patch | patch -p1 \
 - && make mingw64u_defconfig \
 + && make mingw64_defconfig \
   && sed -ri 's/^(CONFIG_AR)=y/\1=n/' .config \
+@@ -561,2 +566,3 @@ RUN cat $PREFIX/src/cmake-*.patch | patch -d/cmake-$CMAKE_VERSION -p1 \
+         -DCMAKE_RC_COMPILER=$ARCH-windres \
++        -DCMAKE_CXX_FLAGS="-Os -D_WIN32_WINNT=0x0601" \
+         -DCMAKE_EXE_LINKER_FLAGS="-s" \