From 6facb18f9f89263966aa20ada84507c6f7999c75 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 23 May 2023 22:21:52 +0300 Subject: [PATCH 7/8] installer_cross: Rename "Output" as "output" See osdn #48064 Signed-off-by: Marko Lindqvist --- .../installer_cross/create-freeciv-gtk-qt-nsi.sh | 2 +- .../installer_cross/create-freeciv-ruledit-nsi.sh | 2 +- windows/installer_cross/create-freeciv-sdl2-nsi.sh | 2 +- windows/installer_cross/installer_build.sh | 14 +++++++------- windows/installer_cross/meson-installer_build.sh | 10 +++++----- windows/installer_cross/meson-winbuild.sh | 6 +++--- windows/installer_cross/winbuild.sh | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh index b0c236cd01..0a48f6b475 100755 --- a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh +++ b/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh @@ -1,6 +1,6 @@ #!/bin/sh -# ./create-freeciv-gtk-qt-nsi.sh [mp gui] [exe id] [unistall setup script] +# ./create-freeciv-gtk-qt-nsi.sh [mp gui] [exe id] [unistall setup script] if test "$8" != "" ; then EXE_ID="$8" diff --git a/windows/installer_cross/create-freeciv-ruledit-nsi.sh b/windows/installer_cross/create-freeciv-ruledit-nsi.sh index d2e1e68d53..fd3540c885 100755 --- a/windows/installer_cross/create-freeciv-ruledit-nsi.sh +++ b/windows/installer_cross/create-freeciv-ruledit-nsi.sh @@ -1,6 +1,6 @@ #!/bin/sh -# ./create-freeciv-ruledit.sh +# ./create-freeciv-ruledit.sh cat < [unistall setup script] +# ./create-freeciv-sdl2-nsi.sh [unistall setup script] if test "$5" != "" && ! test -x "$5" ; then echo "$5 not an executable script" >&2 diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh index 09b801f5dc..3d98072288 100755 --- a/windows/installer_cross/installer_build.sh +++ b/windows/installer_cross/installer_build.sh @@ -237,14 +237,14 @@ if test "$GUI" = "ruledit" ; then fi if ! ./create-freeciv-ruledit-nsi.sh \ - "$INSTDIR" "autotools/Output" "$VERREV" "$SETUP" \ + "$INSTDIR" "autotools/output" "$VERREV" "$SETUP" \ > Freeciv-ruledit-$SETUP-$VERREV.nsi then exit 1 fi - if ! mkdir -p autotools/Output ; then - echo "Cannot create autotools/Output directory" >&2 + if ! mkdir -p autotools/output ; then + echo "Cannot create autotools/output directory" >&2 exit 1 fi if ! makensis Freeciv-ruledit-$SETUP-$VERREV.nsi @@ -308,7 +308,7 @@ else if test "$GUI" = "sdl2" ; then if ! ./create-freeciv-sdl2-nsi.sh \ - "$INSTDIR" "autotools/Output" "$VERREV" "$SETUP" \ + "$INSTDIR" "autotools/output" "$VERREV" "$SETUP" \ "helpers/uninstaller-helper-gtk3.sh" \ > Freeciv-$SETUP-$VERREV-$GUI.nsi then @@ -326,7 +326,7 @@ else UNINSTALLER="" fi if ! ./create-freeciv-gtk-qt-nsi.sh \ - "$INSTDIR" "autotools/Output" "$VERREV" "$GUI" "$GUINAME" \ + "$INSTDIR" "autotools/output" "$VERREV" "$GUI" "$GUINAME" \ "$SETUP" "$MPGUI" "$EXE_ID" "$UNINSTALLER" \ > Freeciv-$SETUP-$VERREV-$GUI.nsi then @@ -334,8 +334,8 @@ else fi fi - if ! mkdir -p autotools/Output ; then - echo "Cannot create autotools/Output directory" >&2 + if ! mkdir -p autotools/output ; then + echo "Cannot create autotools/output directory" >&2 exit 1 fi if ! makensis Freeciv-$SETUP-$VERREV-$GUI.nsi diff --git a/windows/installer_cross/meson-installer_build.sh b/windows/installer_cross/meson-installer_build.sh index 917eba0efd..8d559e4663 100755 --- a/windows/installer_cross/meson-installer_build.sh +++ b/windows/installer_cross/meson-installer_build.sh @@ -218,7 +218,7 @@ if test "$GUI" = "ruledit" ; then NSI_FILE="${NSI_DIR}/ruledit-${SETUP}-${VERREV}.nsi" if ! ./create-freeciv-ruledit-nsi.sh \ - "$INSTDIR" "meson/Output" "$VERREV" "$SETUP" \ + "$INSTDIR" "meson/output" "$VERREV" "$SETUP" \ > "$NSI_FILE" then exit 1 @@ -300,14 +300,14 @@ else if test "$GUI" = "sdl2" ; then if ! ./create-freeciv-sdl2-nsi.sh \ - "$INSTDIR" "meson/Output" "$VERREV" "$SETUP" "$UNINSTALLER" \ + "$INSTDIR" "meson/output" "$VERREV" "$SETUP" "$UNINSTALLER" \ > "$NSI_FILE" then exit 1 fi else if ! ./create-freeciv-gtk-qt-nsi.sh \ - "$INSTDIR" "meson/Output" "$VERREV" "$GUI" "$GUINAME" \ + "$INSTDIR" "meson/output" "$VERREV" "$GUI" "$GUINAME" \ "$SETUP" "$MPGUI" "$EXE_ID" "$UNINSTALLER" \ > "$NSI_FILE" then @@ -316,8 +316,8 @@ else fi fi -if ! mkdir -p meson/Output ; then - echo "Creating meson/Output directory failed" >&2 +if ! mkdir -p meson/output ; then + echo "Creating meson/output directory failed" >&2 exit 1 fi diff --git a/windows/installer_cross/meson-winbuild.sh b/windows/installer_cross/meson-winbuild.sh index b603642c30..49c1bbeb29 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/windows/installer_cross/meson-winbuild.sh @@ -187,14 +187,14 @@ fi exit 1 fi -if ! mkdir -p meson/Output ; then - echo "Creating meson/Output directory failed" >&2 +if ! mkdir -p meson/output ; then + echo "Creating meson/output directory failed" >&2 exit 1 fi ( cd meson/install - if ! 7z a -r ../Output/${PACKAGENAME}.7z ${PACKAGENAME} + if ! 7z a -r ../output/${PACKAGENAME}.7z ${PACKAGENAME} then echo "7z failed" >&2 exit 1 diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh index 973d8b354a..f8753156be 100755 --- a/windows/installer_cross/winbuild.sh +++ b/windows/installer_cross/winbuild.sh @@ -276,12 +276,12 @@ fi exit 1 fi -if ! mkdir -p autotools/Output ; then - echo "Creating autotools/Output directory failed" >&2 +if ! mkdir -p autotools/output ; then + echo "Creating autotools/output directory failed" >&2 exit 1 fi -if ! 7z a -r autotools/Output/freeciv-${VERREV}${NAMEP}.7z \ +if ! 7z a -r autotools/output/freeciv-${VERREV}${NAMEP}.7z \ freeciv-${VERREV}${NAMEP} then echo "7z failed" >&2 -- 2.39.2