From 044e12bc81f6e8b77b60aebf5de2f49391330334 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 12 Jul 2023 00:30:43 +0300 Subject: [PATCH 31/31] Flatpak: Move configure regeneration out from .yml Run autogen.sh on ./build_flatpak.sh, on host. See osdn #48394 Signed-off-by: Marko Lindqvist --- platforms/flatpak/build_flatpak.sh | 8 ++++++++ platforms/flatpak/org.freeciv.gtk322.yml | 2 -- platforms/flatpak/org.freeciv.gtk4.yml | 2 -- platforms/flatpak/org.freeciv.mp.gtk3.yml | 2 -- platforms/flatpak/org.freeciv.mp.gtk4.yml | 2 -- platforms/flatpak/org.freeciv.qt.yml | 2 -- platforms/flatpak/org.freeciv.ruledit.yml | 2 -- platforms/flatpak/org.freeciv.sdl2.yml | 2 -- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/platforms/flatpak/build_flatpak.sh b/platforms/flatpak/build_flatpak.sh index 363938642d..7410648233 100755 --- a/platforms/flatpak/build_flatpak.sh +++ b/platforms/flatpak/build_flatpak.sh @@ -13,6 +13,14 @@ FCVER=$(../../fc_version) +# On a git clone, regenerate configure with autogen.sh +if test -f ../../.git && test -x ../../autogen.sh ; then + if ! ( cd ../.. && ./autogen.sh --no-configure-run ) ; then + echo "Autogen.sh FAILED" >&2 + exit 1 + fi +fi + if ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.gtk4.yml || ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.gtk322.yml || ! flatpak-builder --user --repo=repo --force-clean build org.freeciv.mp.gtk4.yml || diff --git a/platforms/flatpak/org.freeciv.gtk322.yml b/platforms/flatpak/org.freeciv.gtk322.yml index 3160b200e1..f1ff23022a 100644 --- a/platforms/flatpak/org.freeciv.gtk322.yml +++ b/platforms/flatpak/org.freeciv.gtk322.yml @@ -15,8 +15,6 @@ modules: - name: freeciv-gtk3.22 buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --enable-client=gtk3.22 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install sources: diff --git a/platforms/flatpak/org.freeciv.gtk4.yml b/platforms/flatpak/org.freeciv.gtk4.yml index b0512a53c1..3abfabed92 100644 --- a/platforms/flatpak/org.freeciv.gtk4.yml +++ b/platforms/flatpak/org.freeciv.gtk4.yml @@ -15,8 +15,6 @@ modules: - name: freeciv-gtk4 buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --enable-client=gtk4 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install sources: diff --git a/platforms/flatpak/org.freeciv.mp.gtk3.yml b/platforms/flatpak/org.freeciv.mp.gtk3.yml index 2624c58570..9023f02b7c 100644 --- a/platforms/flatpak/org.freeciv.mp.gtk3.yml +++ b/platforms/flatpak/org.freeciv.mp.gtk3.yml @@ -14,8 +14,6 @@ modules: - name: freeciv-mp-gtk3 buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --enable-fcmp=gtk3 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install sources: diff --git a/platforms/flatpak/org.freeciv.mp.gtk4.yml b/platforms/flatpak/org.freeciv.mp.gtk4.yml index 26080655f6..e7c7314107 100644 --- a/platforms/flatpak/org.freeciv.mp.gtk4.yml +++ b/platforms/flatpak/org.freeciv.mp.gtk4.yml @@ -14,8 +14,6 @@ modules: - name: freeciv-mp-gtk4 buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --enable-fcmp=gtk4 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install sources: diff --git a/platforms/flatpak/org.freeciv.qt.yml b/platforms/flatpak/org.freeciv.qt.yml index 69d0e3ec88..fda69ddf0b 100644 --- a/platforms/flatpak/org.freeciv.qt.yml +++ b/platforms/flatpak/org.freeciv.qt.yml @@ -15,8 +15,6 @@ modules: - name: freeciv-qt buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --with-qtver=qt6 --enable-client=qt --disable-fcmp --disable-ruledit --disable-freeciv-manual && make -j$(nproc) && make install sources: diff --git a/platforms/flatpak/org.freeciv.ruledit.yml b/platforms/flatpak/org.freeciv.ruledit.yml index e1cb6f92f7..76d3b90344 100644 --- a/platforms/flatpak/org.freeciv.ruledit.yml +++ b/platforms/flatpak/org.freeciv.ruledit.yml @@ -13,8 +13,6 @@ modules: - name: freeciv-ruledit buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --with-qtver=qt6 --enable-ruledit --disable-client --disable-fcmp --disable-freeciv-manual --disable-server && make -j$(nproc) && make install sources: diff --git a/platforms/flatpak/org.freeciv.sdl2.yml b/platforms/flatpak/org.freeciv.sdl2.yml index 431d2e20f4..26dc977699 100644 --- a/platforms/flatpak/org.freeciv.sdl2.yml +++ b/platforms/flatpak/org.freeciv.sdl2.yml @@ -21,8 +21,6 @@ modules: - name: freeciv-sdl2 buildsystem: simple build-commands: - # On git clone, regenerate configure with autogen.sh - - if test -f ./.git && test -x ./autogen.sh ; then ./autogen.sh --no-configure-run ; fi - mkdir build - cd build && ../configure --prefix=/app --enable-client=sdl2 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install sources: -- 2.40.1