From 12df173cde76d5304a70f4849e7de9b8c0e0e856 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 12 Jul 2023 00:33:46 +0300 Subject: [PATCH 26/26] Flatpak: Move configure regeneration out from .yml Run autogen.sh on ./build_flatpak.sh, on host. See osdn #48394 Signed-off-by: Marko Lindqvist --- flatpak/build_flatpak.sh | 8 ++++++++ flatpak/org.freeciv.gtk322.yml | 2 -- flatpak/org.freeciv.gtk4.yml | 2 -- flatpak/org.freeciv.mp.gtk3.yml | 2 -- flatpak/org.freeciv.mp.gtk4.yml | 2 -- flatpak/org.freeciv.qt.yml | 2 -- flatpak/org.freeciv.ruledit.yml | 2 -- flatpak/org.freeciv.sdl2.yml | 2 -- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh index f86ea7ec3a..3bec3e57f2 100755 --- a/flatpak/build_flatpak.sh +++ b/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/flatpak/org.freeciv.gtk322.yml b/flatpak/org.freeciv.gtk322.yml index 372f5b9417..e7c292b790 100644 --- a/flatpak/org.freeciv.gtk322.yml +++ b/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/flatpak/org.freeciv.gtk4.yml b/flatpak/org.freeciv.gtk4.yml index 109b6a5211..c23a997b51 100644 --- a/flatpak/org.freeciv.gtk4.yml +++ b/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/flatpak/org.freeciv.mp.gtk3.yml b/flatpak/org.freeciv.mp.gtk3.yml index d5e786f0f3..3064e6de3b 100644 --- a/flatpak/org.freeciv.mp.gtk3.yml +++ b/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/flatpak/org.freeciv.mp.gtk4.yml b/flatpak/org.freeciv.mp.gtk4.yml index 4c9de11455..811278fa14 100644 --- a/flatpak/org.freeciv.mp.gtk4.yml +++ b/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/flatpak/org.freeciv.qt.yml b/flatpak/org.freeciv.qt.yml index 634fb44fa9..5076c34a51 100644 --- a/flatpak/org.freeciv.qt.yml +++ b/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/flatpak/org.freeciv.ruledit.yml b/flatpak/org.freeciv.ruledit.yml index 378c65e432..d79411ad9f 100644 --- a/flatpak/org.freeciv.ruledit.yml +++ b/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/flatpak/org.freeciv.sdl2.yml b/flatpak/org.freeciv.sdl2.yml index 9621d69978..2dcf695b96 100644 --- a/flatpak/org.freeciv.sdl2.yml +++ b/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