Merging upstream version 4.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 2 deletions

diff --git a/tools/msys2-setup.sh b/tools/msys2-setup.sh
index 0ca63299..be78607e 100644
--- a/tools/msys2-setup.sh
+++ b/tools/msys2-setup.sh
@@ -16,6 +16,7 @@ function print_usage() {
 	printf "The basic usage installs the needed software\\n\\n"
 	printf "Usage: %s [--install-optional] [...other options...]\\n" "$0"
 	printf "\\t--install-optional: install optional software as well\\n"
+	printf "\\t--install-nsis-deps: install packages required to build NSIS installer\\n"
 	printf "\\t--install-test-deps: install packages required to run all tests\\n"
 	printf "\\t--install-all: install everything\\n"
 	printf "\\t[other]: other options are passed as-is to pacman\\n"
@@ -34,11 +35,15 @@ for arg; do
 		--install-optional)
 			ADDITIONAL=1
 			;;
+		--install-nsis-deps)
+			NSISDEPS=1
+			;;
 		--install-test-deps)
 			TESTDEPS=1
 			;;
 		--install-all)
 			ADDITIONAL=1
+			NSISDEPS=1
 			TESTDEPS=1
 			;;
 		*)
@@ -51,9 +56,11 @@ PACKAGE_PREFIX="${MINGW_PACKAGE_PREFIX:-mingw-w64-x86_64}"
 
 #
 # Lua packaging is kind of a mess. Lua 5.2 is not available. Some packages have
-# a hard dependy on LuaJIT and it conflicts with Lua 5.1 and vice-versa.
+# a hard dependency on LuaJIT and it conflicts with Lua 5.1 and vice-versa.
 # This will probably have to be fixed by the MSYS2 maintainers.
-# XXX Is this still true?
+# XXX Is this still true? We can use Lua 5.3 and 5.4 now, though we still
+# might want to package our own version to use our UTF-8 on Windows patch
+# (though we don't apply that patch yet.)
 #
 BASIC_LIST="base-devel \
 	git \
@@ -100,6 +107,8 @@ ADDITIONAL_LIST="${PACKAGE_PREFIX}-asciidoctor \
 	${PACKAGE_PREFIX}-perl \
 	${PACKAGE_PREFIX}-ntldd"
 
+NSISDEPS_LIST="${PACKAGE_PREFIX}-nsis"
+
 TESTDEPS_LIST="${PACKAGE_PREFIX}-python-pytest \
 	${PACKAGE_PREFIX}-python-pytest-xdist"
 
@@ -110,6 +119,11 @@ then
 	ACTUAL_LIST="$ACTUAL_LIST $ADDITIONAL_LIST"
 fi
 
+if [ $NSISDEPS -ne 0 ]
+then
+	ACTUAL_LIST="$ACTUAL_LIST $NSISDEPS_LIST"
+fi
+
 if [ $TESTDEPS -ne 0 ]
 then
 	ACTUAL_LIST="$ACTUAL_LIST $TESTDEPS_LIST"
@@ -123,6 +137,11 @@ then
 	printf "\n*** Optional packages not installed. Rerun with --install-optional to have them.\n"
 fi
 
+if [ $NSISDEPS -eq 0 ]
+then
+	printf "\n*** NSIS installer deps not installed. Rerun with --install-nsis-deps to have them.\n"
+fi
+
 if [ $TESTDEPS -eq 0 ]
 then
 	printf "\n*** Test deps not installed. Rerun with --install-test-deps to have them.\n"