Download as
Browse Code »

Commit 98ea623ecc1c53e7a8f94e19dde71d6fb7b3238c

Authored by Perry Werneck
1 parent 38566614
Exists in develop

Using msystem arch for file names.

Showing 2 changed files with 7 additions and 35 deletions   Show diff stats
.github/workflows/winpkg.yml
  Diff comments   View file @98ea623
@@ -9,6 +9,7 @@ on: @@ -9,6 +9,7 @@ on:
9 - winpkg 9 - winpkg
10 jobs: 10 jobs:
11 msys2-mingw64: 11 msys2-mingw64:
  12 + name: Publish for Windows 64
12 runs-on: windows-latest 13 runs-on: windows-latest
13 defaults: 14 defaults:
14 run: 15 run:
win/ci-build.sh
  Diff comments   View file @98ea623
@@ -23,45 +23,16 @@ cd ${myDIR} @@ -23,45 +23,16 @@ cd ${myDIR}
23 rm -fr ${myDIR}/.build 23 rm -fr ${myDIR}/.build
24 24
25 # 25 #
26 -# Build LIB3270 26 +# Unpack LIB3270
27 # 27 #
28 -if [ -e mingw-lib3270.tar.xz ]; then  
29 -  
30 - echo "Unpacking lib3270"  
31 - tar -C / -Jxvf mingw-lib3270.tar.xz  
32 -  
33 -else  
34 - echo "Building lib3270"  
35 - git clone https://github.com/PerryWerneck/lib3270.git ./.build/lib3270 || die "clone lib3270 failure"  
36 - cd ./.build/lib3270  
37 - ./autogen.sh || die "Lib3270 autogen failure"  
38 - ./configure || die "Lib3270 Configure failure"  
39 - make clean || die "Lib3270 Make clean failure"  
40 - make all || die "Lib3270 Make failure"  
41 - make install || die "Lib3270 Install failure"  
42 - cd ../..  
43 -fi 28 +echo "Unpacking lib3270"
  29 +tar -C / -Jxf mingw-lib3270.${MSYSTEM_CARCH}.tar.xz > $LOGFILE 2>&1 || die "Unpack lib3270 failure"
44 30
45 # 31 #
46 # Build LIBV3270 32 # Build LIBV3270
47 # 33 #
48 -if [ -e mingw-libv3270.tar.xz ]; then  
49 -  
50 - echo "Unpacking libv3270"  
51 - tar -C / -Jxvf mingw-libv3270.tar.xz  
52 -  
53 -else  
54 - echo "Building libv3270"  
55 - mkdir -p ${myDIR}/.build/libv3270  
56 - git clone https://github.com/PerryWerneck/libv3270.git ${myDIR}/.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure"  
57 - pushd ${myDIR}/.build/libv3270  
58 - ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"  
59 - ./configure > $LOGFILE 2>&1 || die "Configure failure"  
60 - make clean > $LOGFILE 2>&1 || die "Make clean failure"  
61 - make all > $LOGFILE 2>&1 || die "Make failure"  
62 - make install > $LOGFILE 2>&1 || die "Install failure"  
63 - popd  
64 -fi 34 +echo "Unpacking libv3270"
  35 +tar -C / -Jxf mingw-libv3270.tar.xz > $LOGFILE 2>&1 || die "Unpack libv3270 failure"
65 36
66 # 37 #
67 # Build PW3270 38 # Build PW3270
@@ -74,7 +45,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure" @@ -74,7 +45,7 @@ make clean > $LOGFILE 2>&1 || die "Make clean failure"
74 make all > $LOGFILE 2>&1 || die "Make failure" 45 make all > $LOGFILE 2>&1 || die "Make failure"
75 46
76 make DESTDIR=.bin/package install 47 make DESTDIR=.bin/package install
77 -tar --create --xz --file=mingw-pw3270.tar.xz --directory=.bin/package --verbose . 48 +tar --create --xz --file=mingw-pw3270.${MSYSTEM_CARCH}.tar.xz --directory=.bin/package --verbose .
78 49
79 echo "Build complete" 50 echo "Build complete"
80 51