From 8ca026235e4426929c09e1e39ab5a96cbcd26528 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Sun, 9 Apr 2023 12:10:09 -0300 Subject: [PATCH] Adding options to bundler, adding --build option to cross bundler. --- win/bundle.common | 22 ++++++++++++++++++++++ win/bundle.cross | 32 ++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/win/bundle.common b/win/bundle.common index 835b9e5..78c3c2d 100644 --- a/win/bundle.common +++ b/win/bundle.common @@ -334,3 +334,25 @@ install_loaders() { } +argument() { + + local cmdline + for cmdline in ${BASH_ARGV[*]} + do + if [ "$(echo ${cmdline} | sed "s@^--@@g" | sed "s@^-@@g" | cut -d= -f1)" == "${1}" ]; then + local value + value="$(echo ${cmdline} | cut -d= -f2)" + if [ -z "${value}" ]; then + echo "1" + else + echo "${value}" + fi + return 0 + fi + done + echo "" + return 2 +} + + + diff --git a/win/bundle.cross b/win/bundle.cross index 2713943..a587243 100755 --- a/win/bundle.cross +++ b/win/bundle.cross @@ -34,21 +34,29 @@ MINGW_PACKAGE_PREFIX="mingw64" prepare -# Build -make -C "${srcdir}" all -if [ "$?" != "0" ]; then - echo "Build failed" - exit -1 -fi +# List of pre-built packages +packages="lib3270 libv3270" + +argument "build" +if [ "$?" == "0" ]; then -make -C "${srcdir}" "DESTDIR=${buildroot}" install -if [ "$?" != "0" ]; then - echo "Install failed" - exit -1 + # Build + make -C "${srcdir}" all + if [ "$?" != "0" ]; then + echo "Build failed" + exit -1 + fi + + make -C "${srcdir}" "DESTDIR=${buildroot}" install + if [ "$?" != "0" ]; then + echo "Install failed" + exit -1 + fi +else + packages="${packages} pw3270" fi -# Install pre-build packages -packages="lib3270 libv3270" +echo "Packages: ${packages}" for package in ${packages} do PACKAGE_NAME=$(rpm -qa | grep "${MINGW_PACKAGE_PREFIX}-${package}" | grep -v devel) -- libgit2 0.21.2