From ade4795389d48989b5417a3d384687595d49fd81 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 13 Jun 2023 09:07:41 +0300 Subject: [PATCH 42/42] Move installer_cross under platforms/windows/ See osdn #48233 Signed-off-by: Marko Lindqvist --- Makefile.am | 1 - configure.ac | 1 - platforms/windows/Makefile.am | 28 +++++++++++++++++- .../windows}/installer_cross/.gitignore | 0 .../windows}/installer_cross/Freeciv.url | 0 .../installer_cross/build_all_installers.sh | 0 .../create-freeciv-gtk-qt-nsi.sh | 6 ++-- .../create-freeciv-ruledit-nsi.sh | 6 ++-- .../create-freeciv-sdl2-nsi.sh | 6 ++-- .../installer_cross/freeciv-gtk3.22.cmd | 0 .../windows}/installer_cross/freeciv-gtk4.cmd | 0 .../installer_cross/freeciv-mp-gtk3.cmd | 0 .../installer_cross/freeciv-mp-gtk4.cmd | 0 .../installer_cross/freeciv-mp-qt.cmd | 0 .../windows}/installer_cross/freeciv-qt.cmd | 0 .../installer_cross/freeciv-ruledit.cmd | 0 .../windows}/installer_cross/freeciv-sdl2.cmd | 0 .../installer_cross/freeciv-server.cmd | 0 .../helpers/installer-helper-gtk3.cmd | 0 .../helpers/installer-helper-gtk4.cmd | 0 .../helpers/installer-helper-qt.cmd | 0 .../helpers/uninstaller-helper-gtk3.sh | 0 .../installer_cross/installer_build.sh | 16 +++++----- .../installer_cross/licenses/header.txt | 0 .../meson-build_all_installers.sh | 0 .../installer_cross/meson-installer_build.sh | 14 +++++---- .../installer_cross/meson-winbuild.sh | 10 +++---- .../installer_cross/setups/cross-win32.tmpl | 0 .../installer_cross/setups/cross-win64.tmpl | 0 .../windows}/installer_cross/winbuild.sh | 16 +++++----- windows/.gitignore | 2 -- windows/Makefile.am | 29 ------------------- 32 files changed, 66 insertions(+), 69 deletions(-) rename {windows => platforms/windows}/installer_cross/.gitignore (100%) rename {windows => platforms/windows}/installer_cross/Freeciv.url (100%) rename {windows => platforms/windows}/installer_cross/build_all_installers.sh (100%) rename {windows => platforms/windows}/installer_cross/create-freeciv-gtk-qt-nsi.sh (98%) rename {windows => platforms/windows}/installer_cross/create-freeciv-ruledit-nsi.sh (98%) rename {windows => platforms/windows}/installer_cross/create-freeciv-sdl2-nsi.sh (98%) rename {windows => platforms/windows}/installer_cross/freeciv-gtk3.22.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-gtk4.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-mp-gtk3.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-mp-gtk4.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-mp-qt.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-qt.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-ruledit.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-sdl2.cmd (100%) rename {windows => platforms/windows}/installer_cross/freeciv-server.cmd (100%) rename {windows => platforms/windows}/installer_cross/helpers/installer-helper-gtk3.cmd (100%) rename {windows => platforms/windows}/installer_cross/helpers/installer-helper-gtk4.cmd (100%) rename {windows => platforms/windows}/installer_cross/helpers/installer-helper-qt.cmd (100%) rename {windows => platforms/windows}/installer_cross/helpers/uninstaller-helper-gtk3.sh (100%) rename {windows => platforms/windows}/installer_cross/installer_build.sh (94%) rename {windows => platforms/windows}/installer_cross/licenses/header.txt (100%) rename {windows => platforms/windows}/installer_cross/meson-build_all_installers.sh (100%) rename {windows => platforms/windows}/installer_cross/meson-installer_build.sh (95%) rename {windows => platforms/windows}/installer_cross/meson-winbuild.sh (94%) rename {windows => platforms/windows}/installer_cross/setups/cross-win32.tmpl (100%) rename {windows => platforms/windows}/installer_cross/setups/cross-win64.tmpl (100%) rename {windows => platforms/windows}/installer_cross/winbuild.sh (94%) delete mode 100644 windows/.gitignore delete mode 100644 windows/Makefile.am diff --git a/Makefile.am b/Makefile.am index 4ca067ab66..c320b722ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,6 @@ SUBDIRS = \ utility \ common \ tests \ - windows \ platforms \ $(SSUBDIRS) \ client \ diff --git a/configure.ac b/configure.ac index 0efa8d2c3e..858518e4f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1962,7 +1962,6 @@ AC_CONFIG_FILES([Makefile platforms/Makefile platforms/windows/Makefile platforms/windows/icons/Makefile - windows/Makefile client/Makefile client/agents/Makefile client/include/Makefile diff --git a/platforms/windows/Makefile.am b/platforms/windows/Makefile.am index fb440a81a1..835ec5eb4f 100644 --- a/platforms/windows/Makefile.am +++ b/platforms/windows/Makefile.am @@ -23,4 +23,30 @@ dist_noinst_DATA = \ installer_msys2/Freeciv.url \ installer_msys2/Makefile.autotools \ installer_msys2/Makefile.meson \ - installer_msys2/cleanup_checkout.sh + installer_msys2/cleanup_checkout.sh \ + installer_cross/create-freeciv-gtk-qt-nsi.sh \ + installer_cross/create-freeciv-sdl2-nsi.sh \ + installer_cross/create-freeciv-ruledit-nsi.sh \ + installer_cross/installer_build.sh \ + installer_cross/build_all_installers.sh \ + installer_cross/winbuild.sh \ + installer_cross/Freeciv.url \ + installer_cross/freeciv-server.cmd \ + installer_cross/freeciv-gtk3.22.cmd \ + installer_cross/freeciv-gtk4.cmd \ + installer_cross/freeciv-mp-gtk3.cmd \ + installer_cross/freeciv-mp-gtk4.cmd \ + installer_cross/freeciv-qt.cmd \ + installer_cross/freeciv-mp-qt.cmd \ + installer_cross/freeciv-sdl2.cmd \ + installer_cross/freeciv-ruledit.cmd \ + installer_cross/licenses/header.txt \ + installer_cross/helpers/installer-helper-gtk3.cmd \ + installer_cross/helpers/installer-helper-gtk4.cmd \ + installer_cross/helpers/installer-helper-qt.cmd \ + installer_cross/helpers/uninstaller-helper-gtk3.sh \ + installer_cross/meson-build_all_installers.sh \ + installer_cross/meson-installer_build.sh \ + installer_cross/meson-winbuild.sh \ + installer_cross/setups/cross-win32.tmpl \ + installer_cross/setups/cross-win64.tmpl diff --git a/windows/installer_cross/.gitignore b/platforms/windows/installer_cross/.gitignore similarity index 100% rename from windows/installer_cross/.gitignore rename to platforms/windows/installer_cross/.gitignore diff --git a/windows/installer_cross/Freeciv.url b/platforms/windows/installer_cross/Freeciv.url similarity index 100% rename from windows/installer_cross/Freeciv.url rename to platforms/windows/installer_cross/Freeciv.url diff --git a/windows/installer_cross/build_all_installers.sh b/platforms/windows/installer_cross/build_all_installers.sh similarity index 100% rename from windows/installer_cross/build_all_installers.sh rename to platforms/windows/installer_cross/build_all_installers.sh diff --git a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh b/platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh similarity index 98% rename from windows/installer_cross/create-freeciv-gtk-qt-nsi.sh rename to platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh index d60902416a..bcb020b943 100755 --- a/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh +++ b/platforms/windows/installer_cross/create-freeciv-gtk-qt-nsi.sh @@ -195,7 +195,7 @@ SectionGroup "Additional languages (translation %)" EOF -cat ../../bootstrap/langstat_core.txt | +cat ../../../bootstrap/langstat_core.txt | sort -k 1 | while read -r code prct name do @@ -256,7 +256,7 @@ Start Menu shortcut properties." \${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)" EOF - cat ../../bootstrap/langstat_core.txt | + cat ../../../bootstrap/langstat_core.txt | sort -k 1 | while read -r code prct name do @@ -280,7 +280,7 @@ EOF echo " StrCpy \$DefaultLanguageCode \"en_US\"" echo " \${EndIf}" - cat ../../bootstrap/langstat_core.txt | + cat ../../../bootstrap/langstat_core.txt | while read -r code prct name do echo " \${If} \$LangName == \"$name ($code) $prct\"" diff --git a/windows/installer_cross/create-freeciv-ruledit-nsi.sh b/platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh similarity index 98% rename from windows/installer_cross/create-freeciv-ruledit-nsi.sh rename to platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh index fd3540c885..247c0a5a8f 100755 --- a/windows/installer_cross/create-freeciv-ruledit-nsi.sh +++ b/platforms/windows/installer_cross/create-freeciv-ruledit-nsi.sh @@ -165,7 +165,7 @@ SectionGroup "Additional languages (translation %)" EOF -cat ../../bootstrap/langstat_ruledit.txt | +cat ../../../bootstrap/langstat_ruledit.txt | sort -k 1 | while read -r code prct name do @@ -226,7 +226,7 @@ Start Menu shortcut properties." \${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)" EOF - cat ../../bootstrap/langstat_ruledit.txt | + cat ../../../bootstrap/langstat_ruledit.txt | sort -k 1 | while read -r code prct name do @@ -250,7 +250,7 @@ EOF echo " StrCpy \$DefaultLanguageCode \"en_US\"" echo " \${EndIf}" - cat ../../bootstrap/langstat_ruledit.txt | + cat ../../../bootstrap/langstat_ruledit.txt | while read -r code prct name do echo " \${If} \$LangName == \"$name ($code) $prct\"" diff --git a/windows/installer_cross/create-freeciv-sdl2-nsi.sh b/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh similarity index 98% rename from windows/installer_cross/create-freeciv-sdl2-nsi.sh rename to platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh index cac15c012a..6a81091769 100755 --- a/windows/installer_cross/create-freeciv-sdl2-nsi.sh +++ b/platforms/windows/installer_cross/create-freeciv-sdl2-nsi.sh @@ -181,7 +181,7 @@ SectionGroup "Additional languages (translation %)" EOF -cat ../../bootstrap/langstat_core.txt | +cat ../../../bootstrap/langstat_core.txt | sort -k 1 | while read -r code prct name do @@ -260,7 +260,7 @@ Start Menu shortcut properties." \${NSD_CB_AddString} \$DefaultLanguageDropList "US English (en_US)" EOF - cat ../../bootstrap/langstat_core.txt | + cat ../../../bootstrap/langstat_core.txt | sort -k 1 | while read -r code prct name do @@ -284,7 +284,7 @@ EOF echo " StrCpy \$DefaultLanguageCode \"en_US\"" echo " \${EndIf}" - cat ../../bootstrap/langstat_core.txt | + cat ../../../bootstrap/langstat_core.txt | while read -r code prct name do echo " \${If} \$LangName == \"$name ($code) $prct\"" diff --git a/windows/installer_cross/freeciv-gtk3.22.cmd b/platforms/windows/installer_cross/freeciv-gtk3.22.cmd similarity index 100% rename from windows/installer_cross/freeciv-gtk3.22.cmd rename to platforms/windows/installer_cross/freeciv-gtk3.22.cmd diff --git a/windows/installer_cross/freeciv-gtk4.cmd b/platforms/windows/installer_cross/freeciv-gtk4.cmd similarity index 100% rename from windows/installer_cross/freeciv-gtk4.cmd rename to platforms/windows/installer_cross/freeciv-gtk4.cmd diff --git a/windows/installer_cross/freeciv-mp-gtk3.cmd b/platforms/windows/installer_cross/freeciv-mp-gtk3.cmd similarity index 100% rename from windows/installer_cross/freeciv-mp-gtk3.cmd rename to platforms/windows/installer_cross/freeciv-mp-gtk3.cmd diff --git a/windows/installer_cross/freeciv-mp-gtk4.cmd b/platforms/windows/installer_cross/freeciv-mp-gtk4.cmd similarity index 100% rename from windows/installer_cross/freeciv-mp-gtk4.cmd rename to platforms/windows/installer_cross/freeciv-mp-gtk4.cmd diff --git a/windows/installer_cross/freeciv-mp-qt.cmd b/platforms/windows/installer_cross/freeciv-mp-qt.cmd similarity index 100% rename from windows/installer_cross/freeciv-mp-qt.cmd rename to platforms/windows/installer_cross/freeciv-mp-qt.cmd diff --git a/windows/installer_cross/freeciv-qt.cmd b/platforms/windows/installer_cross/freeciv-qt.cmd similarity index 100% rename from windows/installer_cross/freeciv-qt.cmd rename to platforms/windows/installer_cross/freeciv-qt.cmd diff --git a/windows/installer_cross/freeciv-ruledit.cmd b/platforms/windows/installer_cross/freeciv-ruledit.cmd similarity index 100% rename from windows/installer_cross/freeciv-ruledit.cmd rename to platforms/windows/installer_cross/freeciv-ruledit.cmd diff --git a/windows/installer_cross/freeciv-sdl2.cmd b/platforms/windows/installer_cross/freeciv-sdl2.cmd similarity index 100% rename from windows/installer_cross/freeciv-sdl2.cmd rename to platforms/windows/installer_cross/freeciv-sdl2.cmd diff --git a/windows/installer_cross/freeciv-server.cmd b/platforms/windows/installer_cross/freeciv-server.cmd similarity index 100% rename from windows/installer_cross/freeciv-server.cmd rename to platforms/windows/installer_cross/freeciv-server.cmd diff --git a/windows/installer_cross/helpers/installer-helper-gtk3.cmd b/platforms/windows/installer_cross/helpers/installer-helper-gtk3.cmd similarity index 100% rename from windows/installer_cross/helpers/installer-helper-gtk3.cmd rename to platforms/windows/installer_cross/helpers/installer-helper-gtk3.cmd diff --git a/windows/installer_cross/helpers/installer-helper-gtk4.cmd b/platforms/windows/installer_cross/helpers/installer-helper-gtk4.cmd similarity index 100% rename from windows/installer_cross/helpers/installer-helper-gtk4.cmd rename to platforms/windows/installer_cross/helpers/installer-helper-gtk4.cmd diff --git a/windows/installer_cross/helpers/installer-helper-qt.cmd b/platforms/windows/installer_cross/helpers/installer-helper-qt.cmd similarity index 100% rename from windows/installer_cross/helpers/installer-helper-qt.cmd rename to platforms/windows/installer_cross/helpers/installer-helper-qt.cmd diff --git a/windows/installer_cross/helpers/uninstaller-helper-gtk3.sh b/platforms/windows/installer_cross/helpers/uninstaller-helper-gtk3.sh similarity index 100% rename from windows/installer_cross/helpers/uninstaller-helper-gtk3.sh rename to platforms/windows/installer_cross/helpers/uninstaller-helper-gtk3.sh diff --git a/windows/installer_cross/installer_build.sh b/platforms/windows/installer_cross/installer_build.sh similarity index 94% rename from windows/installer_cross/installer_build.sh rename to platforms/windows/installer_cross/installer_build.sh index d5a3e660ee..523412f2b1 100755 --- a/windows/installer_cross/installer_build.sh +++ b/platforms/windows/installer_cross/installer_build.sh @@ -174,11 +174,13 @@ fi SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//') -VERREV="$(../../fc_version)" +SRC_ROOT="$(cd ../../.. || exit 1 ; pwd)" -if test "$INST_CROSS_MODE" != "release" ; then - if test -d ../../.git || test -f ../../.git ; then - VERREV="$VERREV-$(cd ../.. && git rev-parse --short HEAD)" +VERREV="$("${SRC_ROOT}/fc_version")" + +if test "${INST_CROSS_MODE}" != "release" ; then + if test -d "${SRC_ROOT}/.git" || test -f "${SRC_ROOT}/.git" ; then + VERREV="$VERREV-$(cd "${SRC_ROOT}" && git rev-parse --short HEAD)" GITREVERT=true fi fi @@ -193,7 +195,7 @@ if test "$GUI" = "ruledit" ; then exit 1 fi if test "$GITREVERT" = true ; then - git checkout ../../translations/ruledit + git checkout "${SRC_ROOT}/translations/ruledit" fi else if ! make -C autotools/build/${SETUP}-client-${GUI}/translations/core update-po || @@ -203,7 +205,7 @@ else exit 1 fi if test "$GITREVERT" = true ; then - git checkout ../../translations/core + git checkout "${SRC_ROOT}/translations/core" fi fi @@ -211,7 +213,7 @@ if ! mv $INSTDIR/bin/* $INSTDIR/ || ! mv $INSTDIR/share/freeciv $INSTDIR/data || ! mv $INSTDIR/share/doc $INSTDIR/ || ! mkdir -p $INSTDIR/doc/freeciv/installer || - ! cat licenses/header.txt ../../COPYING > $INSTDIR/doc/freeciv/installer/COPYING.installer || + ! cat licenses/header.txt "${SRC_ROOT}/COPYING" > "${INSTDIR}/doc/freeciv/installer/COPYING.installer" || ! rm -Rf $INSTDIR/lib || ! cp Freeciv.url $INSTDIR/ then diff --git a/windows/installer_cross/licenses/header.txt b/platforms/windows/installer_cross/licenses/header.txt similarity index 100% rename from windows/installer_cross/licenses/header.txt rename to platforms/windows/installer_cross/licenses/header.txt diff --git a/windows/installer_cross/meson-build_all_installers.sh b/platforms/windows/installer_cross/meson-build_all_installers.sh similarity index 100% rename from windows/installer_cross/meson-build_all_installers.sh rename to platforms/windows/installer_cross/meson-build_all_installers.sh diff --git a/windows/installer_cross/meson-installer_build.sh b/platforms/windows/installer_cross/meson-installer_build.sh similarity index 95% rename from windows/installer_cross/meson-installer_build.sh rename to platforms/windows/installer_cross/meson-installer_build.sh index 8d559e4663..76e635e37b 100755 --- a/windows/installer_cross/meson-installer_build.sh +++ b/platforms/windows/installer_cross/meson-installer_build.sh @@ -158,7 +158,9 @@ fi SETUP=$(grep "CrosserSetup=" $DLLSPATH/crosser.txt | sed -e 's/CrosserSetup="//' -e 's/"//') -VERREV="$(../../fc_version)" +SRC_ROOT="$(cd ../../.. || exit 1 ; pwd)" + +VERREV="$("${SRC_ROOT}/fc_version")" if ! ( cd "meson/build/${SETUP}-${GUI}" && ninja langstat_core.txt ) ; then echo "langstat_core.txt creation failed!" >&2 @@ -171,9 +173,9 @@ if test "$GUI" = "ruledit" && exit 1 fi -if test "$INST_CROSS_MODE" != "release" ; then - if test -d ../../.git || test -f ../../.git ; then - VERREV="$VERREV-$(cd ../.. && git rev-parse --short HEAD)" +if test "${INST_CROSS_MODE}" != "release" ; then + if test -d "${SRC_ROOT}/.git" || test -f "${SRC_ROOT}/.git" ; then + VERREV="$VERREV-$(cd "${SRC_ROOT}" && git rev-parse --short HEAD)" fi fi @@ -183,8 +185,8 @@ if ! mv $INSTDIR/bin/* $INSTDIR/ || ! mv $INSTDIR/share/freeciv $INSTDIR/data || ! mv $INSTDIR/share/doc $INSTDIR/ || ! mkdir -p $INSTDIR/doc/freeciv/installer || - ! cat licenses/header.txt ../../COPYING \ - > $INSTDIR/doc/freeciv/installer/COPYING.installer || + ! cat licenses/header.txt "${SRC_ROOT}/COPYING" \ + > "${INSTDIR}/doc/freeciv/installer/COPYING.installer" || ! rm -Rf $INSTDIR/lib || ! cp Freeciv.url $INSTDIR/ then diff --git a/windows/installer_cross/meson-winbuild.sh b/platforms/windows/installer_cross/meson-winbuild.sh similarity index 94% rename from windows/installer_cross/meson-winbuild.sh rename to platforms/windows/installer_cross/meson-winbuild.sh index ea74f4fa7e..8d7f0aeeb2 100755 --- a/windows/installer_cross/meson-winbuild.sh +++ b/platforms/windows/installer_cross/meson-winbuild.sh @@ -43,12 +43,12 @@ if ! test -f "$DLLSPATH/crosser.txt" ; then exit 1 fi -SRC_ROOT="$(cd ../.. || exit 1 ; pwd)" +SRC_ROOT="$(cd ../../.. || exit 1 ; pwd)" -VERREV="$(${SRC_ROOT}/fc_version)" -if test "$INST_CROSS_MODE" != "release" ; then - if test -d ${SRC_ROOT}/.git || test -f ${SRC_ROOT}/.git ; then - VERREV="$VERREV-$(cd ${SRC_ROOT} && git rev-parse --short HEAD)" +VERREV="$("${SRC_ROOT}/fc_version")" +if test "${INST_CROSS_MODE}" != "release" ; then + if test -d "${SRC_ROOT}/.git" || test -f "${SRC_ROOT}/.git" ; then + VERREV="$VERREV-$(cd "${SRC_ROOT}" && git rev-parse --short HEAD)" fi fi diff --git a/windows/installer_cross/setups/cross-win32.tmpl b/platforms/windows/installer_cross/setups/cross-win32.tmpl similarity index 100% rename from windows/installer_cross/setups/cross-win32.tmpl rename to platforms/windows/installer_cross/setups/cross-win32.tmpl diff --git a/windows/installer_cross/setups/cross-win64.tmpl b/platforms/windows/installer_cross/setups/cross-win64.tmpl similarity index 100% rename from windows/installer_cross/setups/cross-win64.tmpl rename to platforms/windows/installer_cross/setups/cross-win64.tmpl diff --git a/windows/installer_cross/winbuild.sh b/platforms/windows/installer_cross/winbuild.sh similarity index 94% rename from windows/installer_cross/winbuild.sh rename to platforms/windows/installer_cross/winbuild.sh index 5f5b3c42fa..e0a0f221cf 100755 --- a/windows/installer_cross/winbuild.sh +++ b/platforms/windows/installer_cross/winbuild.sh @@ -35,12 +35,12 @@ if ! test -f "$DLLSPATH/crosser.txt" ; then exit 1 fi -SRC_ROOT="$(cd ../.. || exit 1 ; pwd)" +SRC_ROOT="$(cd ../../.. || exit 1 ; pwd)" -VERREV="$(${SRC_ROOT}/fc_version)" -if test "$INST_CROSS_MODE" != "release" ; then - if test -d ${SRC_ROOT}/.git || test -f ${SRC_ROOT}/.git ; then - VERREV="$VERREV-$(cd ${SRC_ROOT} && git rev-parse --short HEAD)" +VERREV="$("${SRC_ROOT}/fc_version")" +if test "${INST_CROSS_MODE}" != "release" ; then + if test -d "${SRC_ROOT}/.git" || test -f "${SRC_ROOT}/.git" ; then + VERREV="$VERREV-$(cd "${SRC_ROOT}" && git rev-parse --short HEAD)" fi fi @@ -181,7 +181,7 @@ echo "----------------------------------" export CC="$TARGET-gcc -static-libgcc -static-libstdc++" export CXX="$TARGET-g++ -static-libgcc -static-libstdc++" -if ! ${SRC_ROOT}/autogen.sh --no-configure-run ; then +if ! "${SRC_ROOT}/autogen.sh" --no-configure-run ; then echo "Autogen failed" >&2 exit 1 fi @@ -201,7 +201,7 @@ if test "$MOCCMD" = "" && test "$MOC_CROSSER" != "" ; then MOCPARAM="MOCCMD=${MOC_CROSSER}" fi -if ! ${SRC_ROOT}/configure \ +if ! "${SRC_ROOT}/configure" \ ac_cv_working_gettimeofday=yes \ $MOCPARAM \ FREECIV_LABEL_FORCE="-crs" \ @@ -217,7 +217,7 @@ if ! ${SRC_ROOT}/configure \ --enable-fcmp=$FCMP \ --enable-debug \ --host=$TARGET \ - --build=$(${SRC_ROOT}/bootstrap/config.guess) \ + --build=$("${SRC_ROOT}/bootstrap/config.guess") \ --with-libiconv-prefix=${DLLSPATH} \ --with-sqlite3-prefix=${DLLSPATH} \ --with-followtag="crosser" \ diff --git a/windows/.gitignore b/windows/.gitignore deleted file mode 100644 index 9ee6454019..0000000000 --- a/windows/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile.in -/Makefile diff --git a/windows/Makefile.am b/windows/Makefile.am deleted file mode 100644 index 50c551ca11..0000000000 --- a/windows/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in - -dist_noinst_DATA = \ - installer_cross/create-freeciv-gtk-qt-nsi.sh \ - installer_cross/create-freeciv-sdl2-nsi.sh \ - installer_cross/create-freeciv-ruledit-nsi.sh \ - installer_cross/installer_build.sh \ - installer_cross/build_all_installers.sh \ - installer_cross/winbuild.sh \ - installer_cross/Freeciv.url \ - installer_cross/freeciv-server.cmd \ - installer_cross/freeciv-gtk3.22.cmd \ - installer_cross/freeciv-gtk4.cmd \ - installer_cross/freeciv-mp-gtk3.cmd \ - installer_cross/freeciv-mp-gtk4.cmd \ - installer_cross/freeciv-qt.cmd \ - installer_cross/freeciv-mp-qt.cmd \ - installer_cross/freeciv-sdl2.cmd \ - installer_cross/freeciv-ruledit.cmd \ - installer_cross/licenses/header.txt \ - installer_cross/helpers/installer-helper-gtk3.cmd \ - installer_cross/helpers/installer-helper-gtk4.cmd \ - installer_cross/helpers/installer-helper-qt.cmd \ - installer_cross/helpers/uninstaller-helper-gtk3.sh \ - installer_cross/meson-build_all_installers.sh \ - installer_cross/meson-installer_build.sh \ - installer_cross/meson-winbuild.sh \ - installer_cross/setups/cross-win32.tmpl \ - installer_cross/setups/cross-win64.tmpl -- 2.39.2