From d9ce6084c26bb76abd355aeba652ed139ea5ac0a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 30 Mar 2023 15:03:58 -0300 Subject: [PATCH] Updating win32 ci build. --- configure.ac | 1 - win/build.conf.in | 2 -- win/ci-build.sh | 4 +--- win/install-cross.sh | 82 ---------------------------------------------------------------------------------- 4 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 win/build.conf.in delete mode 100755 win/install-cross.sh diff --git a/configure.ac b/configure.ac index d303f75..ffb4777 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,6 @@ case "$host" in INSTALL_PACKAGES="$INSTALL_PACKAGES delayed" AC_CONFIG_FILES(win/lib3270.mak) - AC_CONFIG_FILES(win/build.conf) ;; diff --git a/win/build.conf.in b/win/build.conf.in deleted file mode 100644 index 1cff396..0000000 --- a/win/build.conf.in +++ /dev/null @@ -1,2 +0,0 @@ -LIBRARY_VERSION=@WIN32_VERSION@ -TARGET_ARCH=@host_cpu@ diff --git a/win/ci-build.sh b/win/ci-build.sh index 55634ac..0ce288f 100755 --- a/win/ci-build.sh +++ b/win/ci-build.sh @@ -28,9 +28,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure" make all > $LOGFILE 2>&1 || die "Make failure" make DESTDIR=.bin/package install -. ./win/build.conf - -tar --create --xz --file=mingw-lib3270.${TARGET_ARCH}.tar.xz --directory=.bin/package --verbose . +tar --create --xz --file=mingw-lib3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose . diff --git a/win/install-cross.sh b/win/install-cross.sh deleted file mode 100755 index f08668a..0000000 --- a/win/install-cross.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -myDIR=$(dirname $(readlink -f ${0})) - -echo $myDIR - -install_packages() { - - TEMPFILE=$(mktemp) - - for spec in $(find ${myDIR} -name "${1}*.spec") - do - echo "Parsing ${spec}" - grep -i "^Requires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' | cut -d'>' -f1 >> ${TEMPFILE} - grep -i "^BuildRequires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' | cut -d'>' -f1 >> ${TEMPFILE} - done - - cat ${TEMPFILE} \ - | sort --unique \ - | xargs sudo zypper --non-interactive --verbose in - - - ## Instala apicativos e temas necessários - sudo zypper --non-interactive in \ - gettext-tools \ - automake - - while read FILE - do - sudo zypper --non-interactive in ${1}-${FILE} - done < ${TEMPFILE} - - rm -f ${TEMPFILE} - -} - - -if [ -z ${1} ]; then - echo "Use ${0} --32 for 32 bits cross-compiler" - echo "Use ${0} --64 for 64 bits cross-compiler" - exit -1 -fi - - -until [ -z "${1}" ] -do - if [ ${1:0:2} = '--' ]; then - tmp=${1:2} - parameter=${tmp%%=*} - parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]") - - case $parameter in - - ar) - sudo zypper ar obs://windows:mingw:win32 mingw32 - sudo zypper ar obs://windows:mingw:win64 mingw64 - ;; - - 32) - install_packages mingw32 - ;; - - 64) - install_packages mingw64 - ;; - - ALL) - install_packages mingw32 - install_packages mingw64 - ;; - - - *) - value=${tmp##*=} - eval $parameter=$value - esac - - fi - - shift -done - - -- libgit2 0.21.2