Download as
Browse Code »

Commit 1a287c8ebda7432bfcfa3b871b49d8d72befd916

Authored by Perry Werneck
Committed by GitHub
2 parents 9eb2524e 14d899e3
Exists in develop

Merge pull request #45 from PerryWerneck/develop 

Better artifact name
Showing 5 changed files with 2 additions and 91 deletions   Show diff stats
.github/workflows/publish.yml
  Diff comments   View file @1a287c8
@@ -3,8 +3,6 @@ on: @@ -3,8 +3,6 @@ on:
3 pull_request: 3 pull_request:
4 branches: 4 branches:
5 - master 5 - master
6 - schedule:  
7 - - cron: '30 13 1 2,4,6,8,10,12 *'  
8 jobs: 6 jobs:
9 msys2-mingw: 7 msys2-mingw:
10 name: Publish for Windows 64 8 name: Publish for Windows 64
@@ -29,7 +27,7 @@ jobs: @@ -29,7 +27,7 @@ jobs:
29 - uses: ncipollo/release-action@v1 27 - uses: ncipollo/release-action@v1
30 with: 28 with:
31 tag: ${{ steps.gettag.outputs.tag }} 29 tag: ${{ steps.gettag.outputs.tag }}
32 - artifacts: "*.tar.xz" 30 + artifacts: "*-lib3270.tar.xz"
33 allowUpdates: true 31 allowUpdates: true
34 draft: false 32 draft: false
35 makeLatest: true 33 makeLatest: true
@@ -114,7 +114,6 @@ case "$host" in @@ -114,7 +114,6 @@ case "$host" in
114 INSTALL_PACKAGES="$INSTALL_PACKAGES delayed" 114 INSTALL_PACKAGES="$INSTALL_PACKAGES delayed"
115 115
116 AC_CONFIG_FILES(win/lib3270.mak) 116 AC_CONFIG_FILES(win/lib3270.mak)
117 - AC_CONFIG_FILES(win/build.conf)  
118 117
119 ;; 118 ;;
120 119
win/build.conf.in
View file @9eb2524
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -LIBRARY_VERSION=@WIN32_VERSION@  
2 -TARGET_ARCH=@host_cpu@  
win/ci-build.sh
  Diff comments   View file @1a287c8
@@ -28,9 +28,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure" @@ -28,9 +28,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure"
28 make all > $LOGFILE 2>&1 || die "Make failure" 28 make all > $LOGFILE 2>&1 || die "Make failure"
29 make DESTDIR=.bin/package install 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_PACKAGE_PREFIX}-lib3270.tar.xz --directory=.bin/package --verbose .
34 32
35 33
36 34
win/install-cross.sh
View file @9eb2524
@@ -1,82 +0,0 @@ @@ -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 -