Commit d9ce6084c26bb76abd355aeba652ed139ea5ac0a

Authored by Perry Werneck
1 parent 34645c18
Exists in develop

Updating win32 ci build.

configure.ac
... ... @@ -114,7 +114,6 @@ case "$host" in
114 114 INSTALL_PACKAGES="$INSTALL_PACKAGES delayed"
115 115  
116 116 AC_CONFIG_FILES(win/lib3270.mak)
117   - AC_CONFIG_FILES(win/build.conf)
118 117  
119 118 ;;
120 119  
... ...
win/build.conf.in
... ... @@ -1,2 +0,0 @@
1   -LIBRARY_VERSION=@WIN32_VERSION@
2   -TARGET_ARCH=@host_cpu@
win/ci-build.sh
... ... @@ -28,9 +28,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure"
28 28 make all > $LOGFILE 2>&1 || die "Make failure"
29 29 make DESTDIR=.bin/package install
30 30  
31   -. ./win/build.conf
32   -
33   -tar --create --xz --file=mingw-lib3270.${TARGET_ARCH}.tar.xz --directory=.bin/package --verbose .
  31 +tar --create --xz --file=mingw-lib3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose .
34 32  
35 33  
36 34  
... ...
win/install-cross.sh
... ... @@ -1,82 +0,0 @@
1   -#!/bin/bash
2   -myDIR=$(dirname $(readlink -f ${0}))
3   -
4   -echo $myDIR
5   -
6   -install_packages() {
7   -
8   - TEMPFILE=$(mktemp)
9   -
10   - for spec in $(find ${myDIR} -name "${1}*.spec")
11   - do
12   - echo "Parsing ${spec}"
13   - grep -i "^Requires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' | cut -d'>' -f1 >> ${TEMPFILE}
14   - grep -i "^BuildRequires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' | cut -d'>' -f1 >> ${TEMPFILE}
15   - done
16   -
17   - cat ${TEMPFILE} \
18   - | sort --unique \
19   - | xargs sudo zypper --non-interactive --verbose in
20   -
21   -
22   - ## Instala apicativos e temas necessários
23   - sudo zypper --non-interactive in \
24   - gettext-tools \
25   - automake
26   -
27   - while read FILE
28   - do
29   - sudo zypper --non-interactive in ${1}-${FILE}
30   - done < ${TEMPFILE}
31   -
32   - rm -f ${TEMPFILE}
33   -
34   -}
35   -
36   -
37   -if [ -z ${1} ]; then
38   - echo "Use ${0} --32 for 32 bits cross-compiler"
39   - echo "Use ${0} --64 for 64 bits cross-compiler"
40   - exit -1
41   -fi
42   -
43   -
44   -until [ -z "${1}" ]
45   -do
46   - if [ ${1:0:2} = '--' ]; then
47   - tmp=${1:2}
48   - parameter=${tmp%%=*}
49   - parameter=$(echo $parameter | tr "[:lower:]" "[:upper:]")
50   -
51   - case $parameter in
52   -
53   - ar)
54   - sudo zypper ar obs://windows:mingw:win32 mingw32
55   - sudo zypper ar obs://windows:mingw:win64 mingw64
56   - ;;
57   -
58   - 32)
59   - install_packages mingw32
60   - ;;
61   -
62   - 64)
63   - install_packages mingw64
64   - ;;
65   -
66   - ALL)
67   - install_packages mingw32
68   - install_packages mingw64
69   - ;;
70   -
71   -
72   - *)
73   - value=${tmp##*=}
74   - eval $parameter=$value
75   - esac
76   -
77   - fi
78   -
79   - shift
80   -done
81   -
82   -