From 1ba9e7e2ab6efe43f8c91ae48d4bc3fc86acc645 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 31 Mar 2023 00:15:02 -0700 Subject: [PATCH] Rename make-windows-release to windows-build.sh This has turned into a much more generic build script than it was originally, so rename it appropriately. --- .github/workflows/ci.yml | 2 +- NEWS | 8 ++++---- README.WINDOWS | 6 +++--- tools/make-releases | 2 +- tools/{make-windows-release => windows-build.sh} | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename tools/{make-windows-release => windows-build.sh} (99%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28e5ef48..62775454 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,7 +151,7 @@ jobs: make ${{matrix.cc_pkg}} pkgconf - - run: CFLAGS="$DEF_CFLAGS" ./tools/make-windows-release ${{matrix.options}} + - run: CFLAGS="$DEF_CFLAGS" ./tools/windows-build.sh ${{matrix.options}} - uses: actions/upload-artifact@v3 with: name: windows-${{matrix.msystem}}-bin diff --git a/NEWS b/NEWS index 200defb0..aa1639cd 100644 --- a/NEWS +++ b/NEWS @@ -8,10 +8,10 @@ Version 1.14.0-BETA1: Fixed a bug in 'wimsplit' where it didn't accept part sizes of 4 GiB or larger on Windows and on 32-bit platforms. - The README.WINDOWS file and the tools/make-windows-release script have - been improved to make it easier to build wimlib on Windows. The - instructions now use MSYS2 (instead of Cygwin as they did before), and - both gcc and clang are supported. + The README.WINDOWS file and the tools/windows-build.sh script (renamed + from 'make-windows-release') have been improved to make it easier to + build wimlib on Windows. The instructions now use MSYS2 (instead of + Cygwin as they did before), and both gcc and clang are supported. Removed support for Windows XP. diff --git a/README.WINDOWS b/README.WINDOWS index 20027186..75b54802 100644 --- a/README.WINDOWS +++ b/README.WINDOWS @@ -111,8 +111,8 @@ latest development snapshot. Optionally, you can check out a specific version, e.g. 'cd wimlib && git checkout v1.14.0'. For old versions, please refer to the documentation for that version, as things may have changed. Also, it is possible to use a release tarball (e.g. wimlib-1.14.0.tar.gz) instead of the git -repository; however, the make-windows-release script will not be available in -that case and you will need to handle more things yourself. +repository; however, the windows-build.sh script will not be available in that +case and you will need to handle more things yourself. Finally, to actually do a build, close the MSYS2 shell you have open, then open one of the following from the Start menu: @@ -126,7 +126,7 @@ one of the following from the Start menu: (If unsure, use "MSYS2 MINGW64".) Then run the following commands: cd wimlib - tools/make-windows-release --install-prerequisites + tools/windows-build.sh --install-prerequisites The script will automatically download and install the packages needed to build wimlib in the chosen MSYS2 environment, then build wimlib. The output will be diff --git a/tools/make-releases b/tools/make-releases index 1e0f7365..bf61c345 100755 --- a/tools/make-releases +++ b/tools/make-releases @@ -17,5 +17,5 @@ libdeflate-gunzip $gzfile libdeflate-gzip -12 $tarfile for arch in i686 x86_64; do - ./tools/make-windows-release --arch=$arch --include-docs --zip + ./tools/windows-build.sh --arch=$arch --include-docs --zip done diff --git a/tools/make-windows-release b/tools/windows-build.sh similarity index 99% rename from tools/make-windows-release rename to tools/windows-build.sh index 72f7608b..bd4e13aa 100755 --- a/tools/make-windows-release +++ b/tools/windows-build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# This script prepares a Windows binary distribution of wimlib. +# This script builds wimlib for Windows. It supports both MSYS2 and Linux. set -e -u -- 2.43.0