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.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28e5ef48baf1c071b32dc45d10ee0e8c87033ec0..62775454ad117df491dbd202912b6176e8a0db6a 100644 (file)
--- 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 200defb0ed85281bb8a900b53a538e617ac49dbc..aa1639cd9b752a95a24a1a0f03316689f91c6c9f 100644 (file)
--- 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 200271869b259456016a6d1cb104a9d19e69bbd3..75b54802c49aace9a6b49fb25c287c277a6b3b75 100644 (file)
--- 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 1e0f736578816e8d2c546db308ef8796f6808541..bf61c34579d98237747a44e6df6d7340e50d9959 100755 (executable)
--- 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 72f7608b8daf33469b89d73ca65b4209e55913e4..bd4e13aa390cd20185c78a9bc1a870f335210125 100755 (executable)
--- 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