[gtk-vnc] build: simplify release prep script to reduce number of builds



commit 5fb00210785483926024948da86ee3d8df0809fd
Author: Daniel P. Berrangé <dan berrange com>
Date:   Wed Mar 31 15:54:04 2021 +0100

    build: simplify release prep script to reduce number of builds
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 prepare-release.sh | 53 ++++++++---------------------------------------------
 1 file changed, 8 insertions(+), 45 deletions(-)
---
diff --git a/prepare-release.sh b/prepare-release.sh
index e0f2c36..57c9161 100755
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -3,53 +3,16 @@
 set -e
 set -v
 
-rm -rf build vroot
+rm -rf build
 
-INSTALL_ROOT=`pwd`/vroot
+meson build
 
-meson --prefix="$INSTALL_ROOT" build/native --werror
-
-ninja -C build/native install
-
-ninja -C build/native test
-
-ninja -C build/native dist
+ninja -C build dist
 
 rpmbuild --nodeps \
-   --define "_sourcedir `pwd`/build/native/meson-dist/" \
-   -ba --clean build/native/gtk-vnc.spec
-
-if test -x /usr/bin/i686-w64-mingw32-gcc && \
-   test -r /usr/share/mingw/toolchain-mingw32.meson ; then
-  meson build/win32 \
-       --prefix="$INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \
-        --cross-file="/usr/share/mingw/toolchain-mingw32.meson" \
-       -Dintrospection=disabled \
-       --werror
-
-  ninja -C build/win32
-  ninja -C build/win32 install
-fi
+   --define "_sourcedir `pwd`/build/meson-dist/" \
+   -ba --clean build/gtk-vnc.spec
 
-if test -x /usr/bin/x86_64-w64-mingw32-gcc && \
-   test -r /usr/share/mingw/toolchain-mingw64.meson ; then
-  meson build/win64 \
-       --prefix="$INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \
-        --cross-file="/usr/share/mingw/toolchain-mingw64.meson" \
-       -Dintrospection=disabled \
-       --werror
-
-  ninja -C build/win64
-  ninja -C build/win64 install
-fi
-
-if test -x /usr/bin/i686-w64-mingw32-gcc && \
-   test -r /usr/share/mingw/toolchain-mingw32.meson && \
-   test -x /usr/bin/x86_64-w64-mingw32-gcc && \
-   test -r /usr/share/mingw/toolchain-mingw64.meson &&
-   test -f /usr/bin/rpmbuild; then
-
-   rpmbuild --nodeps \
-       --define "_sourcedir `pwd`/build/native/meson-dist/" \
-       -ba --clean build/native/mingw-gtk-vnc.spec
-fi
+rpmbuild --nodeps \
+   --define "_sourcedir `pwd`/build/meson-dist/" \
+   -ba --clean build/mingw-gtk-vnc.spec


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]