From 574a6f9ba0fc6a77017929c3f9bd7fd5e9e95276 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 22 Jul 2025 06:21:42 +0300 Subject: [PATCH 69/69] installer_cross: Rename create-freeciv-sdl2-nsi.sh as create-freeciv-sdl-nsi.sh See RM #1628 Signed-off-by: Marko Lindqvist --- platforms/windows/Makefile.am | 2 +- .../{create-freeciv-sdl2-nsi.sh => create-freeciv-sdl-nsi.sh} | 2 +- platforms/windows/installer_cross/meson-installer_build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename platforms/windows/installer_cross/{create-freeciv-sdl2-nsi.sh => create-freeciv-sdl-nsi.sh} (99%) diff --git a/platforms/windows/Makefile.am b/platforms/windows/Makefile.am index 86297a9cd5..5fe7e5c919 100644 --- a/platforms/windows/Makefile.am +++ b/platforms/windows/Makefile.am @@ -28,7 +28,7 @@ dist_noinst_DATA = \ installer_msys2/Freeciv.url \ installer_msys2/Makefile.meson \ installer_cross/create-freeciv-gtk-qt-nsi.sh \ - installer_cross/create-freeciv-sdl2-nsi.sh \ + installer_cross/create-freeciv-sdl-nsi.sh \ installer_cross/create-freeciv-ruledit-nsi.sh \ installer_cross/Freeciv.url \ installer_cross/freeciv-server.cmd \ diff --git a/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh b/platforms/windows/installer_cross/create-freeciv-sdl-nsi.sh similarity index 99% rename from platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh rename to platforms/windows/installer_cross/create-freeciv-sdl-nsi.sh index d72cb21aed..5c3c909e4d 100755 --- a/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh +++ b/platforms/windows/installer_cross/create-freeciv-sdl-nsi.sh @@ -1,6 +1,6 @@ #!/bin/sh -# ./create-freeciv-sdl2-nsi.sh [uninstall setup script] +# ./create-freeciv-sdl-nsi.sh [uninstall setup script] if test "$5" != "" && ! test -x "$5" ; then echo "$5 not an executable script" >&2 diff --git a/platforms/windows/installer_cross/meson-installer_build.sh b/platforms/windows/installer_cross/meson-installer_build.sh index 3d8ee8635b..cbbdba5268 100755 --- a/platforms/windows/installer_cross/meson-installer_build.sh +++ b/platforms/windows/installer_cross/meson-installer_build.sh @@ -315,7 +315,7 @@ else NSI_FILE="${NSI_DIR}/client-${SETUP}-${VERREV}-${GUI}.nsi" if test "${GUI}" = "sdl2" ; then - if ! "${SRC_DIR}/create-freeciv-sdl2-nsi.sh" \ + if ! "${SRC_DIR}/create-freeciv-sdl-nsi.sh" \ "${INSTDIR}" "${BUILD_ROOT}/meson/output" "${VERREV}" "${SETUP}" "${UNINSTALLER}" \ > "${NSI_FILE}" then -- 2.47.2